Учитываем время на релизы.

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -52,7 +52,8 @@ namespace JiraTimeBot.JiraIntegration
                             Description = issue.Summary,
                             Branch = issue.Key.Value,
                             FilesAffected = 1,
-                            Commits = 1
+                            Commits = 1,
+                            Type = CommitType.Task
                         });
                     }
                 }
@@ -64,7 +65,8 @@ namespace JiraTimeBot.JiraIntegration
                         Description = issue.Summary,
                         Branch = issue.Key.Value,
                         FilesAffected = 1,
-                        Commits = 1
+                        Commits = 1,
+                        Type = CommitType.Task
                     });
                 }
             }

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -72,15 +72,25 @@ namespace JiraTimeBot.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    workTasks.Add(new TaskTimeItem
+                    var task = new TaskTimeItem
                     {
                         StartTime = changeset.Timestamp,
                         Description = commitMessage,
                         Branch = changeset.Branch,
                         FilesAffected = changeset.PathActions.Count,
                         Commits = 1,
-                        TimeSpent = TimeSpan.Zero
+                        TimeSpent = TimeSpan.Zero,
-                    });
+                        Type = GetCommitType(changeset.Branch)
+                    };
+                    if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        var branch = task.Description.Replace("Merge with", "").Replace(" ", "");
+                        var release = task.Branch.Replace("release", "");
+
+                        task.Branch = branch;
+                        task.Description = $"Подготовка и публикация версии {release}.";
+                    }
+                    workTasks.Add(task);
                     _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                 }
             }
@@ -92,6 +102,11 @@ namespace JiraTimeBot.Mercurial
             return workTasks;
         }
 
+        private CommitType GetCommitType(string branch)
+        {
+            return branch.StartsWith("release") ? CommitType.Release : CommitType.Task;
+        }
+
         private string FixEncoding(string source)
         {
             //перекодируем сообщение - ибо оно криво забирается в 1252

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -6,6 +6,10 @@ namespace JiraTimeBot.Mercurial.Modifiers
     {
         public bool IsNeedToSkip(string branch, string commitMessage)
         {
+            if (branch.StartsWith("release") && commitMessage.StartsWith("Merge with", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return false;
+            }
             if (!branch.Contains("-"))
             {
                 return true;

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -10,5 +10,11 @@ namespace JiraTimeBot.TaskTime.Objects
         public TimeSpan TimeSpent { get; set; }
         public int Commits { get; set; }
         public int FilesAffected { get; set; }
+        public CommitType Type { get; set; }
+    }
+
+    public enum CommitType {
+        Task = 0,
+        Release = 1
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -25,6 +25,8 @@ namespace JiraTimeBot.TaskTime
             int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings);
             int workHours = (settings.MinuterPerWorkDay / 60);
             int totalCommitsCount = commits.Count;
+            var taskCommits = commits.Where(f => f.Type == CommitType.Task).ToList();
+            var releaseCommits = commits.Where(f => f.Type == CommitType.Release).ToList();
 
             if (cancellationToken.IsCancellationRequested)
             {
@@ -47,7 +49,14 @@ namespace JiraTimeBot.TaskTime
                 remainMinutes -= (int)timeControlTask.TimeSpent.TotalMinutes;
             }
 
-            var workTasks = _spreadHelper.SpreadTime(commits, remainMinutes, settings.RoundToMinutes);
+            if (releaseCommits.Any())
+            {
+                var releaseTasks = _spreadHelper.SpreadTime(releaseCommits, 30, 1);
+                workTimeItems.AddRange(releaseTasks);
+                remainMinutes -= releaseTasks.Sum(f=>(int)f.TimeSpent.TotalMinutes);
+            }
+
+            var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
             workTimeItems.AddRange(workTasks);
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();