Add TrackedRemoteName to BranchModel

Author: jcansdale

src/GitHub.Exports/Models/BranchModel.cs

@@ -7,12 +7,13 @@ namespace GitHub.Models
     public class BranchModel : ICopyable<BranchModel>,
         IEquatable<BranchModel>, IComparable<BranchModel>
     {
-        public BranchModel(string name, RepositoryModel repo, string sha, bool isTracking, string trackedSha) :
+        public BranchModel(string name, RepositoryModel repo, string sha, bool isTracking, string trackedSha, string trackedRemoteName) :
             this(name, repo)
         {
             IsTracking = isTracking;
             Sha = sha;
             TrackedSha = trackedSha;
+            TrackedRemoteName = trackedRemoteName;
         }
 
         public BranchModel(string name, RepositoryModel repo)
@@ -32,6 +33,7 @@ public BranchModel(string name, RepositoryModel repo)
         public string DisplayName { get; set; }
         public string Sha { get; private set; }
         public string TrackedSha { get; private set; }
+        public string TrackedRemoteName { get; private set; }
 
         #region Equality things
         public void CopyFrom(BranchModel other)

src/GitHub.Exports/Services/GitService.cs

@@ -80,7 +80,8 @@ public BranchModel GetBranch(LocalRepositoryModel model)
                     repo: model,
                     sha: branch.Tip?.Sha,
                     isTracking: branch.IsTracking,
-                    trackedSha: branch.TrackedBranch?.Tip?.Sha);
+                    trackedSha: branch.TrackedBranch?.Tip?.Sha,
+                    trackedRemoteName: branch.TrackedBranch?.RemoteName);
             }
         }
 

test/GitHub.Exports.UnitTests/GitServiceIntegrationTests.cs

@@ -72,6 +72,55 @@ public void NoRepository_Same_As_Repository_With_No_CloneUrl()
         }
     }
 
+    public class TheGetBranchMethod
+    {
+        [Test]
+        public void Master_Branch()
+        {
+            using (var temp = new TempRepository())
+            {
+                var signature = new Signature("Me", "[email protected]", DateTimeOffset.Now);
+                temp.Repository.Commit("First", signature, signature);
+                var expectSha = temp.Repository.Head.Tip.Sha;
+                var path = temp.Directory.FullName;
+                var target = new GitService(new RepositoryFacade());
+
+                var localRepository = target.CreateLocalRepositoryModel(path);
+                var branch = target.GetBranch(localRepository);
+
+                Assert.That(branch.Name, Is.EqualTo("master"));
+                Assert.That(branch.DisplayName, Is.EqualTo("master"));
+                Assert.That(branch.Id, Is.EqualTo("/master")); // We don't know owner
+                Assert.That(branch.IsTracking, Is.EqualTo(false));
+                Assert.That(branch.TrackedSha, Is.EqualTo(null));
+                Assert.That(branch.Sha, Is.EqualTo(expectSha));
+            }
+        }
+
+        [Test]
+        public void Branch_With_Remote()
+        {
+            using (var temp = new TempRepository())
+            {
+                var repository = temp.Repository;
+                var owner = "owner";
+                var remoteName = "remoteName";
+                var remote = repository.Network.Remotes.Add(remoteName, $"https://github.com/{owner}/VisualStudio");
+                var localBranch = repository.Head;
+                repository.Branches.Update(temp.Repository.Head,
+                    b => b.Remote = remote.Name,
+                    b => b.UpstreamBranch = localBranch.CanonicalName);
+                var path = temp.Directory.FullName;
+                var target = new GitService(new RepositoryFacade());
+                var localRepository = target.CreateLocalRepositoryModel(path);
+
+                var branch = target.GetBranch(localRepository);
+
+                Assert.That(branch.TrackedRemoteName, Is.EqualTo(remoteName));
+            }
+        }
+    }
+
     public class TheGetLatestPushedShaMethod : TestBaseClass
     {
         [Test]