Skip to content

Commit d456fc2

Browse files
JakeGinnivanJakeGinnivan
committed
Merge branch 'Issue173'
2 parents 58d7af2 + f423868 commit d456fc2

File tree

11 files changed

+59
-76
lines changed

11 files changed

+59
-76
lines changed

‎AcceptanceTests/ExecCmdLineArgumentTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void RunExecViaCommandLine()
2121

2222
var buildFile = Path.Combine(fixture.RepositoryPath, "RunExecViaCommandLine.proj");
2323
File.Delete(buildFile);
24-
var buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
24+
const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
2525
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
2626
<Target Name=""OutputResults"">
2727
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>

‎AcceptanceTests/MsBuildProjectArgTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void RunsMsBuildProvideViaCommandLineArg()
1818

1919
var buildFile = Path.Combine(fixture.RepositoryPath, "RunsMsBuildProvideViaCommandLineArg.proj");
2020
File.Delete(buildFile);
21-
var buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
21+
const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
2222
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
2323
<Target Name=""OutputResults"">
2424
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>

‎AcceptanceTests/PullRequestInTeamCityTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class PullRequestInTeamCityTest
1212
const string TaggedVersion = "1.0.3";
1313

1414
[Theory]
15-
//TODO Stash support [InlineData("refs/pull-requests/5/merge-clean")]
15+
[InlineData("refs/pull-requests/5/merge-clean")]
1616
[InlineData("refs/pull/5/merge")]
1717
public void GivenARemoteWithATagOnMaster_AndAPullRequestWithTwoCommits_AndBuildIsRunningInTeamCity_VersionIsCalculatedProperly(string pullRequestRef)
1818
{

‎GitVersionCore/BuildServers/GitHelper.cs‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
namespace GitVersion
22
{
3+
using LibGit2Sharp;
34
using System.Collections.Generic;
45
using System.Linq;
5-
using LibGit2Sharp;
6+
using System.Text.RegularExpressions;
67

78
public static class GitHelper
89
{
10+
private const string MergeMessageRegexPattern = "refs/heads/pull(-requests)?/(?<issuenumber>[0-9]*)/merge(-clean)?";
11+
912
public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, string branch = null)
1013
{
1114
using (var repo = new Repository(gitDirectory))
@@ -42,6 +45,32 @@ public static void NormalizeGitDirectory(string gitDirectory, Authentication aut
4245
}
4346
}
4447

48+
public static bool LooksLikeAValidPullRequestNumber(string issueNumber)
49+
{
50+
if (string.IsNullOrEmpty(issueNumber))
51+
{
52+
return false;
53+
}
54+
55+
uint res;
56+
return uint.TryParse(issueNumber, out res);
57+
}
58+
59+
public static string ExtractIssueNumber(string mergeMessage)
60+
{
61+
// Github Message: refs/heads/pull/5/merge
62+
// Stash Message: refs/heads/pull-requests/5/merge-clean
63+
64+
var regex = new Regex(MergeMessageRegexPattern);
65+
var match = regex.Match(mergeMessage);
66+
67+
string issueNumber = null;
68+
69+
issueNumber = match.Groups["issuenumber"].Value;
70+
71+
return issueNumber;
72+
}
73+
4574
static void AddMissingRefSpecs(Repository repo, Remote remote)
4675
{
4776
if (remote.FetchRefSpecs.Any(r => r.Source == "refs/heads/*"))
@@ -99,13 +128,13 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
99128
var canonicalName = refs[0].CanonicalName;
100129
Logger.WriteInfo(string.Format("Found remote tip '{0}' pointing at the commit '{1}'.", canonicalName, headTipSha));
101130

102-
if (!canonicalName.StartsWith("refs/pull/"))
131+
if (!canonicalName.StartsWith("refs/pull/") && !canonicalName.StartsWith("refs/pull-requests/"))
103132
{
104133
var message = string.Format("Remote tip '{0}' from remote '{1}' doesn't look like a valid pull request.", canonicalName, remote.Url);
105134
throw new WarningException(message);
106135
}
107136

108-
var fakeBranchName = canonicalName.Replace("refs/pull/", "refs/heads/pull/");
137+
var fakeBranchName = canonicalName.Replace("refs/pull/", "refs/heads/pull/").Replace("refs/pull-requests/", "refs/heads/pull-requests/");
109138

110139
Logger.WriteInfo(string.Format("Creating fake local branch '{0}'.", fakeBranchName));
111140
repo.Refs.Add(fakeBranchName, new ObjectId(headTipSha));

‎GitVersionCore/GitFlow/BranchClassifier.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static bool IsMaster(this Branch branch)
6464

6565
public static bool IsPullRequest(this Branch branch)
6666
{
67-
return branch.CanonicalName.Contains("/pull/");
67+
return branch.CanonicalName.Contains("/pull/") || branch.CanonicalName.Contains("/pull-requests/");
6868
}
6969

7070
public static bool IsSupport(this Branch branch)

‎GitVersionCore/GitFlow/BranchFinders/PullVersionFinder.cs‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,44 +14,14 @@ public SemanticVersion FindVersion(GitVersionContext context)
1414

1515
string ExtractIssueNumber(GitVersionContext context)
1616
{
17-
const string prefix = "/pull/";
18-
var pullRequestBranch = context.CurrentBranch;
17+
var issueNumber = GitHelper.ExtractIssueNumber(context.CurrentBranch.CanonicalName);
1918

20-
var start = pullRequestBranch.CanonicalName.IndexOf(prefix, System.StringComparison.Ordinal);
21-
var end = pullRequestBranch.CanonicalName.LastIndexOf("/merge", pullRequestBranch.CanonicalName.Length - 1,
22-
System.StringComparison.Ordinal);
23-
24-
string issueNumber = null;
25-
26-
if (start != -1 && end != -1 && start + prefix.Length <= end)
19+
if (!GitHelper.LooksLikeAValidPullRequestNumber(issueNumber))
2720
{
28-
start += prefix.Length;
29-
issueNumber = pullRequestBranch.CanonicalName.Substring(start, end - start);
30-
}
31-
32-
if (!LooksLikeAValidPullRequestNumber(issueNumber))
33-
{
34-
throw new WarningException(string.Format("Unable to extract pull request number from '{0}'.",
35-
pullRequestBranch.CanonicalName));
21+
throw new WarningException(string.Format("Unable to extract pull request number from '{0}'.", context.CurrentBranch.CanonicalName));
3622
}
3723

3824
return issueNumber;
3925
}
40-
41-
bool LooksLikeAValidPullRequestNumber(string issueNumber)
42-
{
43-
if (string.IsNullOrEmpty(issueNumber))
44-
{
45-
return false;
46-
}
47-
48-
uint res;
49-
if (!uint.TryParse(issueNumber, out res))
50-
{
51-
return false;
52-
}
53-
54-
return true;
55-
}
5626
}
5727
}

‎GitVersionCore/GitHubFlow/BuildNumberCalculator.cs‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,47 +66,17 @@ void EnsurePullBranchShareACommonAncestorWithMaster(IRepository repository, Bran
6666
throw new Exception(message);
6767
}
6868

69-
// TODO refactor to remove duplication
7069
string ExtractIssueNumber(GitVersionContext context)
7170
{
72-
const string prefix = "/pull/";
73-
var pullRequestBranch = context.CurrentBranch;
71+
var issueNumber = GitHelper.ExtractIssueNumber(context.CurrentBranch.CanonicalName);
7472

75-
var start = pullRequestBranch.CanonicalName.IndexOf(prefix, StringComparison.Ordinal);
76-
var end = pullRequestBranch.CanonicalName.LastIndexOf("/merge", pullRequestBranch.CanonicalName.Length - 1,
77-
StringComparison.Ordinal);
78-
79-
string issueNumber = null;
80-
81-
if (start != -1 && end != -1 && start + prefix.Length <= end)
73+
if (!GitHelper.LooksLikeAValidPullRequestNumber(issueNumber))
8274
{
83-
start += prefix.Length;
84-
issueNumber = pullRequestBranch.CanonicalName.Substring(start, end - start);
85-
}
86-
87-
if (!LooksLikeAValidPullRequestNumber(issueNumber))
88-
{
89-
var message = string.Format("Unable to extract pull request number from '{0}'.", pullRequestBranch.CanonicalName);
75+
var message = string.Format("Unable to extract pull request number from '{0}'.", context.CurrentBranch.CanonicalName);
9076
throw new WarningException(message);
9177
}
9278

9379
return issueNumber;
9480
}
95-
96-
bool LooksLikeAValidPullRequestNumber(string issueNumber)
97-
{
98-
if (string.IsNullOrEmpty(issueNumber))
99-
{
100-
return false;
101-
}
102-
103-
uint res;
104-
if (!uint.TryParse(issueNumber, out res))
105-
{
106-
return false;
107-
}
108-
109-
return true;
110-
}
11181
}
11282
}

‎GitVersionCore/MergeMessageParser.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,19 @@ public static bool TryParse(Commit mergeCommit, out string versionPart)
4747
versionPart = lastBranchPart;
4848
return true;
4949
}
50+
else if (Regex.IsMatch(message, "Merge pull request #\\d+ in "))
51+
{
52+
var branch = Regex.Match(message, "in (?<branch>.*)").Groups["branch"].Value;
53+
var lastBranchPart = branch.Split('/', '-').Last();
54+
55+
if (!char.IsNumber(lastBranchPart.First()) || !lastBranchPart.Contains("."))
56+
{
57+
return false;
58+
}
59+
60+
versionPart = lastBranchPart;
61+
return true;
62+
}
5063
else if (message.StartsWith("Merge branch '"))
5164
{
5265
trimmed = message.Replace("Merge branch '", "");

‎GitVersionExe/HelpWriter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ class HelpWriter
66
{
77
public static void Write()
88
{
9-
var message =
10-
@"Use convention to derive a SemVer product version from a GitFlow or GitHub based repository.
9+
const string message = @"Use convention to derive a SemVer product version from a GitFlow or GitHub based repository.
1110
1211
GitVersion [path] [/l logFilePath]
1312

‎Tests/BuildServers/BuildServerBaseTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void BuildNumberIsFullSemVer()
3434
writes[1].ShouldBe("1.2.3-beta.1+5");
3535
}
3636

37-
public class BuildServer : BuildServerBase
37+
private class BuildServer : BuildServerBase
3838
{
3939
public override bool CanApplyToCurrentContext()
4040
{

0 commit comments

Comments
 (0)