Пропускаем синк с мастером

.semver.txt

@@ -1 +1 @@
-1.0.67
+1.0.76

README.md

@@ -21,5 +21,7 @@
  - Рандомных минут - если > 0, то будет прибавлено рандомное количество минут к рабочему времени (но кратное значению округления).
  - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - описание не заполняются.
  - Автозагрузка - загружать ли программу при старте ОС.
+ - Делать pull (Режим Mercurial) - делать ли hg pull перед началом обработки (полезно, если изменения делаются Вами не только на текущем ПК).
+ 
 # Скачать
 Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

src/JiraTimeBot/App.config

@@ -10,12 +10,16 @@
         <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-106.6.9.0" newVersion="106.6.9.0" />
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.1.2.0" newVersion="5.1.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/JiraTimeBot/Configuration/Settings.cs

@@ -13,7 +13,7 @@ namespace JiraTimeBot.Configuration
         public int RoundToMinutes { get; set; }
 
         public string JiraUrl = "https://myteam.aeroclub.ru";
-
+        public bool PullBeforeProcess { get; set; }
         public string RepositoryPath { get; set; }
         public string MercurialAuthorEmail { get; set; }
         public string JiraUserName { get; set; }
@@ -61,7 +61,7 @@ namespace JiraTimeBot.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RoundToMinutes == default(int))
+            if (settings.RoundToMinutes == default)
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }
@@ -137,12 +137,13 @@ namespace JiraTimeBot.Configuration
             File.WriteAllText(settingsPath, settingsString);
         }
 
-        private static string _settingsFileName = "settings.json";
+        private static readonly string _settingsFileName = "settings.json";
     }
 
     public enum WorkType
     {
         Mercurial = 0,
         JiraLogs = 1,
+        GitLogs = 2
     }
 }

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -43,8 +43,9 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<TechnicalInfoSkipper>().As<ITechnicalInfoSkipper>().AsSelf();
 
-            _builder.RegisterType<MercurialLog>().As<IMercurialLog>().AsSelf();
-            _builder.RegisterType<JiraCommitEmulator>().As<IMercurialLog>().AsSelf();
+            _builder.RegisterType<GitLog>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterType<MercurialLog>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterType<JiraCommitEmulator>().As<IRepositoryLog>().AsSelf();
             _builder.RegisterAggregateService<IAllMercurialProviders>();
             
             _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -42,7 +42,7 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             date = date.GetValueOrDefault(DateTime.Now.Date);
@@ -69,14 +69,15 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
-            var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
+            //var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
+            var jql = "worklogAuthor = '%USER%' && worklogDate = \"%DATE%\"";
             return GetIssuesByJQL(jql, settings, date, cancellationToken);
         }
 
-        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken))
+        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
             foreach (var issue in alreadyLoggedToday)
@@ -100,7 +101,7 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken))
+        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default)
         {
             date = date.GetValueOrDefault(DateTime.Now.Date).Date;
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -10,7 +10,7 @@ using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraCommitEmulator : IMercurialLog
+    public class JiraCommitEmulator : IRepositoryLog
     {
         private readonly ILog _log;
         private readonly JiraApi _jiraApi;
@@ -21,7 +21,7 @@ namespace JiraTimeBot.JiraIntegration
             _jiraApi = jiraApi;
         }
 
-        public List<TaskTimeItem> GetMercurialLog(Settings settings,
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings,
                                     DateTime? date = null,
                                     CancellationToken cancellationToken = default(CancellationToken))
         {

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -13,7 +13,7 @@ namespace JiraTimeBot.JiraIntegration
     {
         List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                           Settings settings,
-                                          CancellationToken cancellationToken = default(CancellationToken));
+                                          CancellationToken cancellationToken = default);
     }
 
     public class JiraHistory: IJiraHistory
@@ -27,7 +27,7 @@ namespace JiraTimeBot.JiraIntegration
 
         public List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                                  Settings settings,
-                                                 CancellationToken cancellationToken = default(CancellationToken))
+                                                 CancellationToken cancellationToken = default)
         {
             var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
             List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
@@ -35,7 +35,6 @@ namespace JiraTimeBot.JiraIntegration
             {
                 var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                 var user = settings.JiraUserName;
-                //user = "Zoya.Aleksandridi";
                 var userWorklogs = workLogs.Where(w =>
                     w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
@@ -46,7 +45,7 @@ namespace JiraTimeBot.JiraIntegration
 
                 var firstWorklog = userWorklogs.First();
 
-                var description = string.Join("\r\n", userWorklogs.Select(f => f.Comment).Distinct());
+                var description = string.Join(Environment.NewLine, userWorklogs.Select(f => f.Comment).Distinct());
                 var totalTime = TimeSpan.FromSeconds(userWorklogs.Sum(f => f.TimeSpentInSeconds));
                 var startDate = firstWorklog?.CreateDate ?? date;
                 var commits = userWorklogs.Sum(f => f.Comment.Count(c => c == '\n'));

src/JiraTimeBot/JiraTimeBot.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,36 +39,49 @@
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Atlassian.Jira, Version=10.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Atlassian.SDK.10.4.0\lib\net452\Atlassian.Jira.dll</HintPath>
+    <Reference Include="Atlassian.Jira, Version=12.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Atlassian.SDK.12.1.0\lib\net452\Atlassian.Jira.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=5.1.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.5.1.2\lib\net461\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Extras.AggregateService, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
+    <Reference Include="Autofac.Extras.AggregateService, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.Extras.AggregateService.5.0.0\lib\netstandard2.0\Autofac.Extras.AggregateService.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="LibGit2Sharp, Version=0.27.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.27.0-preview-0034\lib\net46\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL">
       <HintPath>..\packages\Mercurial.Net.1.1.1.607\lib\net35-Client\Mercurial.Net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=106.0.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
@@ -87,11 +103,12 @@
     <Compile Include="Logger.cs" />
     <Compile Include="Configuration\Settings.cs" />
     <Compile Include="JiraIntegration\JiraCommitEmulator.cs" />
+    <Compile Include="Mercurial\GitLog.cs" />
     <Compile Include="Mercurial\IAllMercurialProviders.cs" />
     <Compile Include="Mercurial\Modifiers\ITechnicalInfoSkipper.cs" />
     <Compile Include="Mercurial\Modifiers\CommitSkipper.cs" />
     <Compile Include="Mercurial\Modifiers\ICommitSkipper.cs" />
-    <Compile Include="Mercurial\IMercurialLog.cs" />
+    <Compile Include="Mercurial\IRepositoryLog.cs" />
     <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
     <Compile Include="TaskTime\Objects\CommitType.cs" />
@@ -161,4 +178,10 @@
     <Content Include="app.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+  </Target>
 </Project>

src/JiraTimeBot/Job.cs

@@ -72,17 +72,22 @@ namespace JiraTimeBot
 
         private bool SetTaskTimesForDateImpl(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
         {
-            IMercurialLog mercurial = _mercurialProviders.MercurialLog;
+            IRepositoryLog mercurial = _mercurialProviders.MercurialLog;
             if (settings.WorkType == WorkType.JiraLogs)
             {
                 _log.Info("Использую Jira как источник информации.");
                 mercurial = _mercurialProviders.JiraCommitEmulator;
             }
+            else if (settings.WorkType == WorkType.GitLogs)
+            {
+                _log.Info("Использую Git как источник информации.");
+                mercurial = _mercurialProviders.GitLog;
+            }
 
-            List<TaskTimeItem> taskTimes = null;
+            List<TaskTimeItem> taskTimes;
             if (!(tasksProcessor is MeetingProcessor))
             {
-                List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);
+                List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
                 taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
             }
             else

src/JiraTimeBot/Mercurial/GitLog.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.Mercurial.Modifiers;
+using JiraTimeBot.TaskTime.Objects;
+using LibGit2Sharp;
+
+namespace JiraTimeBot.Mercurial
+{
+    public class GitLog : IRepositoryLog
+    {
+        private readonly ILog _log;
+        private readonly ICommitSkipper _commitSkipper;
+        private readonly ITechnicalInfoSkipper _technicalInfoSkipper;
+
+        public GitLog(ILog log, ICommitSkipper commitSkipper, ITechnicalInfoSkipper technicalInfoSkipper)
+        {
+            _log = log;
+            _commitSkipper = commitSkipper;
+            _technicalInfoSkipper = technicalInfoSkipper;
+        }
+
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
+            {
+                _log.Error("Папка с репо не сушествует.");
+                return new List<TaskTimeItem>();
+            }
+
+            date = date.GetValueOrDefault(DateTime.Now.Date);
+
+            var workTasks = new List<TaskTimeItem>();
+            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return new List<TaskTimeItem>();
+                }
+
+                //var project = new DirectoryInfo(repoDirectory).Name;
+                if (!Directory.Exists(Path.Combine(repoDirectory, ".git")))
+                {
+                    continue;
+                }
+
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
+                
+                var repo = new LibGit2Sharp.Repository(repoDirectory);
+
+                if (settings.PullBeforeProcess)
+                {
+                    try
+                    {
+                        // Credential information to fetch
+                        LibGit2Sharp.PullOptions options = new LibGit2Sharp.PullOptions();
+                        options.FetchOptions = new FetchOptions();
+
+                        // User information to create a merge commit
+                        var signature = new LibGit2Sharp.Signature(new Identity("MERGE_USER_NAME", "MERGE_USER_EMAIL"), DateTimeOffset.Now);
+
+                        // Pull
+                        Commands.Pull(repo, signature, options);
+                    }
+                    catch (Exception ex)
+                    {
+                        _log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}");
+                    }
+                }
+                
+                var allCommits = new List<Commit>();
+
+                var reflog = repo.Refs.Log(repo.Refs.Head);
+                foreach (var reflogItem in reflog)
+                {
+                    if (reflogItem.Committer.When.Date != date.Value.Date || reflogItem.Committer.Email != settings.MercurialAuthorEmail)
+                    {
+                        continue;
+                    }
+
+                    var commit = repo.Lookup<LibGit2Sharp.Commit>(reflogItem.To.Sha);
+                    if (commit != null && allCommits.All(f => f.Sha != commit.Sha))
+                    {
+                        allCommits.Add(commit);
+                    }
+                }
+
+                foreach (Commit commit in allCommits)
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return new List<TaskTimeItem>();
+                    }
+                    if (commit.Author.When.DateTime.Date != date.Value.Date || commit.Author.Email != settings.MercurialAuthorEmail)
+                    {
+                        continue;
+                    }
+
+                    var branch = ListBranchesContaininingCommit(repo, commit.Sha).Select(f => f.FriendlyName)
+                        .Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
+                    if (branch == null)
+                    {
+                        continue;
+                    }
+
+                    var commitMessage = commit.MessageShort;
+                    if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
+                    {
+                        continue;
+                    }
+                    commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
+                    var files = FilesToMerge(commit, repo);
+
+                    var task = new TaskTimeItem(branch,
+                        commitMessage,
+                        directoryInfo.Name,
+                        commit.Committer.When.DateTime,
+                        TimeSpan.Zero,
+                        1,
+                        files.Length, //changeset.PathActions.Count,
+                        "",
+                        GetCommitType(branch));
+                    workTasks.Add(task);
+
+                    _log?.Trace($" - Найден commit: {commit.Committer.When.DateTime} - {branch} - {commit.Author.Email} - {commitMessage}");
+                }
+            }
+            if (!workTasks.Any())
+            {
+                return new List<TaskTimeItem>();
+            }
+
+            return workTasks;
+        }
+
+        private CommitType GetCommitType(string branch)
+        {
+            return branch.StartsWith("release") ? CommitType.Release : CommitType.Task;
+        }
+
+        public String[] FilesToMerge(Commit commit, Repository repo)
+        {
+            var fileList = new List<String>();
+            foreach (var parent in commit.Parents)
+            {
+                foreach (TreeEntryChanges change in repo.Diff.Compare<TreeChanges>(parent.Tree, commit.Tree))
+                {
+                    fileList.Add(change.Path);
+                }
+            }
+            return fileList.ToArray();
+        }
+
+        private IEnumerable<Branch> ListBranchesContaininingCommit(Repository repo, string commitSha)
+        {
+            bool directBranchHasBeenFound = false;
+            foreach (var branch in repo.Branches)
+            {
+                if (branch.Tip.Sha != commitSha)
+                {
+                    continue;
+                }
+
+                directBranchHasBeenFound = true;
+                yield return branch;
+            }
+
+            if (directBranchHasBeenFound)
+            {
+                yield break;
+            }
+
+            foreach (var branch in repo.Branches)
+            {
+                var commits = repo.Commits.QueryBy(new CommitFilter { IncludeReachableFrom = branch }).Where(c => c.Sha == commitSha);
+
+                if (!commits.Any())
+                {
+                    continue;
+                }
+
+                yield return branch;
+            }
+        }
+    }
+}

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -5,6 +5,7 @@ namespace JiraTimeBot.Mercurial
     public interface IAllMercurialProviders
     {
         MercurialLog MercurialLog { get; }
+        GitLog GitLog { get; }
         JiraCommitEmulator JiraCommitEmulator { get; }
         IJiraHistory JiraHistory { get; }
     }

src/JiraTimeBot/Mercurial/IRepositoryLog.cs

@@ -6,8 +6,8 @@ using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.Mercurial
 {
-    public interface IMercurialLog
+    public interface IRepositoryLog
     {
-        List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
+        List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -11,7 +11,7 @@ using Mercurial;
 
 namespace JiraTimeBot.Mercurial
 {
-    public class MercurialLog: IMercurialLog
+    public class MercurialLog: IRepositoryLog
     {
         private readonly ILog _log;
         private readonly ICommitSkipper _commitSkipper;
@@ -24,7 +24,7 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
         
-        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
             {
@@ -51,6 +51,19 @@ namespace JiraTimeBot.Mercurial
                 var directoryInfo = new DirectoryInfo(repoDirectory);
 
                 var repo = new Repository(repoDirectory);
+
+                if (settings.PullBeforeProcess)
+                {
+                    try
+                    {
+                        repo.Pull();
+                    }
+                    catch (Exception ex)
+                    {
+                        _log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}");
+                    }
+                }
+
                 var logCommand = new LogCommand
                 {
                     Date = date,

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -10,6 +10,7 @@ namespace JiraTimeBot.Mercurial.Modifiers
             {
                 return false;
             }
+            
             if (!branch.Contains("-"))
             {
                 return true;
@@ -17,7 +18,9 @@ namespace JiraTimeBot.Mercurial.Modifiers
 
             //Пропускаем Close и Merge коммиты
             if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) ||
-                commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase))
+                commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase) ||
+                commitMessage.StartsWith($"Merged master into", StringComparison.InvariantCultureIgnoreCase) ||
+                commitMessage.StartsWith($"Merge branch", StringComparison.InvariantCultureIgnoreCase))
             {
                 return true;
             }

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,31 +1,31 @@
-using System.Reflection;                                                          
-using System.Runtime.InteropServices;                                                          
-// General Information about an assembly is controlled through the following                                                          
-// set of attributes. Change these attribute values to modify the information                                                          
-// associated with an assembly.                                                          
-[assembly: AssemblyTitle("JiraTimeBot")]                                                          
-[assembly: AssemblyDescription("")]                                                          
-[assembly: AssemblyConfiguration("")]                                                          
-[assembly: AssemblyCompany("")]                                                          
-[assembly: AssemblyProduct("JiraTimeBot")]                                                          
-[assembly: AssemblyCopyright("Copyright © 2019")]                                                          
-[assembly: AssemblyTrademark("")]                                                          
-[assembly: AssemblyCulture("")]                                                          
-// Setting ComVisible to false makes the types in this assembly not visible                                                          
-// to COM components.  If you need to access a type in this assembly from                                                          
-// COM, set the ComVisible attribute to true on that type.                                                          
-[assembly: ComVisible(false)]                                                          
-// The following GUID is for the ID of the typelib if this project is exposed to COM                                                          
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                                          
-// Version information for an assembly consists of the following four values:                                                          
-//                                                          
-//      Major Version                                                          
-//      Minor Version                                                          
-//      Build Number                                                          
-//      Revision                                                          
-//                                                          
-// 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.67")] 
-[assembly: AssemblyFileVersion("1.0.67")] 
-[assembly: AssemblyInformationalVersion("1.0.67")] 
+using System.Reflection;                                                                   
+using System.Runtime.InteropServices;                                                                   
+// General Information about an assembly is controlled through the following                                                                   
+// set of attributes. Change these attribute values to modify the information                                                                   
+// associated with an assembly.                                                                   
+[assembly: AssemblyTitle("JiraTimeBot")]                                                                   
+[assembly: AssemblyDescription("")]                                                                   
+[assembly: AssemblyConfiguration("")]                                                                   
+[assembly: AssemblyCompany("")]                                                                   
+[assembly: AssemblyProduct("JiraTimeBot")]                                                                   
+[assembly: AssemblyCopyright("Copyright © 2019")]                                                                   
+[assembly: AssemblyTrademark("")]                                                                   
+[assembly: AssemblyCulture("")]                                                                   
+// Setting ComVisible to false makes the types in this assembly not visible                                                                   
+// to COM components.  If you need to access a type in this assembly from                                                                   
+// COM, set the ComVisible attribute to true on that type.                                                                   
+[assembly: ComVisible(false)]                                                                   
+// The following GUID is for the ID of the typelib if this project is exposed to COM                                                                   
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                                                   
+// Version information for an assembly consists of the following four values:                                                                   
+//                                                                   
+//      Major Version                                                                   
+//      Minor Version                                                                   
+//      Build Number                                                                   
+//      Revision                                                                   
+//                                                                   
+// 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.76")] 
+[assembly: AssemblyFileVersion("1.0.76")] 
+[assembly: AssemblyInformationalVersion("1.0.76")] 

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -53,6 +53,7 @@
             this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
             this.txtRandomMinutes = new System.Windows.Forms.TextBox();
+            this.chkPullBeforeProcess = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // label5
@@ -168,7 +169,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 359);
+            this.btnSave.Location = new System.Drawing.Point(86, 382);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -182,7 +183,8 @@
             this.cboWorkType.FormattingEnabled = true;
             this.cboWorkType.Items.AddRange(new object[] {
             "Mercurial",
-            "Jira"});
+            "Jira",
+            "Git"});
             this.cboWorkType.Location = new System.Drawing.Point(133, 18);
             this.cboWorkType.Name = "cboWorkType";
             this.cboWorkType.Size = new System.Drawing.Size(99, 21);
@@ -272,11 +274,22 @@
             this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
             this.txtRandomMinutes.TabIndex = 43;
             // 
+            // chkPullBeforeProcess
+            // 
+            this.chkPullBeforeProcess.AutoSize = true;
+            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
+            this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
+            this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
+            this.chkPullBeforeProcess.TabIndex = 45;
+            this.chkPullBeforeProcess.Text = "Делать pull";
+            this.chkPullBeforeProcess.UseVisualStyleBackColor = true;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 391);
+            this.ClientSize = new System.Drawing.Size(243, 414);
+            this.Controls.Add(this.chkPullBeforeProcess);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.txtRandomMinutes);
             this.Controls.Add(this.lblWorkDay);
@@ -340,5 +353,6 @@
         private System.Windows.Forms.TextBox txtWorkDayDuration;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.TextBox txtRandomMinutes;
+        private System.Windows.Forms.CheckBox chkPullBeforeProcess;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -40,6 +40,7 @@ namespace JiraTimeBot.UI
             txtJQL.Text = settings.JiraQuery;
             txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
             txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
+            chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
 
             cboWorkType_SelectedIndexChanged(null, null);
         }
@@ -72,7 +73,8 @@ namespace JiraTimeBot.UI
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
                 MinuterPerWorkDay = minuterPerWorkDay,
-                RandomWorkMinutes = randomWorkMinutes
+                RandomWorkMinutes = randomWorkMinutes,
+                PullBeforeProcess = chkPullBeforeProcess.Checked
             };
 
             //LockUnlock(false);
@@ -100,7 +102,7 @@ namespace JiraTimeBot.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
-            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0 || cboWorkType.SelectedIndex == 2);
         }
     }
 }

src/JiraTimeBot/packages.config

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Atlassian.SDK" version="10.4.0" targetFramework="net461" />
-  <package id="Autofac" version="4.9.1" targetFramework="net461" />
-  <package id="Autofac.Extras.AggregateService" version="4.1.0" targetFramework="net461" />
-  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Atlassian.SDK" version="12.1.0" targetFramework="net461" />
+  <package id="Autofac" version="5.1.2" targetFramework="net461" />
+  <package id="Autofac.Extras.AggregateService" version="5.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
+  <package id="LibGit2Sharp" version="0.27.0-preview-0034" targetFramework="net461" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.298" targetFramework="net461" />
   <package id="Mercurial.Net" version="1.1.1.607" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="RestSharp" version="106.6.9" targetFramework="net461" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+  <package id="RestSharp" version="106.10.1" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
 </packages>