Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2sharp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2015-03-16 22:50:16 +0300
committernulltoken <emeric.fermas@gmail.com>2015-03-17 21:58:37 +0300
commitd8a04a467baf2ec0139d214f798f5c0a82dd25cb (patch)
treefb7adb551288e7934a1bd1055fe1188e649ca35a /LibGit2Sharp.Tests/BranchFixture.cs
parent964943bf9bed4da87a08befa7df30b8e2d77373d (diff)
Update libgit2 to 9bbc8f3
https://github.com/libgit2/libgit2/compare/e0902fb...9bbc8f3
Diffstat (limited to 'LibGit2Sharp.Tests/BranchFixture.cs')
-rw-r--r--LibGit2Sharp.Tests/BranchFixture.cs89
1 files changed, 58 insertions, 31 deletions
diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/LibGit2Sharp.Tests/BranchFixture.cs
index c39a9658..225ea4ee 100644
--- a/LibGit2Sharp.Tests/BranchFixture.cs
+++ b/LibGit2Sharp.Tests/BranchFixture.cs
@@ -18,7 +18,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranch(string name)
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -39,8 +39,10 @@ namespace LibGit2Sharp.Tests
Assert.NotNull(repo.Branches.SingleOrDefault(p => p.Name.Normalize() == name));
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + committish,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + committish);
+ Constants.Identity, DateTimeOffset.Now);
repo.Branches.Remove(newBranch.Name);
Assert.Null(repo.Branches[name]);
@@ -86,7 +88,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranchUsingAbbreviatedSha()
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions{ Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -98,8 +100,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal("be3563ae3f795b2b4353bcce3a527ad0a4f7f644", newBranch.Tip.Sha);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + committish,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + committish);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -109,7 +113,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranchFromImplicitHead(string headCommitOrBranchSpec)
{
string path = SandboxStandardTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -126,8 +130,10 @@ namespace LibGit2Sharp.Tests
Assert.NotNull(repo.Branches.SingleOrDefault(p => p.Name == name));
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + headCommitOrBranchSpec,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + headCommitOrBranchSpec);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -137,7 +143,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranchFromExplicitHead(string headCommitOrBranchSpec)
{
string path = SandboxStandardTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -149,8 +155,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal("32eab9cb1f450b5fe7ab663462b77d7f4b703344", newBranch.Tip.Sha);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from HEAD",
+ null,
newBranch.Tip.Id,
- "branch: Created from " + headCommitOrBranchSpec);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -158,7 +166,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranchFromCommit()
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -169,8 +177,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal("4c062a6361ae6959e06292c1fa5e2822d9c96345", newBranch.Tip.Sha);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + newBranch.Tip.Sha,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + newBranch.Tip.Sha);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -178,7 +188,7 @@ namespace LibGit2Sharp.Tests
public void CanCreateBranchFromRevparseSpec()
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -190,8 +200,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal("9fd738e8f7967c078dceed8190330fc8648ee56a", newBranch.Tip.Sha);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + committish,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + committish);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -201,7 +213,7 @@ namespace LibGit2Sharp.Tests
public void CreatingABranchFromATagPeelsToTheCommit(string committish)
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -212,8 +224,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal("e90810b8df3e80c413d903f631643c716887138d", newBranch.Tip.Sha);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ "branch: Created from " + committish,
+ null,
newBranch.Tip.Id,
- "branch: Created from " + committish);
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -559,7 +573,7 @@ namespace LibGit2Sharp.Tests
{
Branch master = repo.Branches["master"];
const string logMessage = "update target message";
- repo.Refs.UpdateTarget("refs/remotes/origin/master", "origin/test", Constants.Signature, logMessage);
+ repo.Refs.UpdateTarget("refs/remotes/origin/master", "origin/test", logMessage);
Assert.True(master.IsTracking);
Assert.NotNull(master.TrackedBranch);
@@ -964,7 +978,7 @@ namespace LibGit2Sharp.Tests
public void CanRenameABranch()
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -980,8 +994,10 @@ namespace LibGit2Sharp.Tests
Assert.NotNull(repo.Branches["br3"]);
AssertRefLogEntry(repo, newBranch.CanonicalName,
+ string.Format("branch: renamed {0} to {1}", br2.CanonicalName, newBranch.CanonicalName),
+ br2.Tip.Id,
newBranch.Tip.Id,
- string.Format("branch: renamed {0} to {1}", br2.CanonicalName, newBranch.CanonicalName));
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -999,7 +1015,7 @@ namespace LibGit2Sharp.Tests
public void CanRenameABranchWhileOverwritingAnExistingOne()
{
string path = SandboxBareTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
@@ -1021,9 +1037,10 @@ namespace LibGit2Sharp.Tests
Assert.Equal(br2.Tip, newTest.Tip);
AssertRefLogEntry(repo, newBranch.CanonicalName,
- newBranch.Tip.Id,
string.Format("branch: renamed {0} to {1}", br2.CanonicalName, newBranch.CanonicalName),
- test.Tip.Id);
+ br2.Tip.Id,
+ newTest.Tip.Id,
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -1129,15 +1146,22 @@ namespace LibGit2Sharp.Tests
public void CreatingABranchIncludesTheCorrectReflogEntries()
{
string path = SandboxStandardTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
var branch = repo.Branches.Add("foo", repo.Head.Tip);
- AssertRefLogEntry(repo, branch.CanonicalName, branch.Tip.Id,
- string.Format("branch: Created from {0}", repo.Head.Tip.Sha));
- branch = repo.Branches.Add("bar", repo.Head.Tip, null, "BAR");
- AssertRefLogEntry(repo, branch.CanonicalName, repo.Head.Tip.Id, "BAR");
+ AssertRefLogEntry(repo, branch.CanonicalName,
+ string.Format("branch: Created from {0}", repo.Head.Tip.Sha),
+ null, branch.Tip.Id,
+ Constants.Identity, DateTimeOffset.Now);
+
+ branch = repo.Branches.Add("bar", repo.Head.Tip);
+
+ AssertRefLogEntry(repo, branch.CanonicalName,
+ "branch: Created from " + repo.Head.Tip.Sha,
+ null, repo.Head.Tip.Id,
+ Constants.Identity, DateTimeOffset.Now);
}
}
@@ -1145,16 +1169,19 @@ namespace LibGit2Sharp.Tests
public void RenamingABranchIncludesTheCorrectReflogEntries()
{
string path = SandboxStandardTestRepo();
- using (var repo = new Repository(path))
+ using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
{
EnableRefLog(repo);
var master = repo.Branches["master"];
var newMaster = repo.Branches.Rename(master, "new-master");
- AssertRefLogEntry(repo, newMaster.CanonicalName, newMaster.Tip.Id,
- "branch: renamed refs/heads/master to refs/heads/new-master");
-
- newMaster = repo.Branches.Rename(newMaster, "new-master2", null, "MOVE");
- AssertRefLogEntry(repo, newMaster.CanonicalName, newMaster.Tip.Id, "MOVE");
+ AssertRefLogEntry(repo, newMaster.CanonicalName, "branch: renamed refs/heads/master to refs/heads/new-master",
+ newMaster.Tip.Id, newMaster.Tip.Id,
+ Constants.Identity, DateTimeOffset.Now);
+
+ var newMaster2 = repo.Branches.Rename(newMaster, "new-master2");
+ AssertRefLogEntry(repo, newMaster2.CanonicalName, "branch: renamed refs/heads/new-master to refs/heads/new-master2",
+ newMaster.Tip.Id, newMaster2.Tip.Id,
+ Constants.Identity, DateTimeOffset.Now);
}
}
}