Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 d.kislov
|
290cf03c4b | ||
|
Anton.Volkov
|
eff1bff375 | ||
|
Anton.Volkov
|
d8a47b7cd3 | ||
|
Anton.Volkov
|
95ce2792d9 | ||
|
Anton.Volkov
|
9f95e918f7 |
+1
-1
@@ -1 +1 @@
|
||||
1.0.84
|
||||
1.0.87
|
||||
|
||||
@@ -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 © 2020")]
|
||||
[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.84")]
|
||||
[assembly: AssemblyFileVersion("1.0.84")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.84")]
|
||||
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 © 2020")]
|
||||
[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.87")]
|
||||
[assembly: AssemblyFileVersion("1.0.87")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.87")]
|
||||
|
||||
@@ -7,6 +7,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
|
||||
namespace JiraTimeBot.RepositoryProviders
|
||||
@@ -77,7 +78,11 @@ namespace JiraTimeBot.RepositoryProviders
|
||||
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)
|
||||
|
||||
var dateMatch = date.Value.Date == reflogItem.Committer.When.Date;
|
||||
var userMatch = reflogItem.Committer.Email.Equals(settings.MercurialAuthorEmail, StringComparison.CurrentCultureIgnoreCase);
|
||||
|
||||
if (!dateMatch || !userMatch)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -100,13 +105,20 @@ namespace JiraTimeBot.RepositoryProviders
|
||||
continue;
|
||||
}
|
||||
|
||||
var branch = ListBranchesContaininingCommit(repo, commit.Sha).Select(f => f.FriendlyName)
|
||||
.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
|
||||
var regex = new Regex("[a-zA-Z0-9]{1,4}-[0-9]{1,6}");
|
||||
var branch = ListBranchesContaininingCommit(repo, commit.Sha)
|
||||
.Select(f => f.FriendlyName)
|
||||
.FirstOrDefault(f => regex.IsMatch(f));
|
||||
|
||||
|
||||
//.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
|
||||
if (branch == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
branch = regex.Match(branch).Value;
|
||||
|
||||
var commitMessage = commit.MessageShort;
|
||||
commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user