Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 459c2be

Browse files
JakeGinnivanJakeGinnivan
committed
Removed obsolete method calls
1 parent 156185f commit 459c2be

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎src/GitTools.Core.Tests/Git/DynamicRepositoriesTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void UsingDynamicRepositoryWithFeatureBranchWorks()
232232
Url = mainRepositoryFixture.RepositoryPath
233233
};
234234

235-
mainRepositoryFixture.Repository.Checkout(mainRepositoryFixture.Repository.CreateBranch("feature1"));
235+
Commands.Checkout(mainRepositoryFixture.Repository, mainRepositoryFixture.Repository.CreateBranch("feature1"));
236236

237237
Should.NotThrow(() =>
238238
{

‎src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void NormalisationOfPullRequestsWithFetch()
1515
{
1616
fixture.Repository.MakeACommit();
1717

18-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
18+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/foo"));
1919
fixture.Repository.MakeACommit();
2020
var commit = fixture.Repository.CreatePullRequestRef("feature/foo", "master", prNumber: 3);
2121
using (var localFixture = fixture.CloneRepository())
@@ -36,7 +36,7 @@ public void NormalisationOfPullRequestsWithoutFetch()
3636
{
3737
fixture.Repository.MakeACommit();
3838

39-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
39+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/foo"));
4040
fixture.Repository.MakeACommit();
4141
var commit = fixture.Repository.CreatePullRequestRef("feature/foo", "master", prNumber: 3, allowFastFowardMerge: true);
4242
using (var localFixture = fixture.CloneRepository())
@@ -57,7 +57,7 @@ public void NormalisationOfTag()
5757
{
5858
fixture.Repository.MakeACommit();
5959

60-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
60+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/foo"));
6161
fixture.Repository.MakeACommit();
6262

6363
fixture.BranchTo("release/2.0.0");
@@ -85,16 +85,16 @@ public void UpdatesCurrentBranch()
8585
using (var fixture = new EmptyRepositoryFixture())
8686
{
8787
fixture.Repository.MakeACommit();
88-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
88+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
8989
fixture.Repository.MakeACommit();
90-
fixture.Repository.Checkout("master");
90+
Commands.Checkout(fixture.Repository, "master");
9191
using (var localFixture = fixture.CloneRepository())
9292
{
9393
// Advance remote
94-
fixture.Repository.Checkout("develop");
94+
Commands.Checkout(fixture.Repository, "develop");
9595
var advancedCommit = fixture.Repository.MakeACommit();
9696
Commands.Fetch((Repository)localFixture.Repository, localFixture.Repository.Network.Remotes["origin"].Name, new string[0], null, null);
97-
localFixture.Repository.Checkout(advancedCommit.Sha);
97+
Commands.Checkout(localFixture.Repository, advancedCommit.Sha);
9898
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "refs/heads/develop");
9999

100100
var normalisedBranch = localFixture.Repository.Branches["develop"];
@@ -112,15 +112,15 @@ public void ShouldNotChangeBranchWhenNormalizingTheDirectory()
112112
{
113113
fixture.Repository.MakeATaggedCommit("v1.0.0");
114114

115-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
115+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
116116
var lastCommitOnDevelop = fixture.Repository.MakeACommit();
117117

118-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
118+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/foo"));
119119
fixture.Repository.MakeACommit();
120120

121121
using (var localFixture = fixture.CloneRepository())
122122
{
123-
localFixture.Repository.Checkout("origin/develop");
123+
Commands.Checkout(localFixture.Repository, "origin/develop");
124124

125125
// Another commit on feature/foo will force an update
126126
fixture.Checkout("feature/foo");
@@ -140,7 +140,7 @@ public void ShouldNotMoveLocalBranchWhenRemoteAdvances()
140140
{
141141
fixture.Repository.MakeACommit();
142142

143-
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
143+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/foo"));
144144
fixture.Repository.MakeACommit();
145145
using (var localFixture = fixture.CloneRepository())
146146
{
@@ -168,7 +168,7 @@ public void CheckedOutShaShouldNotChanged()
168168

169169
using (var localFixture = fixture.CloneRepository())
170170
{
171-
localFixture.Repository.Checkout(commitToBuild);
171+
Commands.Checkout(localFixture.Repository, commitToBuild);
172172
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "refs/heads/master");
173173

174174
var normalisedBranch = localFixture.Repository.Branches["master"];

‎src/GitTools.Core.Tests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net45" />
66
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net45" />
77
<package id="NUnit" version="3.5.0" targetFramework="net45" />
8+
<package id="NUnit3TestAdapter" version="3.6.0" targetFramework="net45" />
89
<package id="Shouldly" version="2.8.2" targetFramework="net45" />
910
</packages>

‎src/GitTools.Core/GitTools.Core.Shared/Git/DynamicRepositories.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static string CreateDynamicRepository(string targetPath, RepositoryInfo reposito
164164
static void CheckoutCommit(IRepository repo, string targetCommit)
165165
{
166166
Log.Info(string.Format("Checking out {0}", targetCommit));
167-
repo.Checkout(targetCommit);
167+
Commands.Checkout(repo, targetCommit);
168168
}
169169

170170
static void CloneRepository(string repositoryUrl, string gitDirectory, AuthenticationInfo authentication)

‎src/GitTools.Core/GitTools.Core.Shared/Git/Helpers/GitRepositoryHelper.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo
6565
if (matchingCurrentBranch != null)
6666
{
6767
Log.Info(string.Format("Checking out local branch '{0}'.", currentBranch));
68-
repo.Checkout(matchingCurrentBranch);
68+
Commands.Checkout(repo, matchingCurrentBranch);
6969
}
7070
else if (localBranchesWhereCommitShaIsHead.Count > 1)
7171
{
@@ -78,7 +78,7 @@ public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo
7878
if (master != null)
7979
{
8080
Log.Warn("Because one of the branches is 'master', will build master." + moveBranchMsg);
81-
repo.Checkout(master);
81+
Commands.Checkout(repo, master);
8282
}
8383
else
8484
{
@@ -87,7 +87,7 @@ public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo
8787
{
8888
var branchWithoutSeparator = branchesWithoutSeparators[0];
8989
Log.Warn(string.Format("Choosing {0} as it is the only branch without / or - in it. " + moveBranchMsg, branchWithoutSeparator.CanonicalName));
90-
repo.Checkout(branchWithoutSeparator);
90+
Commands.Checkout(repo, branchWithoutSeparator);
9191
}
9292
else
9393
{
@@ -103,7 +103,7 @@ public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo
103103
else
104104
{
105105
Log.Info(string.Format("Checking out local branch 'refs/heads/{0}'.", localBranchesWhereCommitShaIsHead[0].FriendlyName));
106-
repo.Checkout(repo.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);
106+
Commands.Checkout(repo, repo.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);
107107
}
108108
}
109109
finally
@@ -157,7 +157,7 @@ static void EnsureLocalBranchExistsForCurrentBranch(Repository repo, string curr
157157
repo.Refs.UpdateTarget(repo.Refs[localCanonicalName], repoTipId);
158158
}
159159

160-
repo.Checkout(localCanonicalName);
160+
Commands.Checkout(repo, localCanonicalName);
161161
}
162162

163163
static void AddMissingRefSpecs(Repository repo, Remote remote)
@@ -209,7 +209,7 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
209209
if (canonicalName.StartsWith("refs/tags"))
210210
{
211211
Log.Info(string.Format("Checking out tag '{0}'", canonicalName));
212-
repo.Checkout(reference.Target.Sha);
212+
Commands.Checkout(repo, reference.Target.Sha);
213213
return;
214214
}
215215

@@ -225,7 +225,7 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
225225
repo.Refs.Add(fakeBranchName, new ObjectId(headTipSha));
226226

227227
Log.Info(string.Format("Checking local branch '{0}' out.", fakeBranchName));
228-
repo.Checkout(fakeBranchName);
228+
Commands.Checkout(repo, fakeBranchName);
229229
}
230230

231231
static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, Remote remote, string username, string password)

0 commit comments

Comments
 (0)