#128 counter-spike

Author: nulltoken

LibGit2Sharp.Tests/BranchFixture.cs

@@ -398,7 +398,7 @@ public void CanCheckoutAnArbitraryCommit(string commitPointer)
 
                 Assert.False(detachedHead.IsRemote);
                 Assert.Equal(detachedHead.Name, detachedHead.CanonicalName);
-                Assert.Equal("(no branch)", detachedHead.CanonicalName);
+                Assert.True(detachedHead.Name.EndsWith("...)"));
                 Assert.Equal(repo.Lookup(commitPointer).Sha, detachedHead.Tip.Sha);
 
                 Assert.Equal(repo.Head, detachedHead);

LibGit2Sharp.Tests/InteractiveFixture.cs

@@ -1,5 +1,4 @@
-using LibGit2Sharp.Interactive;
-using LibGit2Sharp.Tests.TestHelpers;
+using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
 using Xunit.Extensions;
 
@@ -15,9 +14,8 @@ public void InteractiveStateHasExpectedValuesForNewRepo(bool isBare)
             SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
             using (var repo = Repository.Init(scd.DirectoryPath, isBare))
             {
-                var state = repo.InteractiveState;
-                Assert.Equal("master", state.HeadName);
-                Assert.Equal(Operation.None, state.PendingOperation);
+                Assert.Equal("master", repo.Head.Name);
+                Assert.Equal(PendingOperation.None, repo.Info.PendingOperation);
             }
         }
 
@@ -26,9 +24,8 @@ public void InteractiveStateHasExpectedValuesForABareRepo()
         {
             using (var repo = new Repository(BareTestRepoPath))
             {
-                var state = repo.InteractiveState;
-                Assert.Equal("master", state.HeadName);
-                Assert.Equal(Operation.None, state.PendingOperation);
+                Assert.Equal("master", repo.Head.Name);
+                Assert.Equal(PendingOperation.None, repo.Info.PendingOperation);
             }
         }
 
@@ -38,12 +35,11 @@ public void InteractiveStateHasExpectedValuesForStandardRepo()
             var path = BuildTemporaryCloneOfTestRepo(StandardTestRepoPath);
             using (var repo = new Repository(path.RepositoryPath))
             {
-                var state = repo.InteractiveState;
-                Assert.Equal("master", state.HeadName);
-                Assert.Equal(Operation.None, state.PendingOperation);
+                Assert.Equal("master", repo.Head.Name);
+                Assert.Equal(PendingOperation.None, repo.Info.PendingOperation);
 
                 repo.Checkout("track-local");
-                Assert.Equal("track-local", state.HeadName);
+                Assert.Equal("track-local", repo.Head.Name);
             }
         }
 
@@ -55,9 +51,8 @@ public void InteractiveStateHasExpectedValuesForDetachedHead()
             {
                 repo.Checkout(repo.Head.Tip.Sha);
 
-                var state = repo.InteractiveState;
-                Assert.Equal("(32eab9c...)", state.HeadName);
-                Assert.Equal(Operation.None, state.PendingOperation);
+                Assert.Equal("(32eab9c...)", repo.Head.Name);
+                Assert.Equal(PendingOperation.None, repo.Info.PendingOperation);
             }
         }
 
@@ -72,9 +67,8 @@ public void InteractiveStateHasExpectedValuesForInteractiveRebase()
             {
                 repo.Checkout(repo.Head.Tip.Sha);
 
-                var state = repo.InteractiveState;
-                Assert.Equal("master", state.HeadName);
-                Assert.Equal(Operation.RebaseInteractive, state.PendingOperation);
+                Assert.Equal("master", repo.Head.Name);
+                Assert.Equal(PendingOperation.RebaseInteractive, repo.Info.PendingOperation);
             }
         }
     }

LibGit2Sharp.Tests/ResetHeadFixture.cs

@@ -62,18 +62,41 @@ public void ResettingWithBadParamsThrows()
         public void SoftResetSetsTheHeadToTheSpecifiedCommit()
         {
             /* Make the Head point to a branch through its name */
-            AssertSoftReset(b => b.Name, false, b => b.Name);
+            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
+
+            using (var repo = Repository.Init(scd.DirectoryPath)) 
+            {
+                FeedTheRepository(repo);
+
+                Tag tag = repo.Tags["mytag"];
+                Branch branch = repo.Branches["mybranch"];
+
+                repo.Checkout(branch.Name);
+                Assert.Equal(false, repo.Info.IsHeadDetached);
+
+                Assert.Equal(branch.Name, repo.Head.Name);
+                Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
+
+                /* Reset --soft the Head to a tag through its canonical name */
+                repo.Reset(ResetOptions.Soft, tag.CanonicalName);
+                Assert.Equal(branch.Name, repo.Head.Name);
+                Assert.Equal(tag.Target.Id, repo.Head.Tip.Id);
+
+                Assert.Equal(FileStatus.Staged, repo.Index.RetrieveStatus("a.txt"));
+
+                /* Reset --soft the Head to a commit through its sha */
+                repo.Reset(ResetOptions.Soft, branch.Tip.Sha);
+                Assert.Equal(branch.Name, repo.Head.Name);
+                Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
+
+                Assert.Equal(FileStatus.Unaltered, repo.Index.RetrieveStatus("a.txt"));
+            }
         }
 
         [Fact]
         public void SoftResetSetsTheDetachedHeadToTheSpecifiedCommit()
         {
             /* Make the Head point to a commit through its sha (Detaches the Head) */
-            AssertSoftReset(b => b.Tip.Sha, true, b => "(no branch)");
-        }
-
-        private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, bool shouldHeadBeDetached, Func<Branch, string> expectedHeadNameRetriever)
-        {
             SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
 
             using (var repo = Repository.Init(scd.DirectoryPath)) 
@@ -83,17 +106,16 @@ private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, boo
                 Tag tag = repo.Tags["mytag"];
                 Branch branch = repo.Branches["mybranch"];
 
-                string branchIdentifier = branchIdentifierRetriever(branch);
-                repo.Checkout(branchIdentifier);
-                Assert.Equal(shouldHeadBeDetached, repo.Info.IsHeadDetached);
+                repo.Checkout(branch.Tip.Sha);
+                Assert.Equal(true, repo.Info.IsHeadDetached);
 
-                string expectedHeadName = expectedHeadNameRetriever(branch);
+                const string expectedHeadName = "(a5ed7f8...)";
                 Assert.Equal(expectedHeadName, repo.Head.Name);
                 Assert.Equal(branch.Tip.Sha, repo.Head.Tip.Sha);
 
                 /* Reset --soft the Head to a tag through its canonical name */
                 repo.Reset(ResetOptions.Soft, tag.CanonicalName);
-                Assert.Equal(expectedHeadName, repo.Head.Name);
+                Assert.Equal("(653c177...)", repo.Head.Name);
                 Assert.Equal(tag.Target.Id, repo.Head.Tip.Id);
 
                 Assert.Equal(FileStatus.Staged, repo.Index.RetrieveStatus("a.txt"));

LibGit2Sharp/Branch.cs

@@ -17,10 +17,11 @@ public class Branch : ReferenceWrapper<Commit>
         /// </summary>
         /// <param name = "repo">The repo.</param>
         /// <param name = "reference">The reference.</param>
-        /// <param name = "canonicalName">The full name of the reference</param>
-        internal Branch(Repository repo, Reference reference, string canonicalName)
-            : this(repo, reference, _ => canonicalName)
+        /// <param name = "canonicalNameSelector">Provider of full name of the reference</param>
+        internal Branch(Repository repo, Reference reference, Func<Reference, string> canonicalNameSelector)
+            : base(repo, reference, canonicalNameSelector)
         {
+            trackedBranch = new Lazy<Branch>(ResolveTrackedBranch);
         }
 
         /// <summary>
@@ -36,12 +37,6 @@ internal Branch(Repository repo, Reference reference)
         {
         }
 
-        private Branch(Repository repo, Reference reference, Func<Reference, string> canonicalNameSelector)
-            : base(repo, reference, canonicalNameSelector)
-        {
-            trackedBranch = new Lazy<Branch>(ResolveTrackedBranch);
-        }
-
         /// <summary>
         ///   Gets the <see cref = "TreeEntry" /> pointed at by the <paramref name = "relativePath" /> in the <see cref = "Tip" />.
         /// </summary>

LibGit2Sharp/BranchCollection.cs

@@ -60,7 +60,7 @@ private static string ShortToRemoteName(string name)
         private Branch BuildFromReferenceName(string canonicalName)
         {
             var reference = repo.Refs.Resolve<Reference>(canonicalName);
-            return reference == null ? null : new Branch(repo, reference, canonicalName);
+            return reference == null ? null : new Branch(repo, reference, _ => canonicalName);
         }
 
         #region IEnumerable<Branch> Members

LibGit2Sharp/DetachedHead.cs

@@ -1,15 +1,27 @@
-namespace LibGit2Sharp
+using System.IO;
+
+namespace LibGit2Sharp
 {
     internal class DetachedHead : Branch
     {
-        internal DetachedHead(Repository repo, Reference reference)
-            : base(repo, reference, "(no branch)")
+        internal DetachedHead(Repository repo, Reference reference, string sha)
+            : base(repo, reference, _ => HeadName(repo.Info.Path, sha))
         {
         }
 
         protected override string Shorten(string branchName)
         {
             return branchName;
         }
+
+        public static string HeadName(string path, string tipSha)
+        {
+            if (File.Exists(Path.Combine(path, "rebase-merge/head-name")))
+            {
+                return File.ReadAllText(Path.Combine(path, "rebase-merge/head-name")).Replace("refs/heads/", "");
+            }
+
+            return string.Format("({0}...)", tipSha.Substring(0, 7));
+        }
     }
-}
+}

LibGit2Sharp/Interactive/State.cs

@@ -98,8 +98,7 @@
     <Compile Include="TreeChanges.cs" />
     <Compile Include="TreeEntryChanges.cs" />
     <Compile Include="LibGit2SharpException.cs" />
-    <Compile Include="Interactive\Operation.cs" />
-    <Compile Include="Interactive\State.cs" />
+    <Compile Include="PendingOperation.cs" />
     <Compile Include="Core\Handles\ConfigurationSafeHandle.cs" />
     <Compile Include="Core\Ensure.cs" />
     <Compile Include="Core\Epoch.cs" />

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,6 +1,6 @@
-namespace LibGit2Sharp.Interactive
+namespace LibGit2Sharp
 {
-    public enum Operation
+    public enum PendingOperation
     {
         None = 0,
         RebaseInteractive = 1,
@@ -12,4 +12,4 @@ public enum Operation
         CherryPick = 7,
         Bisect = 8,
     }
-}
+}

LibGit2Sharp/Interactive/Operation.cs renamed to LibGit2Sharp/PendingOperation.cs

@@ -6,7 +6,6 @@
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Compat;
 using LibGit2Sharp.Core.Handles;
-using LibGit2Sharp.Interactive;
 
 namespace LibGit2Sharp
 {
@@ -24,7 +23,6 @@ public class Repository : IDisposable
         private readonly Lazy<RemoteCollection> remotes;
         private readonly TagCollection tags;
         private readonly Lazy<RepositoryInformation> info;
-        private readonly Lazy<State> interactiveState;
         private readonly Diff diff;
         private readonly NoteCollection notes;
         private readonly Lazy<ObjectDatabase> odb;
@@ -92,7 +90,6 @@ public Repository(string path, RepositoryOptions options = null)
             branches = new BranchCollection(this);
             tags = new TagCollection(this);
             info = new Lazy<RepositoryInformation>(() => new RepositoryInformation(this, isBare));
-            interactiveState = new Lazy<State>(() => new State(this));
             config = new Lazy<Configuration>(() => RegisterForCleanup(new Configuration(this, configurationGlobalFilePath, configurationSystemFilePath)));
             remotes = new Lazy<RemoteCollection>(() => new RemoteCollection(this));
             odb = new Lazy<ObjectDatabase>(() => new ObjectDatabase(this));
@@ -128,7 +125,7 @@ public Branch Head
                     return new Branch(this, reference);
                 }
 
-                return new DetachedHead(this, reference);
+                return new DetachedHead(this, reference, reference.TargetIdentifier);
             }
         }
 
@@ -216,14 +213,6 @@ public RepositoryInformation Info
             get { return info.Value; }
         }
 
-        /// <summary>
-        ///   Provides information about this repository's interactive state (merge, rebase, etc).
-        /// </summary>
-        public State InteractiveState
-        {
-            get { return interactiveState.Value; }
-        }
-
         /// <summary>
         ///   Provides access to diffing functionalities to show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, or changes between two files on disk.
         /// </summary>