Исправил обновление после добавления гита

.semver.txt

@@ -1 +1 @@
-1.0.74
+1.0.81

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).

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,7 +12,7 @@ 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; }

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
 {
@@ -46,7 +47,7 @@ namespace JiraTimeBot.DI
             _builder.RegisterType<GitLog>().As<IRepositoryLog>().AsSelf();
             _builder.RegisterType<MercurialLog>().As<IRepositoryLog>().AsSelf();
             _builder.RegisterType<JiraCommitEmulator>().As<IRepositoryLog>().AsSelf();
-            _builder.RegisterAggregateService<IAllMercurialProviders>();
+            _builder.RegisterAggregateService<IAllRepositoryProviders>();
 
             _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();
             _builder.RegisterType<TaskTimeByCommitsCalculator>().As<ITaskTimeCalculator>().AsSelf();
@@ -60,7 +61,7 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
 
-            _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _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,11 +1,11 @@
-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
 {

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -1,11 +1,11 @@
-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

src/JiraTimeBot/JiraIntegration/JiraHistory.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 System.Threading.Tasks;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.JiraIntegration
 {

src/JiraTimeBot/JiraTimeBot.csproj

@@ -1,6 +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="..\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>
@@ -11,9 +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>
@@ -25,6 +40,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>7.1</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,9 +54,12 @@
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>JiraTimeBot.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
-    <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 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=5.1.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\packages\Autofac.5.1.2\lib\net461\Autofac.dll</HintPath>
@@ -51,8 +70,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <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 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>
@@ -103,13 +122,13 @@
     <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\IRepositoryLog.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" />
@@ -120,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" />
@@ -177,11 +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.298\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+    <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;

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.74")] 
-[assembly: AssemblyFileVersion("1.0.74")] 
-[assembly: AssemblyInformationalVersion("1.0.74")] 
+[assembly: AssemblyVersion("1.0.81")] 
+[assembly: AssemblyFileVersion("1.0.81")] 
+[assembly: AssemblyInformationalVersion("1.0.81")] 

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -1,17 +1,15 @@
-using System;
+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.ServiceModel.Security;
-using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.TaskTime.Objects;
-using LibGit2Sharp;
-using LibGit2Sharp.Handlers;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders
 {
     public class GitLog : IRepositoryLog
     {
@@ -80,7 +78,7 @@ namespace JiraTimeBot.Mercurial
                 var reflog = repo.Refs.Log(repo.Refs.Head);
                 foreach (var reflogItem in reflog)
                 {
-                    if (reflogItem.Committer.When.Date != date || reflogItem.Committer.Email != settings.MercurialAuthorEmail)
+                    if (reflogItem.Committer.When.Date != date.Value.Date || reflogItem.Committer.Email != settings.MercurialAuthorEmail)
                     {
                         continue;
                     }
@@ -98,7 +96,7 @@ namespace JiraTimeBot.Mercurial
                     {
                         return new List<TaskTimeItem>();
                     }
-                    if (commit.Author.When.DateTime.Date != date || commit.Author.Email != settings.MercurialAuthorEmail)
+                    if (commit.Author.When.DateTime.Date != date.Value.Date || commit.Author.Email != settings.MercurialAuthorEmail)
                     {
                         continue;
                     }
@@ -111,10 +109,13 @@ namespace JiraTimeBot.Mercurial
                     }
 
                     var commitMessage = commit.MessageShort;
+                    commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
+
                     if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
                     {
                         continue;
                     }
+
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
                     var files = FilesToMerge(commit, repo);
 

src/JiraTimeBot/RepositoryProviders/Interfaces/IAllVcsProviders.cs

@@ -1,8 +1,8 @@
 using JiraTimeBot.JiraIntegration;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders.Interfaces
 {
-    public interface IAllMercurialProviders
+    public interface IAllRepositoryProviders
     {
         MercurialLog MercurialLog { get; }
         GitLog GitLog { get; }

src/JiraTimeBot/RepositoryProviders/Interfaces/IRepositoryLog.cs

@@ -1,10 +1,10 @@
-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.Mercurial
+namespace JiraTimeBot.RepositoryProviders.Interfaces
 {
     public interface IRepositoryLog
     {

src/JiraTimeBot/RepositoryProviders/MercurialLog.cs

@@ -1,15 +1,16 @@
-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 : IRepositoryLog
     {

src/JiraTimeBot/RepositoryProviders/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {
@@ -19,6 +19,7 @@ namespace JiraTimeBot.Mercurial.Modifiers
             //Пропускаем Close и Merge коммиты
             if (commitMessage.StartsWith($"Close {branch}", 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/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
 {

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
 {

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
 {

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.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,7 +32,8 @@ 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();

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();
@@ -54,12 +52,16 @@
             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;
@@ -67,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;
@@ -102,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;
@@ -110,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;
@@ -118,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);
@@ -127,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;
@@ -135,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;
@@ -143,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;
@@ -152,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;
@@ -160,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;
@@ -169,7 +154,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 382);
+            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;
@@ -203,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;
@@ -211,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;
@@ -219,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;
@@ -227,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;
@@ -235,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;
@@ -245,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;
@@ -253,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;
@@ -261,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;
@@ -269,7 +254,7 @@
             // 
             // 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;
@@ -277,18 +262,54 @@
             // chkPullBeforeProcess
             // 
             this.chkPullBeforeProcess.AutoSize = true;
-            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
+            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, 414);
+            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);
@@ -330,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;
@@ -354,5 +373,9 @@
         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;
@@ -62,6 +63,7 @@ namespace JiraTimeBot.UI
 
             var settings = new Settings
             {
+                JiraUrl = txtJiraUrl.Text,
                 JiraUserName = txtJiraLogin.Text,
                 JiraPassword = txtJiraPassword.Text,
                 MercurialAuthorEmail = txtMercurialEmail.Text,

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,11 +1,11 @@
-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.Windows.Forms;
-using Newtonsoft.Json;
 
 namespace JiraTimeBot.Update
 {
@@ -81,6 +81,7 @@ namespace JiraTimeBot.Update
             {
                 _log.Info($"Вы используете актуальную версию.");
             }
+
             return false;
         }
 
@@ -90,10 +91,12 @@ namespace JiraTimeBot.Update
             {
                 _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
                 //Rename he executing file
-                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                System.IO.FileInfo appFile =
+                    new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
                 var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
                 if (!Directory.Exists(bkpDir))
                 {
+                    _log.Info($"Создаю директорию {bkpDir}.");
                     Directory.CreateDirectory(bkpDir);
                 }
 
@@ -102,6 +105,17 @@ namespace JiraTimeBot.Update
                     foreach (ZipArchiveEntry entry in archive.Entries)
                     {
                         var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
+                        if (entry.FullName.EndsWith("/"))
+                        {
+                            var bkpEntryPath = Path.Combine(bkpDir, entry.FullName);
+                            bkpEntryPath = bkpEntryPath.TrimEnd('/');
+                            if (!Directory.Exists(bkpEntryPath))
+                            {
+                                Directory.CreateDirectory(bkpEntryPath);
+                            }
+                        }
+                        else
+                        {
                             if (File.Exists(zipEntryPath))
                             {
                                 System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
@@ -109,26 +123,29 @@ namespace JiraTimeBot.Update
                                 {
                                     File.Delete(bkpDir + "\\" + zipEntryFile.Name);
                                 }
+
                                 System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
                             }
-
                             entry.ExtractToFile(zipEntryPath);
                         }
                     }
+                }
 
                 _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,7 +160,6 @@ namespace JiraTimeBot.Update
         {
             try
             {
-
                 using (var client = new WebClient())
                 {
                     client.Headers.Add("User-Agent",

src/JiraTimeBot/packages.config

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Atlassian.SDK" version="12.1.0" 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.27.0-preview-0034" targetFramework="net461" />
-  <package id="LibGit2Sharp.NativeBinaries" version="2.0.298" 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="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />