Еще допилил обновление с подпапками

.semver.txt

@@ -1 +1 @@
-1.0.62
+1.0.82

README.md

@@ -8,8 +8,10 @@
 # Настройки
  - Режим работы:
    - Mercurial - по коммитам в Mercurial, можем определять множественные коммиты в одну задачу (ветку) и пропорционально списывать время.
+   - Git - по коммитам в Git.
    - Jira - выполняем JQL и равномерно распределяем время.
- - Путь до репо (Режим Mercurial) - путь до папки, в которую клонируются исходники.
+ - Путь до репо (Режим Mercurial, Git) - путь до папки, в которую клонируются исходники.
+ - Jira URL - адрес Jira-сервреа.
  - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
  - Пароль Jira - шифруется через DPAPI.
  - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты (именно UserName, не E-Mail).
@@ -21,5 +23,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

@@ -1,9 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using Newtonsoft.Json;
 
 namespace JiraTimeBot.Configuration
 {
@@ -12,8 +12,8 @@ namespace JiraTimeBot.Configuration
         public int MinuterPerWorkDay { get; set; }
         public int RoundToMinutes { get; set; }
 
-        public string JiraUrl = "https://myteam.aeroclub.ru";
-
+        public string JiraUrl { get; set; }
+        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

@@ -2,16 +2,17 @@
 using Autofac.Extras.AggregateService;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Modifiers;
+using JiraTimeBot.RepositoryProviders;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
 using JiraTimeBot.TasksProcessors;
 using JiraTimeBot.TaskTime;
-using JiraTimeBot.UI.Tray;
-using System;
-using System.Windows.Forms;
 using JiraTimeBot.UI;
 using JiraTimeBot.UI.Startup;
+using JiraTimeBot.UI.Tray;
 using JiraTimeBot.Update;
+using System;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.DI
 {
@@ -43,9 +44,10 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<TechnicalInfoSkipper>().As<ITechnicalInfoSkipper>().AsSelf();
 
-            _builder.RegisterType<MercurialLog>().As<IMercurialLog>().AsSelf();
-            _builder.RegisterType<JiraCommitEmulator>().As<IMercurialLog>().AsSelf();
-            _builder.RegisterAggregateService<IAllMercurialProviders>();
+            _builder.RegisterType<GitLog>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterType<MercurialLog>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterType<JiraCommitEmulator>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterAggregateService<IAllRepositoryProviders>();
 
             _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();
             _builder.RegisterType<TaskTimeByCommitsCalculator>().As<ITaskTimeCalculator>().AsSelf();
@@ -57,7 +59,9 @@ namespace JiraTimeBot.DI
             _builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
             _builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
 
-            _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
+
+            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
 
             _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
             _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -1,15 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Atlassian.Jira;
+using Atlassian.Jira;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration.Comments;
 using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
 
 namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraApi
+    public interface IJiraApi
+    {
+        List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        string GetTaskName(string branch, Settings settings);
+        List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default);
+    }
+
+    public class JiraApi : IJiraApi
     {
         private readonly ILog _log;
         private readonly IJiraDescriptionSource _descriptionSource;
@@ -34,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);
@@ -61,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)
@@ -77,7 +86,7 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                     var userWorklogs = workLogs.Where(w =>
-                        w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                             StringComparison.InvariantCultureIgnoreCase)).ToList();
                     foreach (var userWorklog in userWorklogs)
                     {
@@ -92,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

@@ -1,16 +1,16 @@
-using System;
+using Atlassian.Jira;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Atlassian.Jira;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
-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))
         {
@@ -53,6 +53,7 @@ namespace JiraTimeBot.JiraIntegration
                             TimeSpan.Zero,
                             1,
                             1,
+                            "",
                             CommitType.Task);
                         workTasks.Add(item);
                     }
@@ -66,6 +67,7 @@ namespace JiraTimeBot.JiraIntegration
                         TimeSpan.Zero,
                         1,
                         1,
+                        "",
                         CommitType.Task);
                     workTasks.Add(item);
                 }

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -0,0 +1,66 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace JiraTimeBot.JiraIntegration
+{
+    public interface IJiraHistory
+    {
+        List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                          Settings settings,
+                                          CancellationToken cancellationToken = default);
+    }
+
+    public class JiraHistory : IJiraHistory
+    {
+        private readonly IJiraApi _jiraApi;
+
+        public JiraHistory(IJiraApi jiraApi)
+        {
+            _jiraApi = jiraApi;
+        }
+
+        public List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                                 Settings settings,
+                                                 CancellationToken cancellationToken = default)
+        {
+            var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
+            List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
+            foreach (var issue in tasks)
+            {
+                var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                var user = settings.JiraUserName;
+                var userWorklogs = workLogs.Where(w =>
+                    w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+                if (!userWorklogs.Any())
+                {
+                    continue;
+                }
+
+                var firstWorklog = userWorklogs.First();
+
+                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'));
+                if (commits == 0)
+                {
+                    commits = 1;
+                }
+                var taskType = CommitType.Task;
+                if (description.Contains("Подготовка и публикация"))
+                {
+                    taskType = CommitType.Release;
+                }
+
+                resultItems.Add(new TaskTimeItem(issue.Key.Value, description, issue.Project, startDate, totalTime, commits, 1, "", taskType));
+            }
+
+            return resultItems;
+        }
+    }
+}

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.306\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\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>
@@ -10,7 +11,24 @@
     <AssemblyName>JiraTimeBot</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +39,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.1</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,37 +54,53 @@
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>JiraTimeBot.Program</StartupObject>
+  </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.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Atlassian.SDK.12.1.1\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.26.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.26.2\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" />
@@ -81,16 +117,18 @@
     <Compile Include="DI\ContainerBuilder.cs" />
     <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
     <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.cs" />
+    <Compile Include="JiraIntegration\JiraHistory.cs" />
     <Compile Include="Job.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Configuration\Settings.cs" />
     <Compile Include="JiraIntegration\JiraCommitEmulator.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\Modifiers\TechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\GitLog.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\CommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ICommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IRepositoryLog.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
     <Compile Include="TaskTime\Objects\CommitType.cs" />
     <Compile Include="TaskTime\TaskTimeSpread.cs" />
@@ -101,7 +139,7 @@
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
     <Compile Include="JiraIntegration\JiraApi.cs" />
-    <Compile Include="Mercurial\MercurialLog.cs" />
+    <Compile Include="RepositoryProviders\MercurialLog.cs" />
     <Compile Include="Configuration\PasswordEncryptionClass.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -158,5 +196,23 @@
   <ItemGroup>
     <Content Include="app.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </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.306\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+  </Target>
 </Project>

src/JiraTimeBot/Job.cs

@@ -1,23 +1,23 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.TaskTime;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.TasksProcessors;
-using JiraTimeBot.TaskTime;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot
 {
     class Job
     {
-        private readonly IAllMercurialProviders _mercurialProviders;
+        private readonly IAllRepositoryProviders _mercurialProviders;
         private readonly ITaskTimeCalculator _taskTimeDiscoverer;
         private readonly ILog _log;
 
-        public Job(IAllMercurialProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
+        public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
         {
             _mercurialProviders = mercurialProviders;
             _taskTimeDiscoverer = taskTimeDiscoverer;
@@ -72,14 +72,29 @@ 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;
             }
-            List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);
-            List<TaskTimeItem> taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
+            else if (settings.WorkType == WorkType.GitLogs)
+            {
+                _log.Info("Использую Git как источник информации.");
+                mercurial = _mercurialProviders.GitLog;
+            }
+
+            List<TaskTimeItem> taskTimes;
+            if (!(tasksProcessor is MeetingProcessor))
+            {
+                List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
+                taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
+            }
+            else
+            {
+                var provider = _mercurialProviders.JiraHistory;
+                taskTimes = provider.GetDayWorklogs(realDate, settings, cancellationToken);
+            }
 
             if (cancellationToken.IsCancellationRequested)
             {

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -1,10 +0,0 @@
-using JiraTimeBot.JiraIntegration;
-
-namespace JiraTimeBot.Mercurial
-{
-    public interface IAllMercurialProviders
-    {
-        MercurialLog MercurialLog { get; }
-        JiraCommitEmulator JiraCommitEmulator { get; }
-    }
-}

src/JiraTimeBot/Mercurial/IMercurialLog.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
-
-namespace JiraTimeBot.Mercurial
-{
-    public interface IMercurialLog
-    {
-        List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}

src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

@@ -1,7 +0,0 @@
-namespace JiraTimeBot.Mercurial.Modifiers
-{
-    public interface ITechnicalInfoSkipper
-    {
-        string StripTechnicalInfo(string commitMessage);
-    }
-}

src/JiraTimeBot/Program.cs

@@ -1,8 +1,8 @@
 using JiraTimeBot.UI;
+using JiraTimeBot.UI.Tray;
 using System;
 using System.Threading;
 using System.Windows.Forms;
-using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]   
 [assembly: AssemblyCompany("")]   
 [assembly: AssemblyProduct("JiraTimeBot")]   
-[assembly: AssemblyCopyright("Copyright © 2019")]                                                     
+[assembly: AssemblyCopyright("Copyright © 2020")]   
 [assembly: AssemblyTrademark("")]   
 [assembly: AssemblyCulture("")]   
 // Setting ComVisible to false makes the types in this assembly not visible                                                                         
@@ -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.62")] 
-[assembly: AssemblyFileVersion("1.0.62")] 
-[assembly: AssemblyInformationalVersion("1.0.62")] 
+[assembly: AssemblyVersion("1.0.82")] 
+[assembly: AssemblyFileVersion("1.0.82")] 
+[assembly: AssemblyInformationalVersion("1.0.82")] 

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -0,0 +1,194 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
+using JiraTimeBot.TaskTime.Objects;
+using LibGit2Sharp;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+namespace JiraTimeBot.RepositoryProviders
+{
+    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;
+                    commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
+
+                    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/RepositoryProviders/Interfaces/IAllVcsProviders.cs

@@ -0,0 +1,12 @@
+using JiraTimeBot.JiraIntegration;
+
+namespace JiraTimeBot.RepositoryProviders.Interfaces
+{
+    public interface IAllRepositoryProviders
+    {
+        MercurialLog MercurialLog { get; }
+        GitLog GitLog { get; }
+        JiraCommitEmulator JiraCommitEmulator { get; }
+        IJiraHistory JiraHistory { get; }
+    }
+}

src/JiraTimeBot/RepositoryProviders/Interfaces/IRepositoryLog.cs

@@ -0,0 +1,13 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace JiraTimeBot.RepositoryProviders.Interfaces
+{
+    public interface IRepositoryLog
+    {
+        List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
+    }
+}

src/JiraTimeBot/RepositoryProviders/MercurialLog.cs

@@ -1,17 +1,18 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
+using JiraTimeBot.TaskTime.Objects;
+using Mercurial;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.TaskTime.Objects;
-using Mercurial;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders
 {
-    public class MercurialLog: IMercurialLog
+    public class MercurialLog : IRepositoryLog
     {
         private readonly ILog _log;
         private readonly ICommitSkipper _commitSkipper;
@@ -24,7 +25,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 +52,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,
@@ -81,6 +95,7 @@ namespace JiraTimeBot.Mercurial
                         TimeSpan.Zero,
                         1,
                         changeset.PathActions.Count,
+                        "",
                         GetCommitType(changeset.Branch));
 
                     if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
@@ -95,6 +110,7 @@ namespace JiraTimeBot.Mercurial
 
                         task.Branch = branch;
                         task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
+                        task.ReleaseVersion = release;
                     }
                     workTasks.Add(task);
                     _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");

src/JiraTimeBot/RepositoryProviders/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {
@@ -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", StringComparison.InvariantCultureIgnoreCase) ||
+                commitMessage.StartsWith($"Merge branch", StringComparison.InvariantCultureIgnoreCase))
             {
                 return true;
             }

src/JiraTimeBot/RepositoryProviders/Modifiers/ICommitSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public interface ICommitSkipper
     {

src/JiraTimeBot/RepositoryProviders/Modifiers/ITechnicalInfoSkipper.cs

@@ -0,0 +1,8 @@
+namespace JiraTimeBot.RepositoryProviders.Modifiers
+{
+    public interface ITechnicalInfoSkipper
+    {
+        string StripBranchPrefix(string branch, string commitMessage);
+        string StripTechnicalInfo(string commitMessage);
+    }
+}

src/JiraTimeBot/RepositoryProviders/Modifiers/TechnicalInfoSkipper.cs

@@ -1,9 +1,26 @@
-using System.Text;
+using System;
+using System.Text;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public class TechnicalInfoSkipper : ITechnicalInfoSkipper
     {
+        public string StripBranchPrefix(string branch, string commitMessage)
+        {
+            if (commitMessage.StartsWith(branch, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return commitMessage.TrimStart(branch.ToCharArray()).Trim();
+            }
+
+            var quotedBranch = $"[{branch}]";
+            if (commitMessage.StartsWith(quotedBranch, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return commitMessage.TrimStart(quotedBranch.ToCharArray()).Trim();
+            }
+
+            return commitMessage;
+        }
+
         public string StripTechnicalInfo(string commitMessage)
         {
             if (!commitMessage.Contains("Signed-by:"))

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
-
+using JiraTimeBot.Configuration;
 using JiraTimeBot.TaskTime.Objects;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace JiraTimeBot.TaskTime
 {

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -3,7 +3,8 @@
 namespace JiraTimeBot.TaskTime.Objects
 {
     [Flags]
-    public enum CommitType {
+    public enum CommitType
+    {
         Task = 1,
         Release = 2
     }

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -12,9 +12,10 @@ namespace JiraTimeBot.TaskTime.Objects
         public int FilesAffected { get; set; }
         public CommitType Type { get; set; }
         public string Project { get; set; }
+        public string ReleaseVersion { get; set; }
 
         public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits,
-                            int filesAffected = 1, CommitType type = CommitType.Task)
+                            int filesAffected = 1, string releaseVersion = "", CommitType type = CommitType.Task)
         {
             Branch = branch;
             Description = description;
@@ -23,7 +24,16 @@ namespace JiraTimeBot.TaskTime.Objects
             TimeSpent = timeSpent;
             StartTime = startTime;
             FilesAffected = filesAffected;
+            ReleaseVersion = releaseVersion;
             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

@@ -1,11 +1,9 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
 {
@@ -59,12 +57,10 @@ namespace JiraTimeBot.TaskTime
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
             foreach (var workTask in workTasks)
             {
-                var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
                 if (existingItem != null)
                 {
-                    existingItem.TimeSpent += workTask.TimeSpent;
-                    existingItem.Description += "\r\n" + workTask.Description;
-                    existingItem.Type |= CommitType.Task;
+                    existingItem.MergeWith(workTask);
                     continue;
                 }
 
@@ -101,6 +97,7 @@ namespace JiraTimeBot.TaskTime
                     TimeSpan.FromMinutes(minutes),
                     1,
                     1,
+                    "",
                     CommitType.Task);
             }
 

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -1,8 +1,8 @@
-using System;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
 {
@@ -19,20 +19,18 @@ namespace JiraTimeBot.TaskTime
         public List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true)
         {
             List<TaskTimeItem> newList = new List<TaskTimeItem>();
-            int remainMinutes = minutes;
 
             //Нам нужно раскидать 480 минут в день.
             foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count()))
             {
                 int currentTaskCommits = taskGroup.Count();
                 int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
-                remainMinutes = remainMinutes - currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
                 StringBuilder sb = new StringBuilder();
-                foreach (var task in orderedTasks)
+                foreach (var taskDescription in orderedTasks.Select(f => f.Description).Distinct())
                 {
-                    sb.AppendLine($"- {task.Description}");
+                    sb.AppendLine($"- {taskDescription}");
                 }
 
                 var timeSpent = appendTime
@@ -48,6 +46,7 @@ namespace JiraTimeBot.TaskTime
                     timeSpent,
                     taskGroup.Sum(f => f.Commits),
                     taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().ReleaseVersion,
                     taskGroup.First().Type);
 
                 newList.Add(taskTimeItem);

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

@@ -1,8 +1,8 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TasksProcessors
 {

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -1,10 +1,10 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.JiraIntegration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TasksProcessors
 {
@@ -21,7 +21,8 @@ namespace JiraTimeBot.TasksProcessors
 
         public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
+            var totalTime = TimeSpan.FromSeconds(taskTimes.Sum(f => f.TimeSpent.TotalSeconds));
+            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам ({totalTime:hh':'mm':'ss}):");
 
             foreach (var taskTime in taskTimes.Where(f => f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
+using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace JiraTimeBot.TasksProcessors
 {

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

@@ -1,5 +1,5 @@
-using System.Windows.Forms;
-using Microsoft.Win32;
+using Microsoft.Win32;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Startup
 {

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -4,7 +4,8 @@ using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Tray
 {
-    public static class RestoreFromTray {
+    public static class RestoreFromTray
+    {
         [DllImport("user32.dll")]
         private static extern int ShowWindow(IntPtr hWnd, uint Msg);
 

src/JiraTimeBot/UI/Tray/SingleInstance.cs

@@ -19,7 +19,8 @@ namespace JiraTimeBot.UI.Tray
             get
             {
                 object[] attributes = Assembly.GetEntryAssembly().GetCustomAttributes(typeof(System.Runtime.InteropServices.GuidAttribute), false);
-                if (attributes.Length == 0) {
+                if (attributes.Length == 0)
+                {
                     return string.Empty;
                 }
                 return ((GuidAttribute)attributes[0]).Value;

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -81,6 +81,7 @@
             this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tlpControls.Size = new System.Drawing.Size(759, 416);
             this.tlpControls.TabIndex = 19;
+            this.tlpControls.Paint += new System.Windows.Forms.PaintEventHandler(this.tlpControls_Paint);
             // 
             // txtLog
             // 

src/JiraTimeBot/UI/frmMain.cs

@@ -2,16 +2,14 @@
 using JiraTimeBot.Configuration;
 using JiraTimeBot.DI;
 using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.UI.Startup;
 using JiraTimeBot.UI.Tray;
 using JiraTimeBot.Update;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using JiraTimeBot.UI.Startup;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -34,11 +32,13 @@ namespace JiraTimeBot.UI
 
         protected override void WndProc(ref Message message)
         {
-            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE) {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE)
+            {
                 this.Show();
                 this.WindowState = FormWindowState.Normal;
                 _trayIcon.Hide();
             }
+
             base.WndProc(ref message);
         }
 
@@ -73,7 +73,9 @@ namespace JiraTimeBot.UI
                 var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
-            _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
+            _settingsErrorReporter = msg =>
+                MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            ;
         }
 
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -122,7 +124,8 @@ namespace JiraTimeBot.UI
         private void PrintStartMessage()
         {
             _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
-            _log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
+            _log.Info(
+                $"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
         }
 
         private async void btnStart_Click(object sender, EventArgs e)
@@ -131,7 +134,8 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token); 
+                await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked,
+                    _tokenSource.Token);
             }
 
             LockUnlock(true);
@@ -177,7 +181,8 @@ namespace JiraTimeBot.UI
 
                 using (var tokenSource = GetTokenSource())
                 {
-                    await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, tokenSource.Token);
+                    await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked,
+                        tokenSource.Token);
                 }
 
                 LockUnlock(true);
@@ -190,7 +195,8 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked,
+                    _tokenSource.Token);
             }
 
             LockUnlock(true);
@@ -245,11 +251,15 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings,
+                    _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
             }
 
             LockUnlock(true);
+        }
 
+        private void tlpControls_Paint(object sender, PaintEventArgs e)
+        {
         }
     }
 }

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -30,8 +30,6 @@
         {
             this.label5 = new System.Windows.Forms.Label();
             this.txtRoundTo = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.txtRepoPath = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.txtMercurialEmail = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
@@ -53,12 +51,17 @@
             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.txtRepoPath = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.lblJiraUrl = new System.Windows.Forms.Label();
+            this.txtJiraUrl = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(33, 153);
+            this.label5.Location = new System.Drawing.Point(33, 175);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(100, 13);
             this.label5.TabIndex = 28;
@@ -66,33 +69,16 @@
             // 
             // txtRoundTo
             // 
-            this.txtRoundTo.Location = new System.Drawing.Point(133, 150);
+            this.txtRoundTo.Location = new System.Drawing.Point(133, 169);
             this.txtRoundTo.Name = "txtRoundTo";
             this.txtRoundTo.Size = new System.Drawing.Size(100, 20);
             this.txtRoundTo.TabIndex = 27;
             this.txtRoundTo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtRoundTo_KeyPress);
             // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(53, 48);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(76, 13);
-            this.label4.TabIndex = 26;
-            this.label4.Text = "Путь до репо:";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // txtRepoPath
-            // 
-            this.txtRepoPath.Location = new System.Drawing.Point(133, 45);
-            this.txtRepoPath.Name = "txtRepoPath";
-            this.txtRepoPath.Size = new System.Drawing.Size(100, 20);
-            this.txtRepoPath.TabIndex = 25;
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(47, 127);
+            this.label2.Location = new System.Drawing.Point(47, 149);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(82, 13);
             this.label2.TabIndex = 24;
@@ -101,7 +87,7 @@
             // 
             // txtMercurialEmail
             // 
-            this.txtMercurialEmail.Location = new System.Drawing.Point(133, 124);
+            this.txtMercurialEmail.Location = new System.Drawing.Point(133, 146);
             this.txtMercurialEmail.Name = "txtMercurialEmail";
             this.txtMercurialEmail.Size = new System.Drawing.Size(100, 20);
             this.txtMercurialEmail.TabIndex = 23;
@@ -109,7 +95,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(62, 100);
+            this.label1.Location = new System.Drawing.Point(62, 122);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(71, 13);
             this.label1.TabIndex = 22;
@@ -117,7 +103,7 @@
             // 
             // txtJiraPassword
             // 
-            this.txtJiraPassword.Location = new System.Drawing.Point(133, 97);
+            this.txtJiraPassword.Location = new System.Drawing.Point(133, 119);
             this.txtJiraPassword.Name = "txtJiraPassword";
             this.txtJiraPassword.PasswordChar = '*';
             this.txtJiraPassword.Size = new System.Drawing.Size(100, 20);
@@ -126,7 +112,7 @@
             // lbl1
             // 
             this.lbl1.AutoSize = true;
-            this.lbl1.Location = new System.Drawing.Point(69, 74);
+            this.lbl1.Location = new System.Drawing.Point(69, 96);
             this.lbl1.Name = "lbl1";
             this.lbl1.Size = new System.Drawing.Size(64, 13);
             this.lbl1.TabIndex = 20;
@@ -134,7 +120,7 @@
             // 
             // txtJiraLogin
             // 
-            this.txtJiraLogin.Location = new System.Drawing.Point(133, 71);
+            this.txtJiraLogin.Location = new System.Drawing.Point(133, 93);
             this.txtJiraLogin.Name = "txtJiraLogin";
             this.txtJiraLogin.Size = new System.Drawing.Size(100, 20);
             this.txtJiraLogin.TabIndex = 19;
@@ -142,7 +128,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(41, 232);
+            this.label3.Location = new System.Drawing.Point(41, 254);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(91, 13);
             this.label3.TabIndex = 30;
@@ -151,7 +137,7 @@
             // actTime
             // 
             this.actTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
-            this.actTime.Location = new System.Drawing.Point(133, 228);
+            this.actTime.Location = new System.Drawing.Point(133, 250);
             this.actTime.Name = "actTime";
             this.actTime.Size = new System.Drawing.Size(100, 20);
             this.actTime.TabIndex = 29;
@@ -159,7 +145,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(65, 336);
+            this.chkAddComments.Location = new System.Drawing.Point(65, 366);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -168,7 +154,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 359);
+            this.btnSave.Location = new System.Drawing.Point(86, 412);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -182,7 +168,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);
@@ -201,7 +188,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(100, 179);
+            this.label7.Location = new System.Drawing.Point(100, 201);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(29, 13);
             this.label7.TabIndex = 37;
@@ -209,7 +196,7 @@
             // 
             // txtJQL
             // 
-            this.txtJQL.Location = new System.Drawing.Point(133, 176);
+            this.txtJQL.Location = new System.Drawing.Point(133, 198);
             this.txtJQL.Name = "txtJQL";
             this.txtJQL.Size = new System.Drawing.Size(99, 20);
             this.txtJQL.TabIndex = 36;
@@ -217,7 +204,7 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(-2, 206);
+            this.label8.Location = new System.Drawing.Point(-2, 228);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(133, 13);
             this.label8.TabIndex = 39;
@@ -225,7 +212,7 @@
             // 
             // txtTimeControlTask
             // 
-            this.txtTimeControlTask.Location = new System.Drawing.Point(133, 202);
+            this.txtTimeControlTask.Location = new System.Drawing.Point(133, 224);
             this.txtTimeControlTask.Name = "txtTimeControlTask";
             this.txtTimeControlTask.Size = new System.Drawing.Size(99, 20);
             this.txtTimeControlTask.TabIndex = 38;
@@ -233,7 +220,7 @@
             // chkAutostart
             // 
             this.chkAutostart.AutoSize = true;
-            this.chkAutostart.Location = new System.Drawing.Point(65, 313);
+            this.chkAutostart.Location = new System.Drawing.Point(65, 343);
             this.chkAutostart.Name = "chkAutostart";
             this.chkAutostart.Size = new System.Drawing.Size(96, 17);
             this.chkAutostart.TabIndex = 40;
@@ -243,7 +230,7 @@
             // lblWorkDay
             // 
             this.lblWorkDay.AutoSize = true;
-            this.lblWorkDay.Location = new System.Drawing.Point(15, 258);
+            this.lblWorkDay.Location = new System.Drawing.Point(15, 280);
             this.lblWorkDay.Name = "lblWorkDay";
             this.lblWorkDay.Size = new System.Drawing.Size(117, 13);
             this.lblWorkDay.TabIndex = 42;
@@ -251,7 +238,7 @@
             // 
             // txtWorkDayDuration
             // 
-            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 254);
+            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 276);
             this.txtWorkDayDuration.Name = "txtWorkDayDuration";
             this.txtWorkDayDuration.Size = new System.Drawing.Size(99, 20);
             this.txtWorkDayDuration.TabIndex = 41;
@@ -259,7 +246,7 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(30, 284);
+            this.label9.Location = new System.Drawing.Point(30, 306);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(101, 13);
             this.label9.TabIndex = 44;
@@ -267,16 +254,63 @@
             // 
             // txtRandomMinutes
             // 
-            this.txtRandomMinutes.Location = new System.Drawing.Point(133, 280);
+            this.txtRandomMinutes.Location = new System.Drawing.Point(133, 302);
             this.txtRandomMinutes.Name = "txtRandomMinutes";
             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, 389);
+            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;
+            // 
+            // txtRepoPath
+            // 
+            this.txtRepoPath.Location = new System.Drawing.Point(133, 45);
+            this.txtRepoPath.Name = "txtRepoPath";
+            this.txtRepoPath.Size = new System.Drawing.Size(100, 20);
+            this.txtRepoPath.TabIndex = 25;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(53, 48);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(76, 13);
+            this.label4.TabIndex = 26;
+            this.label4.Text = "Путь до репо:";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // lblJiraUrl
+            // 
+            this.lblJiraUrl.AutoSize = true;
+            this.lblJiraUrl.Location = new System.Drawing.Point(53, 72);
+            this.lblJiraUrl.Name = "lblJiraUrl";
+            this.lblJiraUrl.Size = new System.Drawing.Size(76, 13);
+            this.lblJiraUrl.TabIndex = 47;
+            this.lblJiraUrl.Text = "Путь до репо:";
+            this.lblJiraUrl.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // txtJiraUrl
+            // 
+            this.txtJiraUrl.Location = new System.Drawing.Point(133, 69);
+            this.txtJiraUrl.Name = "txtJiraUrl";
+            this.txtJiraUrl.Size = new System.Drawing.Size(100, 20);
+            this.txtJiraUrl.TabIndex = 46;
+            // 
             // 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, 442);
+            this.Controls.Add(this.lblJiraUrl);
+            this.Controls.Add(this.txtJiraUrl);
+            this.Controls.Add(this.chkPullBeforeProcess);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.txtRandomMinutes);
             this.Controls.Add(this.lblWorkDay);
@@ -317,8 +351,6 @@
 
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox txtRoundTo;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox txtRepoPath;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox txtMercurialEmail;
         private System.Windows.Forms.Label label1;
@@ -340,5 +372,10 @@
         private System.Windows.Forms.TextBox txtWorkDayDuration;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.TextBox txtRandomMinutes;
+        private System.Windows.Forms.CheckBox chkPullBeforeProcess;
+        private System.Windows.Forms.TextBox txtRepoPath;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label lblJiraUrl;
+        private System.Windows.Forms.TextBox txtJiraUrl;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Windows.Forms;
-using JiraTimeBot.Configuration;
+using JiraTimeBot.Configuration;
 using JiraTimeBot.UI.Startup;
+using System;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.UI
 {
@@ -28,6 +28,7 @@ namespace JiraTimeBot.UI
 
         private void SetSettings(Settings settings)
         {
+            txtJiraUrl.Text = settings.JiraUrl;
             txtJiraLogin.Text = settings.JiraUserName;
             txtJiraPassword.Text = settings.JiraPassword;
             txtMercurialEmail.Text = settings.MercurialAuthorEmail;
@@ -40,6 +41,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);
         }
@@ -61,6 +63,7 @@ namespace JiraTimeBot.UI
 
             var settings = new Settings
             {
+                JiraUrl = txtJiraUrl.Text,
                 JiraUserName = txtJiraLogin.Text,
                 JiraPassword = txtJiraPassword.Text,
                 MercurialAuthorEmail = txtMercurialEmail.Text,
@@ -72,7 +75,8 @@ namespace JiraTimeBot.UI
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
                 MinuterPerWorkDay = minuterPerWorkDay,
-                RandomWorkMinutes = randomWorkMinutes
+                RandomWorkMinutes = randomWorkMinutes,
+                PullBeforeProcess = chkPullBeforeProcess.Checked
             };
 
             //LockUnlock(false);
@@ -100,7 +104,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/Update/GitHubDataObjects.cs

@@ -1,5 +1,5 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using System;
 
 namespace JiraTimeBot.Update
 {

src/JiraTimeBot/Update/IUpdater.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace JiraTimeBot.Update
+namespace JiraTimeBot.Update
 {
     internal interface IUpdater
     {

src/JiraTimeBot/Update/Updater.cs

@@ -1,17 +1,19 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-using Newtonsoft.Json;
 
 namespace JiraTimeBot.Update
 {
     public class Updater : IUpdater
     {
         private readonly ILog _log;
+        private double _downloadPercent = 0;
 
         public Updater(ILog log)
         {
@@ -81,6 +83,7 @@ namespace JiraTimeBot.Update
             {
                 _log.Info($"Вы используете актуальную версию.");
             }
+
             return false;
         }
 
@@ -89,46 +92,51 @@ namespace JiraTimeBot.Update
             try
             {
                 _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
-                //Rename he executing file
-                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+
+                var appFile = new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
                 var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
-                if (!Directory.Exists(bkpDir))
-                {
+
+                if (Directory.Exists(bkpDir))
+                    Directory.Delete(bkpDir, true);
+                _log.Info($"Создаю директорию {bkpDir}.");
                 Directory.CreateDirectory(bkpDir);
+
+                //забэкапим все папки
+                foreach (var dir in Directory.GetDirectories(appFile.DirectoryName).Where(f=>!f.EndsWith("bkp")))
+                {
+                    var dirName = new DirectoryInfo(dir);
+                    var bkpDirPath = Path.Combine(bkpDir, dirName.Name);
+                    if (Directory.Exists(bkpDirPath))
+                        Directory.Delete(bkpDirPath, true);
+                    Directory.Move(dir, bkpDirPath);
+                }
+                //и файлы
+                foreach (var file in Directory.GetFiles(appFile.DirectoryName).Where(f=>!f.EndsWith("update.zip")))
+                {
+                    File.Move(file, Path.Combine(bkpDir, new FileInfo(file).Name));
                 }
 
+                //распакуем архив
                 using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
                 {
-                    foreach (ZipArchiveEntry entry in archive.Entries)
-                    {
-                        var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
-                        if (File.Exists(zipEntryPath))
-                        {
-                            System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
-                            if (File.Exists(bkpDir + "\\" + zipEntryFile.Name))
-                            {
-                                File.Delete(bkpDir + "\\" + zipEntryFile.Name);
-                            }
-                            System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
-                        }
-
-                        entry.ExtractToFile(zipEntryPath);
-                    }
+                    archive.ExtractToDirectory(appFile.DirectoryName);
                 }
 
                 _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
                 return true;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                _log.Error($"Что-то пошло не так при обновлении.");
+                _log.Error($"Что-то пошло не так при обновлении {ex.Message}: {ex.StackTrace}.");
                 return false;
             }
         }
+
         public void SelfRestart()
         {
             var name = Application.ExecutablePath;
-            ProcessStartInfo startInfo = new ProcessStartInfo {
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
                 Arguments = "/C choice /C Y /N /D Y /T 1 & \"" + name + "\"",
                 WindowStyle = ProcessWindowStyle.Hidden,
                 CreateNoWindow = true,
@@ -143,12 +151,15 @@ namespace JiraTimeBot.Update
         {
             try
             {
-
                 using (var client = new WebClient())
                 {
                     client.Headers.Add("User-Agent",
                         "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
-                    client.DownloadFile(url, to);
+                    client.DownloadProgressChanged += ClientOnDownloadProgressChanged;
+                    client.DownloadFileAsync(new Uri(url), to);
+                    
+                    while (client.IsBusy) { Application.DoEvents(); }
+                    
                     return true;
                 }
             }
@@ -158,6 +169,16 @@ namespace JiraTimeBot.Update
             }
         }
 
+        private void ClientOnDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            var percent = Math.Truncate(e.BytesReceived / (double)e.TotalBytesToReceive * 100);
+            if (Math.Abs(_downloadPercent - percent) >= 10)
+            {
+                _log.Info($"Downloaded: {percent}%");
+                _downloadPercent = percent;
+            }
+        }
+
         private string Get(string uri)
         {
             try

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.1" 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.26.2" targetFramework="net461" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.306" 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>