Исправлены мелкие неточности.

.semver.txt

@@ -1 +1 @@
-1.0.58
+1.0.63

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -46,28 +46,28 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
                     {
-                        workTasks.Add(new TaskTimeItem
-                        {
-                            StartTime = issue.Updated.GetValueOrDefault(date.Value),
-                            Description = issue.Summary,
-                            Branch = issue.Key.Value,
-                            FilesAffected = 1,
-                            Commits = 1,
-                            Type = CommitType.Task
-                        });
+                        var item = new TaskTimeItem(issue.Key.Value,
+                            issue.Summary,
+                            issue.Project,
+                            issue.Updated.GetValueOrDefault(date.Value),
+                            TimeSpan.Zero,
+                            1,
+                            1,
+                            CommitType.Task);
+                        workTasks.Add(item);
                     }
                 }
                 else
                 {
-                    workTasks.Add(new TaskTimeItem
-                    {
-                        StartTime = issue.Updated.GetValueOrDefault(date.Value),
-                        Description = issue.Summary,
-                        Branch = issue.Key.Value,
-                        FilesAffected = 1,
-                        Commits = 1,
-                        Type = CommitType.Task
-                    });
+                    var item = new TaskTimeItem(issue.Key.Value,
+                        issue.Summary,
+                        issue.Project,
+                        issue.Updated.GetValueOrDefault(date.Value),
+                        TimeSpan.Zero,
+                        1,
+                        1,
+                        CommitType.Task);
+                    workTasks.Add(item);
                 }
             }
 

src/JiraTimeBot/JiraTimeBot.csproj

@@ -92,6 +92,7 @@
     <Compile Include="Mercurial\IMercurialLog.cs" />
     <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
+    <Compile Include="TaskTime\Objects\CommitType.cs" />
     <Compile Include="TaskTime\TaskTimeSpread.cs" />
     <Compile Include="UI\frmMain.cs">
       <SubType>Form</SubType>

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
                     continue;
                 }
 
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
                 var repo = new Repository(repoDirectory);
                 var logCommand = new LogCommand
                 {
@@ -72,16 +74,14 @@ namespace JiraTimeBot.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    var task = new TaskTimeItem
-                    {
-                        StartTime = changeset.Timestamp,
-                        Description = commitMessage,
-                        Branch = changeset.Branch,
-                        FilesAffected = changeset.PathActions.Count,
-                        Commits = 1,
-                        TimeSpent = TimeSpan.Zero,
-                        Type = GetCommitType(changeset.Branch)
-                    };
+                    var task = new TaskTimeItem(changeset.Branch,
+                        commitMessage,
+                        directoryInfo.Name,
+                        changeset.Timestamp,
+                        TimeSpan.Zero,
+                        1,
+                        changeset.PathActions.Count,
+                        GetCommitType(changeset.Branch));
 
                     if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
                     {
@@ -94,7 +94,7 @@ namespace JiraTimeBot.Mercurial
                         var release = task.Branch.Replace("release", "");
 
                         task.Branch = branch;
-                        task.Description = $"Подготовка и публикация версии {release}.";
+                        task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
                     }
                     workTasks.Add(task);
                     _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
 //                                                      
 // You can specify all the values or you can default the Build and Revision Numbers                                                      
 // by using the '*' as shown below:                                                      
-[assembly: AssemblyVersion("1.0.58")] 
-[assembly: AssemblyFileVersion("1.0.58")] 
-[assembly: AssemblyInformationalVersion("1.0.58")] 
+[assembly: AssemblyVersion("1.0.63")] 
+[assembly: AssemblyFileVersion("1.0.63")] 
+[assembly: AssemblyInformationalVersion("1.0.63")] 

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace JiraTimeBot.TaskTime.Objects
+{
+    [Flags]
+    public enum CommitType {
+        Task = 1,
+        Release = 2
+    }
+}

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -11,10 +11,27 @@ namespace JiraTimeBot.TaskTime.Objects
         public int Commits { get; set; }
         public int FilesAffected { get; set; }
         public CommitType Type { get; set; }
-    }
+        public string Project { get; set; }
 
-    public enum CommitType {
-        Task = 0,
-        Release = 1
+        public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits, 
+                            int filesAffected = 1, CommitType type = CommitType.Task)
+        {
+            Branch = branch;
+            Description = description;
+            Project = project;
+            Commits = commits;
+            TimeSpent = timeSpent;
+            StartTime = startTime;
+            FilesAffected = filesAffected;
+            Type = type;
+        }
+
+        public void MergeWith(TaskTimeItem toMerge)
+        {
+            Commits += toMerge.Commits;
+            TimeSpent += toMerge.TimeSpent;
+            Description += "\r\n" + toMerge.Description;
+            Type |= toMerge.Type;
+        }
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -20,7 +20,7 @@ namespace JiraTimeBot.TaskTime
             _spreadHelper = spreadHelper;
         }
 
-        public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default)
         {
             int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings);
             int workHours = (settings.MinuterPerWorkDay / 60);
@@ -57,7 +57,17 @@ namespace JiraTimeBot.TaskTime
             }
 
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
-            workTimeItems.AddRange(workTasks);
+            foreach (var workTask in workTasks)
+            {
+                TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                if (existingItem != null)
+                {
+                    existingItem.MergeWith(workTask);
+                    continue;
+                }
+
+                workTimeItems.Add(workTask);
+            }
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
 
             remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
@@ -82,13 +92,14 @@ namespace JiraTimeBot.TaskTime
             //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
             if (!string.IsNullOrEmpty(timeControlTask))
             {
-                return new TaskTimeItem
-                {
-                    TimeSpent = TimeSpan.FromMinutes(minutes),
-                    Branch = timeControlTask,
-                    Commits = 1,
-                    Description = "Ведение учета времени"
-                };
+                return new TaskTimeItem(timeControlTask,
+                    "Ведение учета времени",
+                    "Service",
+                    DateTime.Now,
+                    TimeSpan.FromMinutes(minutes),
+                    1,
+                    1,
+                    CommitType.Task);
             }
 
             return null;

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -26,7 +26,7 @@ namespace JiraTimeBot.TaskTime
             {
                 int currentTaskCommits = taskGroup.Count();
                 int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
-                remainMinutes = remainMinutes - currentTaskTime;
+                remainMinutes -= currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
                 StringBuilder sb = new StringBuilder();
@@ -34,19 +34,21 @@ namespace JiraTimeBot.TaskTime
                 {
                     sb.AppendLine($"- {task.Description}");
                 }
-                var taskTimeItem = new TaskTimeItem
-                {
-                    Branch = taskGroup.Key,
-                    TimeSpent = appendTime ?
-                        TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime):
-                        TimeSpan.FromMinutes(currentTaskTime)
-                    ,
-                    Commits = taskGroup.Sum(f=>f.Commits),
-                    Description = sb.ToString(),
-                    StartTime = taskGroup.Min(f=>f.StartTime),
-                    FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
-                    Type = taskGroup.First().Type
-                };
+
+                var timeSpent = appendTime
+                    ? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
+                      TimeSpan.FromMinutes(currentTaskTime)
+                    : TimeSpan.FromMinutes(currentTaskTime);
+
+                var taskTimeItem = new TaskTimeItem(
+                    taskGroup.Key,
+                    sb.ToString(),
+                    taskGroup.First().Project,
+                    taskGroup.Min(f => f.StartTime),
+                    timeSpent,
+                    taskGroup.Sum(f => f.Commits),
+                    taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().Type);
 
                 newList.Add(taskTimeItem);
             }

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -19,17 +19,17 @@ namespace JiraTimeBot.TasksProcessors
             _jiraApi = jiraApi;
         }
 
-        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default)
         {
             _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
 
-            foreach (var taskTime in taskTimes.Where(f=>f.Type == CommitType.Task).OrderByDescending(f => f.TimeSpent))
+            foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {
                 var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
                 _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
             }
 
-            var releases = taskTimes.Where(f => f.Type == CommitType.Release).GroupBy(f=>f.Description);
+            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f=>f.Description);
             foreach (var release in releases)
             {
                 var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes);