Skip to content

Interfaces #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

Interfaces #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
53d6672
Implemented IBranch interface
haacked Jun 6, 2012
e199532
Implemented IGitObject interface
haacked Jun 6, 2012
f32ef20
Implemented ICommit interface
haacked Jun 6, 2012
f43ddaf
Implemented IBlob interfaces
haacked Jun 6, 2012
037d289
Implemented IDetachedHead interface
haacked Jun 7, 2012
7899ed6
Implemented IConfiguration interface
haacked Jun 7, 2012
b1f02a6
Implemented IRepository interface
haacked Jun 7, 2012
afe8439
Implemented IDiff interface
haacked Jun 7, 2012
774265b
Implemented IContentChanges interface
haacked Jun 7, 2012
edcf48e
Implemented IDiff and related interfaces
haacked Jun 7, 2012
b55a624
Implemented IRemote interface
haacked Jun 7, 2012
a9f48cb
Adding IRemoteCollection interface
haacked Jun 7, 2012
93575a2
Implemented IRepositoryInformation interface
haacked Jun 7, 2012
25aef6c
Implemented IBranchCollection interface
haacked Jun 7, 2012
629c0ed
Adding RepositoryExtensions unit tests
haacked Jun 13, 2012
8bde46c
Changed constructors back to internal
haacked Jun 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Lib/MoQ/Moq.dll
View file
Open in desktop
Binary file not shown.
5,768 changes: 5,768 additions & 0 deletions Lib/MoQ/Moq.xml
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions LibGit2Sharp.Tests/BranchFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void CanCreateBranch(string name)
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch newBranch = repo.CreateBranch(name, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
IBranch newBranch = repo.CreateBranch(name, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
Assert.NotNull(newBranch);
Assert.Equal(name, newBranch.Name);
Assert.Equal("refs/heads/" + name, newBranch.CanonicalName);
Expand All @@ -37,7 +37,7 @@ public void CanCreateBranchUsingAbbreviatedSha()
using (var repo = new Repository(path.RepositoryPath))
{
const string name = "unit_test";
Branch newBranch = repo.CreateBranch(name, "be3563a");
IBranch newBranch = repo.CreateBranch(name, "be3563a");
Assert.Equal("refs/heads/" + name, newBranch.CanonicalName);
Assert.Equal("be3563ae3f795b2b4353bcce3a527ad0a4f7f644", newBranch.Tip.Sha);
}
Expand All @@ -50,7 +50,7 @@ public void CanCreateBranchFromImplicitHead()
using (var repo = new Repository(path.RepositoryPath))
{
const string name = "unit_test";
Branch newBranch = repo.CreateBranch(name);
IBranch newBranch = repo.CreateBranch(name);
Assert.NotNull(newBranch);
Assert.Equal(name, newBranch.Name);
Assert.Equal("refs/heads/" + name, newBranch.CanonicalName);
Expand All @@ -68,7 +68,7 @@ public void CanCreateBranchFromExplicitHead()
using (var repo = new Repository(path.RepositoryPath))
{
const string name = "unit_test";
Branch newBranch = repo.CreateBranch(name, "HEAD");
IBranch newBranch = repo.CreateBranch(name, "HEAD");
Assert.NotNull(newBranch);
Assert.Equal("4c062a6361ae6959e06292c1fa5e2822d9c96345", newBranch.Tip.Sha);
}
Expand All @@ -82,7 +82,7 @@ public void CanCreateBranchFromCommit()
{
const string name = "unit_test";
var commit = repo.Lookup<Commit>("HEAD");
Branch newBranch = repo.CreateBranch(name, commit);
IBranch newBranch = repo.CreateBranch(name, commit);
Assert.NotNull(newBranch);
Assert.Equal("4c062a6361ae6959e06292c1fa5e2822d9c96345", newBranch.Tip.Sha);
}
Expand All @@ -95,7 +95,7 @@ public void CreatingABranchFromATagPeelsToTheCommit()
using (var repo = new Repository(path.RepositoryPath))
{
const string name = "i-peel-tag";
Branch newBranch = repo.CreateBranch(name, "refs/tags/test");
IBranch newBranch = repo.CreateBranch(name, "refs/tags/test");
Assert.NotNull(newBranch);
Assert.Equal("e90810b8df3e80c413d903f631643c716887138d", newBranch.Tip.Sha);
}
Expand All @@ -107,7 +107,7 @@ public void CreatingABranchTriggersTheCreationOfADirectReference()
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch newBranch = repo.CreateBranch("clone-of-master");
IBranch newBranch = repo.CreateBranch("clone-of-master");
Assert.False(newBranch.IsCurrentRepositoryHead);

ObjectId commitId = repo.Head.Tip.Id;
Expand Down Expand Up @@ -220,16 +220,16 @@ public void CanLookupABranchByItsCanonicalName()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch branch = repo.Branches["refs/heads/br2"];
IBranch branch = repo.Branches["refs/heads/br2"];
Assert.NotNull(branch);
Assert.Equal("br2", branch.Name);

Branch branch2 = repo.Branches["refs/heads/br2"];
IBranch branch2 = repo.Branches["refs/heads/br2"];
Assert.NotNull(branch2);
Assert.Equal("br2", branch2.Name);

Assert.Equal(branch, branch2);
Assert.True((branch2 == branch));
Assert.True(((Branch)branch2 == (Branch)branch));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not very keen on this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately interfaces don't allow operator overloads as extension methods. I could just delete this line or change it to:

Assert.True(branch2.Equals(branch));

Which would you prefer?

}
}

Expand All @@ -238,7 +238,7 @@ public void CanLookupLocalBranch()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make these just var it will work for both cases.

Assert.NotNull(master);
Assert.False(master.IsRemote);
Assert.Equal("master", master.Name);
Expand All @@ -255,10 +255,10 @@ public void CanLookupABranchWhichNameIsMadeOfNon7BitsAsciiCharacters()
using (var repo = new Repository(path.RepositoryPath))
{
const string name = "Ångström";
Branch newBranch = repo.CreateBranch(name, "be3563a");
IBranch newBranch = repo.CreateBranch(name, "be3563a");
Assert.NotNull(newBranch);

Branch retrieved = repo.Branches["Ångström"];
IBranch retrieved = repo.Branches["Ångström"];
Assert.NotNull(retrieved);
Assert.Equal(newBranch.Tip, retrieved.Tip);
}
Expand All @@ -269,7 +269,7 @@ public void LookingOutABranchByNameWithBadParamsThrows()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch branch;
IBranch branch;
Assert.Throws<ArgumentNullException>(() => branch = repo.Branches[null]);
Assert.Throws<ArgumentException>(() => branch = repo.Branches[""]);
}
Expand All @@ -280,7 +280,7 @@ public void TrackingInformationIsEmptyForNonTrackingBranch()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch branch = repo.Branches["test"];
IBranch branch = repo.Branches["test"];
Assert.False(branch.IsTracking);
Assert.Null(branch.TrackedBranch);
Assert.Equal(0, branch.AheadBy);
Expand All @@ -293,7 +293,7 @@ public void CanGetTrackingInformationForTrackingBranch()
{
using (var repo = new Repository(StandardTestRepoPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Assert.True(master.IsTracking);
Assert.Equal(repo.Branches["refs/remotes/origin/master"], master.TrackedBranch);
Assert.Equal(2, master.AheadBy);
Expand All @@ -319,7 +319,7 @@ public void CanWalkCommitsFromAnotherBranch()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch master = repo.Branches["test"];
IBranch master = repo.Branches["test"];
Assert.Equal(2, master.Commits.Count());
}
}
Expand All @@ -329,7 +329,7 @@ public void CanWalkCommitsFromBranch()
{
using (var repo = new Repository(BareTestRepoPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Assert.Equal(7, master.Commits.Count());
}
}
Expand All @@ -342,13 +342,13 @@ public void CanCheckoutAnExistingBranch(string name)
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Assert.True(master.IsCurrentRepositoryHead);

Branch branch = repo.Branches[name];
IBranch branch = repo.Branches[name];
Assert.NotNull(branch);

Branch test = repo.Checkout(branch);
IBranch test = repo.Checkout(branch);
Assert.False(repo.Info.IsHeadDetached);

Assert.False(test.IsRemote);
Expand All @@ -367,10 +367,10 @@ public void CanCheckoutAnExistingBranchByName(string name)
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Assert.True(master.IsCurrentRepositoryHead);

Branch test = repo.Checkout(name);
IBranch test = repo.Checkout(name);
Assert.False(repo.Info.IsHeadDetached);

Assert.False(test.IsRemote);
Expand All @@ -389,10 +389,10 @@ public void CanCheckoutAnArbitraryCommit(string commitPointer)
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch master = repo.Branches["master"];
IBranch master = repo.Branches["master"];
Assert.True(master.IsCurrentRepositoryHead);

Branch detachedHead = repo.Checkout(commitPointer);
IBranch detachedHead = repo.Checkout(commitPointer);

Assert.True(repo.Info.IsHeadDetached);

Expand Down Expand Up @@ -441,7 +441,7 @@ private void AssertRemoval(string branchName, bool isRemote, bool shouldPrevious
}

repo.Branches.Remove(branchName, isRemote);
Branch branch = repo.Branches[branchName];
IBranch branch = repo.Branches[branchName];
Assert.Null(branch);
}
}
Expand Down Expand Up @@ -517,9 +517,9 @@ public void TwoBranchesPointingAtTheSameCommitAreNotBothCurrent()
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch master = repo.Branches["refs/heads/master"];
IBranch master = repo.Branches["refs/heads/master"];

Branch newBranch = repo.Branches.Add("clone-of-master", master.Tip.Sha);
IBranch newBranch = repo.Branches.Add("clone-of-master", master.Tip.Sha);
Assert.False(newBranch.IsCurrentRepositoryHead);
}
}
Expand All @@ -532,7 +532,7 @@ public void CanMoveABranch()
{
Assert.Null(repo.Branches["br3"]);

Branch newBranch = repo.Branches.Move("br2", "br3");
IBranch newBranch = repo.Branches.Move("br2", "br3");
Assert.Equal("br3", newBranch.Name);

Assert.Null(repo.Branches["br2"]);
Expand All @@ -555,18 +555,18 @@ public void CanMoveABranchWhileOverwritingAnExistingOne()
TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo();
using (var repo = new Repository(path.RepositoryPath))
{
Branch test = repo.Branches["test"];
IBranch test = repo.Branches["test"];
Assert.NotNull(test);

Branch br2 = repo.Branches["br2"];
IBranch br2 = repo.Branches["br2"];
Assert.NotNull(br2);

Branch newBranch = repo.Branches.Move("br2", "test", true);
IBranch newBranch = repo.Branches.Move("br2", "test", true);
Assert.Equal("test", newBranch.Name);

Assert.Null(repo.Branches["br2"]);

Branch newTest = repo.Branches["test"];
IBranch newTest = repo.Branches["test"];
Assert.NotNull(newTest);
Assert.Equal(newBranch, newTest);

Expand Down
20 changes: 10 additions & 10 deletions LibGit2Sharp.Tests/CommitAncestorFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void CanFindCommonAncestorForTwoCommits()
var first = repo.Lookup<Commit>("c47800c7266a2be04c571c04d5a6614691ea99bd");
var second = repo.Lookup<Commit>("9fd738e8f7967c078dceed8190330fc8648ee56a");

Commit ancestor = repo.Commits.FindCommonAncestor(first, second);
ICommit ancestor = repo.Commits.FindCommonAncestor(first, second);

Assert.NotNull(ancestor);
Assert.Equal("5b5b025afb0b4c913b4c338a42934a3863bf3644", ancestor.Id.Sha);
Expand All @@ -51,7 +51,7 @@ public void CanFindCommonAncestorForTwoCommitsAsEnumerable()
var first = repo.Lookup<Commit>("c47800c7266a2be04c571c04d5a6614691ea99bd");
var second = repo.Lookup<Commit>("9fd738e8f7967c078dceed8190330fc8648ee56a");

Commit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second });
ICommit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second });

Assert.NotNull(ancestor);
Assert.Equal("5b5b025afb0b4c913b4c338a42934a3863bf3644", ancestor.Id.Sha);
Expand All @@ -68,7 +68,7 @@ public void CanFindCommonAncestorForSeveralCommits()
var third = repo.Lookup<Commit>("c47800c7266a2be04c571c04d5a6614691ea99bd");
var fourth = repo.Lookup<Commit>("5b5b025afb0b4c913b4c338a42934a3863bf3644");

Commit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second, third, fourth });
ICommit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second, third, fourth });

Assert.NotNull(ancestor);
Assert.Equal("5b5b025afb0b4c913b4c338a42934a3863bf3644", ancestor.Id.Sha);
Expand All @@ -87,9 +87,9 @@ public void CannotFindAncestorForTwoCommmitsWithoutCommonAncestor()
var third = repo.Lookup<Commit>("c47800c7266a2be04c571c04d5a6614691ea99bd");
var fourth = repo.Lookup<Commit>("5b5b025afb0b4c913b4c338a42934a3863bf3644");

Commit orphanedCommit = CreateOrphanedCommit(repo);
ICommit orphanedCommit = CreateOrphanedCommit(repo);

Commit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second, orphanedCommit, third, fourth });
ICommit ancestor = repo.Commits.FindCommonAncestor(new[] { first, second, orphanedCommit, third, fourth });
Assert.Null(ancestor);
}
}
Expand All @@ -105,21 +105,21 @@ public void CannotFindCommonAncestorForSeveralCommmitsWithoutCommonAncestor()

var orphanedCommit = CreateOrphanedCommit(repo);

Commit ancestor = repo.Commits.FindCommonAncestor(first, orphanedCommit);
ICommit ancestor = repo.Commits.FindCommonAncestor(first, orphanedCommit);
Assert.Null(ancestor);
}
}

private static Commit CreateOrphanedCommit(Repository repo)
private static ICommit CreateOrphanedCommit(Repository repo)
{
Commit random = repo.Head.Tip;
ICommit random = repo.Head.Tip;

Commit orphanedCommit = repo.ObjectDatabase.CreateCommit(
ICommit orphanedCommit = repo.ObjectDatabase.CreateCommit(
"This is a test commit created by 'CommitFixture.CannotFindCommonAncestorForCommmitsWithoutCommonAncestor'",
random.Author,
random.Committer,
random.Tree,
Enumerable.Empty<Commit>());
Enumerable.Empty<ICommit>());

return orphanedCommit;
}
Expand Down
Loading