Skip to content

Commit a8e6db4

Browse files
JakeGinnivanJakeGinnivan
committed
Fixed checkout command to not use obsolete method
1 parent cc5a48b commit a8e6db4

15 files changed

+145
-128
lines changed

‎src/GitVersionCore.Tests/GitVersionContextTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
7777
using (var repo = new EmptyRepositoryFixture())
7878
{
7979
repo.Repository.MakeACommit();
80-
repo.Repository.Checkout(repo.Repository.CreateBranch("develop"));
80+
Commands.Checkout(repo.Repository, repo.Repository.CreateBranch("develop"));
8181
repo.Repository.MakeACommit();
8282
var featureBranch = repo.Repository.CreateBranch("feature/foo");
83-
repo.Repository.Checkout(featureBranch);
83+
Commands.Checkout(repo.Repository, featureBranch);
8484
repo.Repository.MakeACommit();
8585

8686
var context = new GitVersionContext(repo.Repository, config);

‎src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
1313
using (var fixture = new EmptyRepositoryFixture())
1414
{
1515
fixture.Repository.MakeATaggedCommit("1.0.0");
16-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
16+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
1717

1818
fixture.Repository.MakeACommit();
1919
fixture.Repository.MakeACommit();
@@ -31,7 +31,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
3131
using (var fixture = new EmptyRepositoryFixture())
3232
{
3333
fixture.Repository.MakeATaggedCommit("1.0.0");
34-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
34+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
3535

3636
fixture.Repository.MakeACommit();
3737
fixture.Repository.MakeACommit();
@@ -49,7 +49,7 @@ public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
4949
using (var fixture = new EmptyRepositoryFixture())
5050
{
5151
fixture.Repository.MakeATaggedCommit("1.0.0");
52-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
52+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
5353
fixture.AssertFullSemver("1.0.0");
5454
}
5555
}
@@ -72,7 +72,7 @@ public void CanChangeDevelopTagViaConfig()
7272
using (var fixture = new EmptyRepositoryFixture())
7373
{
7474
fixture.Repository.MakeATaggedCommit("1.0.0");
75-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
75+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
7676
fixture.Repository.MakeACommit();
7777
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
7878
}
@@ -84,7 +84,7 @@ public void WhenDeveloperBranchExistsDontTreatAsDevelop()
8484
using (var fixture = new EmptyRepositoryFixture())
8585
{
8686
fixture.Repository.MakeATaggedCommit("1.0.0");
87-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("developer"));
87+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("developer"));
8888
fixture.Repository.MakeACommit();
8989
fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
9090
}
@@ -96,7 +96,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
9696
using (var fixture = new EmptyRepositoryFixture())
9797
{
9898
fixture.Repository.MakeATaggedCommit("1.0.0");
99-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
99+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
100100
fixture.Repository.MakeACommit();
101101
fixture.AssertFullSemver("1.1.0-alpha.1");
102102
}
@@ -108,14 +108,14 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
108108
using (var fixture = new EmptyRepositoryFixture())
109109
{
110110
fixture.Repository.MakeATaggedCommit("1.0.0");
111-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
111+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
112112
fixture.Repository.MakeACommit();
113-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
113+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
114114
fixture.Repository.MakeACommit();
115-
fixture.Repository.Checkout("master");
115+
Commands.Checkout(Commands, fixture.Repository, "master");
116116
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
117117

118-
fixture.Repository.Checkout("develop");
118+
Commands.Checkout(Commands, fixture.Repository, "develop");
119119
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
120120
fixture.AssertFullSemver("2.1.0-alpha.2");
121121
}
@@ -138,7 +138,7 @@ public void CanHandleContinuousDelivery()
138138
using (var fixture = new EmptyRepositoryFixture())
139139
{
140140
fixture.Repository.MakeATaggedCommit("1.0.0");
141-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
141+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
142142
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
143143
fixture.AssertFullSemver(config, "1.1.0-alpha.7");
144144
}
@@ -150,11 +150,11 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
150150
using (var fixture = new EmptyRepositoryFixture())
151151
{
152152
fixture.Repository.MakeATaggedCommit("1.0.0");
153-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
153+
Commands.Checkout(Commands, fixture.Repository, fixture.Repository.CreateBranch("develop"));
154154
fixture.Repository.MakeACommit();
155155
var commit = fixture.Repository.Head.Tip;
156156
fixture.Repository.MakeACommit();
157-
fixture.Repository.Checkout(commit);
157+
Commands.Checkout(Commands, fixture.Repository, commit);
158158
fixture.AssertFullSemver("1.1.0-alpha.1");
159159
}
160160
}
@@ -170,7 +170,7 @@ public void InheritVersionFromReleaseBranch()
170170
fixture.BranchTo("release/2.0.0");
171171
fixture.MakeACommit();
172172
fixture.MakeACommit();
173-
fixture.Checkout("develop");
173+
Commands.Checkout(fixture, "develop");
174174
fixture.AssertFullSemver("1.1.0-alpha.1");
175175
fixture.MakeACommit();
176176
fixture.AssertFullSemver("2.1.0-alpha.1");

‎src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdly
1414
{
1515
fixture.Repository.MakeATaggedCommit("1.0.0");
1616
fixture.Repository.CreateBranch("development");
17-
fixture.Repository.Checkout("development");
17+
Commands.Checkout(fixture.Repository, "development");
1818

1919
//Create an initial feature branch
2020
var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
21-
fixture.Repository.Checkout("feature/JIRA-123");
21+
Commands.Checkout(fixture.Repository, "feature/JIRA-123");
2222
fixture.Repository.MakeCommits(1);
2323

2424
//Merge it
25-
fixture.Repository.Checkout("development");
25+
Commands.Checkout(fixture.Repository, "development");
2626
fixture.Repository.Merge(feature123, Generate.SignatureNow());
2727

2828
//Create a second feature branch
2929
fixture.Repository.CreateBranch("feature/JIRA-124");
30-
fixture.Repository.Checkout("feature/JIRA-124");
30+
Commands.Checkout(fixture.Repository, "feature/JIRA-124");
3131
fixture.Repository.MakeCommits(1);
3232

3333
fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
@@ -49,20 +49,20 @@ public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
4949
{
5050
fixture.Repository.MakeATaggedCommit("1.0.0");
5151
fixture.Repository.CreateBranch("unstable");
52-
fixture.Repository.Checkout("unstable");
52+
Commands.Checkout(fixture.Repository, "unstable");
5353

5454
//Create an initial feature branch
5555
var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
56-
fixture.Repository.Checkout("feature/JIRA-123");
56+
Commands.Checkout(fixture.Repository, "feature/JIRA-123");
5757
fixture.Repository.MakeCommits(1);
5858

5959
//Merge it
60-
fixture.Repository.Checkout("unstable");
60+
Commands.Checkout(fixture.Repository, "unstable");
6161
fixture.Repository.Merge(feature123, Generate.SignatureNow());
6262

6363
//Create a second feature branch
6464
fixture.Repository.CreateBranch("feature/JIRA-124");
65-
fixture.Repository.Checkout("feature/JIRA-124");
65+
Commands.Checkout(fixture.Repository, "feature/JIRA-124");
6666
fixture.Repository.MakeCommits(1);
6767

6868
fixture.AssertFullSemver(config, "1.1.0-JIRA-124.1+2");
@@ -76,9 +76,9 @@ public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffDevelop()
7676
{
7777
fixture.Repository.MakeATaggedCommit("1.0.0");
7878
fixture.Repository.CreateBranch("develop");
79-
fixture.Repository.Checkout("develop");
79+
Commands.Checkout(fixture.Repository, "develop");
8080
fixture.Repository.CreateBranch("feature/JIRA-123");
81-
fixture.Repository.Checkout("feature/JIRA-123");
81+
Commands.Checkout(fixture.Repository, "feature/JIRA-123");
8282
fixture.Repository.MakeCommits(5);
8383

8484
fixture.AssertFullSemver("1.1.0-JIRA-123.1+5");
@@ -92,7 +92,7 @@ public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffMaster()
9292
{
9393
fixture.Repository.MakeATaggedCommit("1.0.0");
9494
fixture.Repository.CreateBranch("feature/JIRA-123");
95-
fixture.Repository.Checkout("feature/JIRA-123");
95+
Commands.Checkout(fixture.Repository, "feature/JIRA-123");
9696
fixture.Repository.MakeCommits(5);
9797

9898
fixture.AssertFullSemver("1.0.1-JIRA-123.1+5");
@@ -106,7 +106,7 @@ public void TestFeatureBranch()
106106
{
107107
fixture.Repository.MakeATaggedCommit("1.0.0");
108108
fixture.Repository.CreateBranch("feature-test");
109-
fixture.Repository.Checkout("feature-test");
109+
Commands.Checkout(fixture.Repository, "feature-test");
110110
fixture.Repository.MakeCommits(5);
111111

112112
fixture.AssertFullSemver("1.0.1-test.1+5");
@@ -120,7 +120,7 @@ public void TestFeaturesBranch()
120120
{
121121
fixture.Repository.MakeATaggedCommit("1.0.0");
122122
fixture.Repository.CreateBranch("features/test");
123-
fixture.Repository.Checkout("features/test");
123+
Commands.Checkout(fixture.Repository, "features/test");
124124
fixture.Repository.MakeCommits(5);
125125

126126
fixture.AssertFullSemver("1.0.1-test.1+5");
@@ -134,12 +134,12 @@ public void WhenTwoFeatureBranchPointToTheSameCommit()
134134
{
135135
fixture.Repository.MakeACommit();
136136
fixture.Repository.CreateBranch("develop");
137-
fixture.Repository.Checkout("develop");
137+
Commands.Checkout(fixture.Repository, "develop");
138138
fixture.Repository.CreateBranch("feature/feature1");
139-
fixture.Repository.Checkout("feature/feature1");
139+
Commands.Checkout(fixture.Repository, "feature/feature1");
140140
fixture.Repository.MakeACommit();
141141
fixture.Repository.CreateBranch("feature/feature2");
142-
fixture.Repository.Checkout("feature/feature2");
142+
Commands.Checkout(fixture.Repository, "feature/feature2");
143143

144144
fixture.AssertFullSemver("0.1.0-feature2.1+1");
145145
}
@@ -153,20 +153,20 @@ public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMa
153153
fixture.Repository.MakeATaggedCommit("v1.0.0");
154154

155155
fixture.Repository.CreateBranch("develop");
156-
fixture.Repository.Checkout("develop");
156+
Commands.Checkout(fixture.Repository, "develop");
157157

158158
fixture.Repository.CreateBranch("feature/longrunning");
159-
fixture.Repository.Checkout("feature/longrunning");
159+
Commands.Checkout(fixture.Repository, "feature/longrunning");
160160
fixture.Repository.MakeACommit();
161161

162-
fixture.Repository.Checkout("develop");
162+
Commands.Checkout(fixture.Repository, "develop");
163163
fixture.Repository.MakeACommit();
164164

165-
fixture.Repository.Checkout("master");
165+
Commands.Checkout(fixture.Repository, "master");
166166
fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
167167
fixture.Repository.ApplyTag("v1.1.0");
168168

169-
fixture.Repository.Checkout("feature/longrunning");
169+
Commands.Checkout(fixture.Repository, "feature/longrunning");
170170
fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
171171

172172
var configuration = new Config { VersioningMode = VersioningMode.ContinuousDeployment };
@@ -192,7 +192,7 @@ public void ShouldUseConfiguredTag(string tag, string featureName, string preRel
192192
fixture.Repository.MakeATaggedCommit("1.0.0");
193193
var featureBranchName = string.Format("feature/{0}", featureName);
194194
fixture.Repository.CreateBranch(featureBranchName);
195-
fixture.Repository.Checkout(featureBranchName);
195+
Commands.Checkout(fixture.Repository, featureBranchName);
196196
fixture.Repository.MakeCommits(5);
197197

198198
var expectedFullSemVer = string.Format("1.0.1-{0}.1+5", preReleaseTagName);
@@ -208,7 +208,7 @@ public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMast
208208
//validate current version
209209
fixture.AssertFullSemver("0.2.0-alpha.1");
210210
fixture.Repository.CreateBranch("release/0.2.0");
211-
fixture.Repository.Checkout("release/0.2.0");
211+
Commands.Checkout(fixture.Repository, "release/0.2.0");
212212

213213
//validate release version
214214
fixture.AssertFullSemver("0.2.0-beta.1+0");

‎src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void PatchLatestReleaseExample()
1414
using (var fixture = new BaseGitFlowRepositoryFixture("1.2.0"))
1515
{
1616
// create hotfix
17-
fixture.Repository.Checkout("master");
18-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix-1.2.1"));
17+
Commands.Checkout(fixture.Repository, "master");
18+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.2.1"));
1919
fixture.Repository.MakeACommit();
2020

2121
fixture.AssertFullSemver("1.2.1-beta.1+1");
@@ -27,7 +27,7 @@ public void PatchLatestReleaseExample()
2727
fixture.AssertFullSemver("1.2.1-beta.2+3");
2828

2929
// Merge hotfix branch to master
30-
fixture.Repository.Checkout("master");
30+
Commands.Checkout(fixture.Repository, "master");
3131

3232
fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
3333
fixture.AssertFullSemver("1.2.1+4");
@@ -36,7 +36,7 @@ public void PatchLatestReleaseExample()
3636
fixture.AssertFullSemver("1.2.1");
3737

3838
// Verify develop version
39-
fixture.Repository.Checkout("develop");
39+
Commands.Checkout(fixture.Repository, "develop");
4040
fixture.AssertFullSemver("1.3.0-alpha.1");
4141

4242
fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
@@ -56,12 +56,12 @@ public void CanTakeVersionFromHotfixesBranch()
5656
{
5757

5858
// Merge hotfix branch to support
59-
fixture.Repository.Checkout("master");
60-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
59+
Commands.Checkout(fixture.Repository, "master");
60+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
6161
fixture.AssertFullSemver("1.1.0");
6262

6363
// create hotfix branch
64-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfixes/1.1.1"));
64+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfixes/1.1.1"));
6565
fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
6666
fixture.Repository.MakeACommit();
6767

@@ -82,14 +82,14 @@ public void PatchOlderReleaseExample()
8282
}))
8383
{
8484
// Merge hotfix branch to support
85-
fixture.Repository.Checkout("master");
85+
Commands.Checkout(fixture.Repository, "master");
8686
var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
8787
var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit) tag.Target);
88-
fixture.Repository.Checkout(supportBranch);
88+
Commands.Checkout(fixture.Repository, supportBranch);
8989
fixture.AssertFullSemver("1.1.0");
9090

9191
// create hotfix branch
92-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix-1.1.1"));
92+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.1.1"));
9393
fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
9494
fixture.Repository.MakeACommit();
9595

@@ -98,26 +98,26 @@ public void PatchOlderReleaseExample()
9898
fixture.AssertFullSemver("1.1.1-beta.1+2");
9999

100100
// Create feature branch off hotfix branch and complete
101-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/fix"));
101+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/fix"));
102102
fixture.AssertFullSemver("1.1.1-fix.1+2");
103103
fixture.Repository.MakeACommit();
104104
fixture.AssertFullSemver("1.1.1-fix.1+3");
105105

106106
fixture.Repository.CreatePullRequestRef("feature/fix", "hotfix-1.1.1", normalise: true, prNumber: 8);
107107
fixture.AssertFullSemver("1.1.1-PullRequest0008.4");
108-
fixture.Repository.Checkout("hotfix-1.1.1");
108+
Commands.Checkout(fixture.Repository, "hotfix-1.1.1");
109109
fixture.Repository.MergeNoFF("feature/fix", Generate.SignatureNow());
110110
fixture.AssertFullSemver("1.1.1-beta.1+4");
111111

112112
// Merge hotfix into support branch to complete hotfix
113-
fixture.Repository.Checkout("support-1.1");
113+
Commands.Checkout(fixture.Repository, "support-1.1");
114114
fixture.Repository.MergeNoFF("hotfix-1.1.1", Generate.SignatureNow());
115115
fixture.AssertFullSemver("1.1.1+5");
116116
fixture.Repository.ApplyTag("1.1.1");
117117
fixture.AssertFullSemver("1.1.1");
118118

119119
// Verify develop version
120-
fixture.Repository.Checkout("develop");
120+
Commands.Checkout(fixture.Repository, "develop");
121121
fixture.AssertFullSemver("2.1.0-alpha.1");
122122
fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
123123
fixture.AssertFullSemver("2.1.0-alpha.7");

‎src/GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void GivenARepositoryWithCommitsButNoTagsWithDetachedHead_VersionShouldBe
9696

9797
var commit = fixture.Repository.Head.Tip;
9898
fixture.Repository.MakeACommit();
99-
fixture.Repository.Checkout(commit);
99+
Commands.Checkout(fixture.Repository, commit);
100100

101101
// When
102102
fixture.AssertFullSemver("0.1.0+2");

0 commit comments

Comments
 (0)