Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
387d53b928 |
+1
-1
@@ -1 +1 @@
|
|||||||
1.0.77
|
1.0.78
|
||||||
|
|||||||
@@ -108,10 +108,13 @@ namespace JiraTimeBot.Mercurial
|
|||||||
}
|
}
|
||||||
|
|
||||||
var commitMessage = commit.MessageShort;
|
var commitMessage = commit.MessageShort;
|
||||||
|
commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
|
||||||
|
|
||||||
if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
|
if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
|
commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
|
||||||
var files = FilesToMerge(commit, repo);
|
var files = FilesToMerge(commit, repo);
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
{
|
{
|
||||||
public interface ITechnicalInfoSkipper
|
public interface ITechnicalInfoSkipper
|
||||||
{
|
{
|
||||||
|
string StripBranchPrefix(string branch, string commitMessage);
|
||||||
string StripTechnicalInfo(string commitMessage);
|
string StripTechnicalInfo(string commitMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,26 @@
|
|||||||
using System.Text;
|
using System;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace JiraTimeBot.Mercurial.Modifiers
|
namespace JiraTimeBot.Mercurial.Modifiers
|
||||||
{
|
{
|
||||||
public class TechnicalInfoSkipper : ITechnicalInfoSkipper
|
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)
|
public string StripTechnicalInfo(string commitMessage)
|
||||||
{
|
{
|
||||||
if (!commitMessage.Contains("Signed-by:"))
|
if (!commitMessage.Contains("Signed-by:"))
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
// General Information about an assembly is controlled through the following
|
// General Information about an assembly is controlled through the following
|
||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
[assembly: AssemblyTitle("JiraTimeBot")]
|
[assembly: AssemblyTitle("JiraTimeBot")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("")]
|
||||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
// 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
|
// to COM components. If you need to access a type in this assembly from
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||||
// Version information for an assembly consists of the following four values:
|
// Version information for an assembly consists of the following four values:
|
||||||
//
|
//
|
||||||
// Major Version
|
// Major Version
|
||||||
// Minor Version
|
// Minor Version
|
||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("1.0.77")]
|
[assembly: AssemblyVersion("1.0.78")]
|
||||||
[assembly: AssemblyFileVersion("1.0.77")]
|
[assembly: AssemblyFileVersion("1.0.78")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.77")]
|
[assembly: AssemblyInformationalVersion("1.0.78")]
|
||||||
|
|||||||
Reference in New Issue
Block a user