diff --git a/.semver.txt b/.semver.txt index be1dcc8..ea2f1d3 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.73 +1.0.74 diff --git a/src/JiraTimeBot/Mercurial/GitLog.cs b/src/JiraTimeBot/Mercurial/GitLog.cs index fae84b3..adbdcbf 100644 --- a/src/JiraTimeBot/Mercurial/GitLog.cs +++ b/src/JiraTimeBot/Mercurial/GitLog.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.ServiceModel.Security; using System.Text; using System.Threading; using JiraTimeBot.Configuration; @@ -73,9 +74,25 @@ namespace JiraTimeBot.Mercurial _log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}"); } } - var filter = new CommitFilter { SortBy = CommitSortStrategies.Time }; + + var allCommits = new List(); - foreach (Commit commit in repo.Commits.QueryBy(filter).Take(200)) + var reflog = repo.Refs.Log(repo.Refs.Head); + foreach (var reflogItem in reflog) + { + if (reflogItem.Committer.When.Date != date || reflogItem.Committer.Email != settings.MercurialAuthorEmail) + { + continue; + } + + var commit = repo.Lookup(reflogItem.To.Sha); + if (commit != null && allCommits.All(f => f.Sha != commit.Sha)) + { + allCommits.Add(commit); + } + } + + foreach (Commit commit in allCommits) { if (cancellationToken.IsCancellationRequested) { diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 02e567f..ec247d9 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -1,31 +1,31 @@ -using System.Reflection; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("JiraTimeBot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBot")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.73")] -[assembly: AssemblyFileVersion("1.0.73")] -[assembly: AssemblyInformationalVersion("1.0.73")] +using System.Reflection; +using System.Runtime.InteropServices; +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("JiraTimeBot")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.74")] +[assembly: AssemblyFileVersion("1.0.74")] +[assembly: AssemblyInformationalVersion("1.0.74")]