Поправлен стрип технических коммитов.
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
1.0.77
|
||||
1.0.78
|
||||
|
||||
@@ -108,10 +108,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);
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
{
|
||||
public interface ITechnicalInfoSkipper
|
||||
{
|
||||
string StripBranchPrefix(string branch, string commitMessage);
|
||||
string StripTechnicalInfo(string commitMessage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,26 @@
|
||||
using System.Text;
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace JiraTimeBot.Mercurial.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:"))
|
||||
|
||||
@@ -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.77")]
|
||||
[assembly: AssemblyFileVersion("1.0.77")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.77")]
|
||||
[assembly: AssemblyVersion("1.0.78")]
|
||||
[assembly: AssemblyFileVersion("1.0.78")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.78")]
|
||||
|
||||
Reference in New Issue
Block a user