Add Push overloads taking Branch instances

Author: yorah

LibGit2Sharp.Tests/PushFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
@@ -13,8 +14,7 @@ private void OnPushStatusError(PushStatusError pushStatusErrors)
                 pushStatusErrors.Reference, pushStatusErrors.Message));
         }
 
-        [Fact]
-        public void CanLocallyCloneAndCommitAndPush()
+        private void AssertPush(Action<Repository> push)
         {
             var scd = BuildSelfCleaningDirectory();
             using (var originalRepo = new Repository(CloneBareTestRepo()))
@@ -24,8 +24,9 @@ public void CanLocallyCloneAndCommitAndPush()
 
                 // Compare before
                 Assert.Equal(originalRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier,
-                    clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
-                Assert.Equal(clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
+                             clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
+                Assert.Equal(
+                    clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
                     clonedRepo.Refs.Head.ResolveToDirectReference());
 
                 // Change local state (commit)
@@ -37,19 +38,42 @@ public void CanLocallyCloneAndCommitAndPush()
 
                 // Assert local state has changed
                 Assert.NotEqual(originalRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier,
-                    clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
-                Assert.NotEqual(clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
+                                clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
+                Assert.NotEqual(
+                    clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
                     clonedRepo.Refs.Head.ResolveToDirectReference());
 
                 // Push the change upstream (remote state is supposed to change)
-                clonedRepo.Network.Push(remote, "HEAD", @"refs/heads/master", OnPushStatusError);
+                push(clonedRepo);
 
                 // Assert that both local and remote repos are in sync
                 Assert.Equal(originalRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier,
-                    clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
-                Assert.Equal(clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
+                             clonedRepo.Refs["HEAD"].ResolveToDirectReference().TargetIdentifier);
+                Assert.Equal(
+                    clonedRepo.Network.ListReferences(remote).Single(r => r.CanonicalName == "refs/heads/master"),
                     clonedRepo.Refs.Head.ResolveToDirectReference());
             }
         }
+
+        [Fact]
+        public void CanPushABranchTrackingAnUpstreamBranch()
+        {
+            AssertPush(repo => repo.Network.Push(repo.Head));
+            AssertPush(repo => repo.Network.Push(repo.Branches["master"]));
+            AssertPush(repo => repo.Network.Push(repo.Network.Remotes["origin"], "HEAD", @"refs/heads/master", OnPushStatusError));
+        }
+
+        [Fact]
+        public void PushingABranchThatDoesNotTrackAnUpstreamBranchThrows()
+        {
+            Assert.Throws<LibGit2SharpException>(
+                () =>
+                AssertPush(repo =>
+                    {
+                        Branch branch = repo.Branches["master"];
+                        repo.Branches.Update(branch, b => b.TrackedBranch = null);
+                        repo.Network.Push(branch);
+                    }));
+        }
     }
 }

LibGit2Sharp/NetworkExtensions.cs

@@ -1,6 +1,8 @@
 using System.Globalization;
+using System.Linq;
 using LibGit2Sharp.Core;
 using System.Collections.Generic;
+using LibGit2Sharp.Handlers;
 
 namespace LibGit2Sharp
 {
@@ -9,6 +11,54 @@ namespace LibGit2Sharp
     /// </summary>
     public static class NetworkExtensions
     {
+        /// <summary>
+        ///   Push the specified branch to its tracked branch on the remote.
+        /// </summary>
+        /// <param name="network">The <see cref="Network"/> being worked with.</param>
+        /// <param name="branch">The branch to push.</param>
+        /// <param name="onPushStatusError">Handler for reporting failed push updates.</param>
+        /// <param name="credentials">Credentials to use for user/pass authentication.</param>
+        /// <exception cref="LibGit2SharpException">Throws if either the Remote or the UpstreamBranchCanonicalName is not set.</exception>
+        public static void Push(
+            this Network network,
+            Branch branch,
+            PushStatusErrorHandler onPushStatusError = null,
+            Credentials credentials = null)
+        {
+            network.Push(new[] { branch }, onPushStatusError, credentials);
+        }
+
+        /// <summary>
+        ///   Push the specified branches to their tracked branches on the remote.
+        /// </summary>
+        /// <param name="network">The <see cref="Network"/> being worked with.</param>
+        /// <param name="branches">The branches to push.</param>
+        /// <param name="onPushStatusError">Handler for reporting failed push updates.</param>
+        /// <param name="credentials">Credentials to use for user/pass authentication.</param>
+        /// <exception cref="LibGit2SharpException">Throws if either the Remote or the UpstreamBranchCanonicalName is not set.</exception>
+        public static void Push(
+            this Network network,
+            IEnumerable<Branch> branches,
+            PushStatusErrorHandler onPushStatusError = null,
+            Credentials credentials = null)
+        {
+            var enumeratedBranches = branches as IList<Branch> ?? branches.ToList();
+
+            foreach (var branch in enumeratedBranches)
+            {
+                if (string.IsNullOrEmpty(branch.UpstreamBranchCanonicalName))
+                {
+                    throw new LibGit2SharpException(string.Format("The branch '{0}' (\"{1}\") that you are trying to push does not track an upstream branch.",
+                                                                  branch.Name, branch.CanonicalName));
+                }
+            }
+
+            foreach (var branch in enumeratedBranches)
+            {
+                network.Push(branch.Remote, string.Format("{0}:{1}", branch.CanonicalName, branch.UpstreamBranchCanonicalName), onPushStatusError);
+            }
+        }
+
         /// <summary>
         ///   Push the objectish to the destination reference on the <see cref = "Remote" />.
         /// </summary>
@@ -46,7 +96,7 @@ public static PushResult Push(this Network network, Remote remote, string pushRe
             Ensure.ArgumentNotNull(remote, "remote");
             Ensure.ArgumentNotNullOrEmptyString(pushRefSpec, "pushRefSpec");
 
-            return network.Push(remote, new string[] { pushRefSpec }, credentials);
+            return network.Push(remote, new[] { pushRefSpec }, credentials);
         }
 
         /// <summary>
@@ -62,7 +112,7 @@ public static PushResult Push(this Network network, Remote remote, IEnumerable<s
             Ensure.ArgumentNotNull(remote, "remote");
             Ensure.ArgumentNotNull(pushRefSpecs, "pushRefSpecs");
 
-            List<PushStatusError> failedRemoteUpdates = new List<PushStatusError>();
+            var failedRemoteUpdates = new List<PushStatusError>();
 
             network.Push(
                 remote,