Parsing just the remote branch name in BranchListOutputProcessor

Author: StanleyGoldman

src/GitHub.Api/Git/GitBranch.cs

@@ -10,12 +10,12 @@ public struct GitBranch
         public string name;
         public string tracking;
 
-        public GitBranch(string name, string tracking)
+        public GitBranch(string name, string tracking = null)
         {
             Guard.ArgumentNotNullOrWhiteSpace(name, "name");
 
             this.name = name;
-            this.tracking = tracking;
+            this.tracking = tracking ?? string.Empty;
         }
 
         public override int GetHashCode()
@@ -64,7 +64,8 @@ public bool Equals(GitBranch other)
 
         public override string ToString()
         {
-            return $"{Name} Tracking? {Tracking}";
+            var s = Tracking ?? "[NULL]";
+            return $"{Name} Tracking? {s}";
         }
     }
-}
+}

src/GitHub.Api/OutputProcessors/BranchListOutputProcessor.cs

@@ -37,6 +37,11 @@ public override void LineReceived(string line)
                 if (tracking)
                 {
                     trackingName = proc.ReadChunk('[', ']');
+                    var indexOf = trackingName.IndexOf(':');
+                    if (indexOf != -1)
+                    {
+                        trackingName = trackingName.Substring(0, indexOf);
+                    }
                 }
 
                 var branch = new GitBranch(name, trackingName);

src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs

@@ -23,7 +23,7 @@ public async Task BranchListTest()
                 .StartAsAsync();
 
             gitBranches.Should().BeEquivalentTo(
-                new GitBranch("master", "origin/master: behind 1"),
+                new GitBranch("master", "origin/master"),
                 new GitBranch("feature/document", "origin/feature/document"));
         }
 

src/tests/UnitTests/IO/BranchListOutputProcessorTests.cs

@@ -15,14 +15,20 @@ public void ShouldProcessOutput()
             {
                 "* master                          ef7ecf9 [origin/master] Some project master",
                 "  feature/feature-1               f47d41b Untracked Feature 1",
-                "  bugfixes/bugfix-1               e1b7f22 [origin/bugfixes/bugfix-1] Tracked Local Bugfix"
+                "  bugfixes/bugfix-1               e1b7f22 [origin/bugfixes/bugfix-1] Tracked Local Bugfix",
+                "  bugfixes/bugfix-2               e1b7f22 [origin/bugfixes/bugfix-2: ahead 3] Ahead with some changes",
+                "  bugfixes/bugfix-3               e1b7f22 [origin/bugfixes/bugfix-3: ahead 3, behind 116] Ahead and Behind",
+                "  bugfixes/bugfix-4               e1b7f22 [origin/bugfixes/bugfix-4: gone] No longer on server",
             };
 
             AssertProcessOutput(output, new[]
             {
                 new GitBranch("master", "origin/master"),
-                new GitBranch("feature/feature-1", ""),
+                new GitBranch("feature/feature-1"),
                 new GitBranch("bugfixes/bugfix-1", "origin/bugfixes/bugfix-1"),
+                new GitBranch("bugfixes/bugfix-2", "origin/bugfixes/bugfix-2"),
+                new GitBranch("bugfixes/bugfix-3", "origin/bugfixes/bugfix-3"),
+                new GitBranch("bugfixes/bugfix-4", "origin/bugfixes/bugfix-4"),
             });
         }
 
@@ -44,4 +50,4 @@ private void AssertProcessOutput(IEnumerable<string> lines, GitBranch[] expected
             results.ShouldAllBeEquivalentTo(expected);
         }
     }
-}
+}