monster/JiraTimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update GitLog.cs

Browse Source 
Fix branch and issue detection
This commit is contained in:
Anton.Volkov
2020-05-28 10:56:06 +03:00
parent 813c59cccc
commit 9f95e918f7
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JiraTimeBot/RepositoryProviders/GitLog.cs
+15 -3
View File
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
namespace JiraTimeBot.RepositoryProviders namespace JiraTimeBot.RepositoryProviders
@@ -78,7 +79,11 @@ namespace JiraTimeBot.RepositoryProviders
var reflog = repo.Refs.Log(repo.Refs.Head); var reflog = repo.Refs.Log(repo.Refs.Head);
foreach (var reflogItem in reflog) 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; continue;
} }
@@ -101,13 +106,20 @@ namespace JiraTimeBot.RepositoryProviders
continue; continue;
} }
var branch = ListBranchesContaininingCommit(repo, commit.Sha).Select(f => f.FriendlyName) var regex = new Regex("[a-zA-Z]{1,4}-[0-9]{1,6}");
.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault(); 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) if (branch == null)
{ {
continue; continue;
} }
branch = regex.Match(branch).Value;
var commitMessage = commit.MessageShort; var commitMessage = commit.MessageShort;
commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage); commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);