refactor: merge BranchTrackStatus to Branch

love-linger · love-linger · commit 01ed9caea4c5 · 2025-08-29T17:32:22.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -26,39 +26,41 @@ public QueryBranches(string repo)
                 return branches;
 
             var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-            var remoteHeads = new Dictionary<string, string>();
+            var mismatched = new HashSet<string>();
+            var remotes = new Dictionary<string, Models.Branch>();
             foreach (var line in lines)
             {
-                var b = ParseLine(line);
+                var b = ParseLine(line, mismatched);
                 if (b != null)
                 {
                     branches.Add(b);
                     if (!b.IsLocal)
-                        remoteHeads.Add(b.FullName, b.Head);
+                        remotes.Add(b.FullName, b);
                 }
             }
 
             foreach (var b in branches)
             {
                 if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
                 {
-                    if (remoteHeads.TryGetValue(b.Upstream, out var upstreamHead))
+                    if (remotes.TryGetValue(b.Upstream, out var upstream))
                     {
                         b.IsUpstreamGone = false;
-                        b.TrackStatus ??= await new QueryTrackStatus(WorkingDirectory, b.Head, upstreamHead).GetResultAsync().ConfigureAwait(false);
+
+                        if (mismatched.Contains(b.FullName))
+                            await new QueryTrackStatus(WorkingDirectory).GetResultAsync(b, upstream).ConfigureAwait(false);
                     }
                     else
                     {
                         b.IsUpstreamGone = true;
-                        b.TrackStatus ??= new Models.BranchTrackStatus();
                     }
                 }
             }
 
             return branches;
         }
 
-        private Models.Branch ParseLine(string line)
+        private Models.Branch ParseLine(string line, HashSet<string> mismatched)
         {
             var parts = line.Split('\0');
             if (parts.Length != 7)
@@ -103,11 +105,11 @@ private Models.Branch ParseLine(string line)
             branch.Upstream = parts[4];
             branch.IsUpstreamGone = false;
 
-            if (!branch.IsLocal ||
-                string.IsNullOrEmpty(branch.Upstream) ||
-                string.IsNullOrEmpty(parts[5]) ||
-                parts[5].Equals("=", StringComparison.Ordinal))
-                branch.TrackStatus = new Models.BranchTrackStatus();
+            if (branch.IsLocal &&
+                !string.IsNullOrEmpty(branch.Upstream) &&
+                !string.IsNullOrEmpty(parts[5]) &&
+                !parts[5].Equals("=", StringComparison.Ordinal))
+                mismatched.Add(branch.FullName);
 
             branch.WorktreePath = parts[6];
             return branch;
diff --git a/src/Commands/QueryTrackStatus.cs b/src/Commands/QueryTrackStatus.cs
@@ -5,31 +5,28 @@ namespace SourceGit.Commands
 {
     public class QueryTrackStatus : Command
     {
-        public QueryTrackStatus(string repo, string local, string upstream)
+        public QueryTrackStatus(string repo)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"rev-list --left-right {local}...{upstream}";
         }
 
-        public async Task<Models.BranchTrackStatus> GetResultAsync()
+        public async Task GetResultAsync(Models.Branch local, Models.Branch remote)
         {
-            var status = new Models.BranchTrackStatus();
+            Args = $"rev-list --left-right {local.Head}...{remote.Head}";
 
             var rs = await ReadToEndAsync().ConfigureAwait(false);
             if (!rs.IsSuccess)
-                return status;
+                return;
 
             var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 if (line[0] == '>')
-                    status.Behind.Add(line.Substring(1));
+                    local.Behind.Add(line.Substring(1));
                 else
-                    status.Ahead.Add(line.Substring(1));
+                    local.Ahead.Add(line.Substring(1));
             }
-
-            return status;
         }
     }
 }
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
@@ -2,27 +2,6 @@
 
 namespace SourceGit.Models
 {
-    public class BranchTrackStatus
-    {
-        public List<string> Ahead { get; set; } = new List<string>();
-        public List<string> Behind { get; set; } = new List<string>();
-
-        public bool IsVisible => Ahead.Count > 0 || Behind.Count > 0;
-
-        public override string ToString()
-        {
-            if (Ahead.Count == 0 && Behind.Count == 0)
-                return string.Empty;
-
-            var track = "";
-            if (Ahead.Count > 0)
-                track += $"{Ahead.Count}↑";
-            if (Behind.Count > 0)
-                track += $" {Behind.Count}↓";
-            return track.Trim();
-        }
-    }
-
     public enum BranchSortMode
     {
         Name = 0,
@@ -39,11 +18,33 @@ public class Branch
         public bool IsCurrent { get; set; }
         public bool IsDetachedHead { get; set; }
         public string Upstream { get; set; }
-        public BranchTrackStatus TrackStatus { get; set; }
+        public List<string> Ahead { get; set; } = [];
+        public List<string> Behind { get; set; } = [];
         public string Remote { get; set; }
         public bool IsUpstreamGone { get; set; }
         public string WorktreePath { get; set; }
 
+        public bool IsTrackStatusVisible
+        {
+            get
+            {
+                return Ahead.Count + Behind.Count > 0;
+            }
+        }
+
+        public string TrackStatusDescription
+        {
+            get
+            {
+                var ahead = Ahead.Count;
+                var behind = Behind.Count;
+                if (ahead > 0)
+                    return behind > 0 ? $"{ahead}↑ {behind}↓" : $"{ahead}↑";
+
+                return behind > 0 ? $"{behind}↓" : string.Empty;
+            }
+        }
+
         public bool HasWorktree => !IsCurrent && !string.IsNullOrEmpty(WorktreePath);
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
@@ -219,12 +219,12 @@ public async Task<bool> CheckoutBranchByDecoratorAsync(Models.Decorator decorato
                     return false;
 
                 var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);
-                if (lb == null || lb.TrackStatus.Ahead.Count > 0)
+                if (lb == null || lb.Ahead.Count > 0)
                 {
                     if (_repo.CanCreatePopup())
                         _repo.ShowPopup(new CreateBranch(_repo, rb));
                 }
-                else if (lb.TrackStatus.Behind.Count > 0)
+                else if (lb.Behind.Count > 0)
                 {
                     if (_repo.CanCreatePopup())
                         _repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));
@@ -265,7 +265,7 @@ public async Task CheckoutBranchByCommitAsync(Models.Commit commit)
                         continue;
 
                     var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);
-                    if (lb is { TrackStatus.Ahead.Count: 0 })
+                    if (lb.Ahead.Count == 0)
                     {
                         if (_repo.CanCreatePopup())
                             _repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -1182,7 +1182,7 @@ public void RefreshBranches()
                     if (_workingCopy != null)
                         _workingCopy.HasRemotes = remotes.Count > 0;
 
-                    var hasPendingPullOrPush = CurrentBranch?.TrackStatus.IsVisible ?? false;
+                    var hasPendingPullOrPush = CurrentBranch?.IsTrackStatusVisible ?? false;
                     GetOwnerPage()?.ChangeDirtyState(Models.DirtyState.HasPendingPullOrPush, !hasPendingPullOrPush);
                 });
             }, token);
@@ -1465,9 +1465,9 @@ public async Task CheckoutBranchAsync(Models.Branch branch)
                 {
                     if (b.IsLocal &&
                         b.Upstream.Equals(branch.FullName, StringComparison.Ordinal) &&
-                        b.TrackStatus.Ahead.Count == 0)
+                        b.Ahead.Count == 0)
                     {
-                        if (b.TrackStatus.Behind.Count > 0)
+                        if (b.Behind.Count > 0)
                             ShowPopup(new CheckoutAndFastForward(this, b, branch));
                         else if (!b.IsCurrent)
                             await CheckoutBranchAsync(b);
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
@@ -74,7 +74,7 @@
                              Margin="0,4,0,0"
                              HorizontalAlignment="Left" VerticalAlignment="Center"
                              Text="{DynamicResource Text.BranchTree.Status}"
-                             IsVisible="{Binding TrackStatus.IsVisible, Mode=OneWay}"/>
+                             IsVisible="{Binding IsTrackStatusVisible, Mode=OneWay}"/>
                   <v:BranchTreeNodeTrackStatusTooltip Grid.Row="1" Grid.Column="1"
                                                       Margin="8,4,0,0"/>
 
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
@@ -183,11 +183,11 @@ protected override Size MeasureOverride(Size availableSize)
 
             if (DataContext is ViewModels.BranchTreeNode { Backend: Models.Branch branch })
             {
-                var status = branch.TrackStatus.ToString();
-                if (!string.IsNullOrEmpty(status))
+                var desc = branch.TrackStatusDescription;
+                if (!string.IsNullOrEmpty(desc))
                 {
                     _label = new FormattedText(
-                        status,
+                        desc,
                         CultureInfo.CurrentCulture,
                         FlowDirection.LeftToRight,
                         new Typeface(FontFamily),
@@ -212,22 +212,18 @@ protected override void OnDataContextChanged(EventArgs e)
 
             Text = string.Empty;
 
-            if (DataContext is not Models.Branch { TrackStatus: { IsVisible: true } track })
+            if (DataContext is not Models.Branch { IsTrackStatusVisible: true } branch)
             {
                 SetCurrentValue(IsVisibleProperty, false);
                 return;
             }
 
-            if (track.Ahead.Count > 0)
-            {
-                Text = track.Behind.Count > 0 ?
-                    App.Text("BranchTree.AheadBehind", track.Ahead.Count, track.Behind.Count) :
-                    App.Text("BranchTree.Ahead", track.Ahead.Count);
-            }
-            else if (track.Behind.Count > 0)
-            {
-                Text = App.Text("BranchTree.Behind", track.Behind.Count);
-            }
+            var ahead = branch.Ahead.Count;
+            var behind = branch.Behind.Count;
+            if (ahead > 0)
+                Text = behind > 0 ? App.Text("BranchTree.AheadBehind", ahead, behind) : App.Text("BranchTree.Ahead", ahead);
+            else
+                Text = App.Text("BranchTree.Behind", behind);
 
             SetCurrentValue(IsVisibleProperty, true);
         }
@@ -638,7 +634,7 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                         var fastForward = new MenuItem();
                         fastForward.Header = App.Text("BranchCM.FastForward", upstream.FriendlyName);
                         fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
-                        fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0 && branch.TrackStatus.Behind.Count > 0;
+                        fastForward.IsEnabled = branch.Ahead.Count == 0 && branch.Behind.Count > 0;
                         fastForward.Click += async (_, e) =>
                         {
                             if (repo.CanCreatePopup())
@@ -685,7 +681,7 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                     var fastForward = new MenuItem();
                     fastForward.Header = App.Text("BranchCM.FastForward", upstream.FriendlyName);
                     fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
-                    fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0 && branch.TrackStatus.Behind.Count > 0;
+                    fastForward.IsEnabled = branch.Ahead.Count == 0 && branch.Behind.Count > 0;
                     fastForward.Click += async (_, e) =>
                     {
                         if (repo.CanCreatePopup())
@@ -697,7 +693,7 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                     var fetchInto = new MenuItem();
                     fetchInto.Header = App.Text("BranchCM.FetchInto", upstream.FriendlyName, branch.Name);
                     fetchInto.Icon = App.CreateMenuIcon("Icons.Fetch");
-                    fetchInto.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
+                    fetchInto.IsEnabled = branch.Ahead.Count == 0;
                     fetchInto.Click += async (_, e) =>
                     {
                         if (repo.CanCreatePopup())
diff --git a/src/Views/CheckoutAndFastForward.axaml b/src/Views/CheckoutAndFastForward.axaml
@@ -32,11 +32,11 @@
                 VerticalAlignment="Center"
                 CornerRadius="9"
                 Background="{DynamicResource Brush.Badge}"
-                IsVisible="{Binding LocalBranch.TrackStatus.IsVisible}">
+                IsVisible="{Binding LocalBranch.IsTrackStatusVisible, Mode=OneWay}">
           <TextBlock Foreground="{DynamicResource Brush.BadgeFG}"
                      FontFamily="{DynamicResource Fonts.Monospace}"
                      FontSize="10"
-                     Text="{Binding LocalBranch.TrackStatus}"/>
+                     Text="{Binding LocalBranch.TrackStatusDescription, Mode=OneWay}"/>
         </Border>
       </StackPanel>
 
diff --git a/src/Views/CommitStatusIndicator.cs b/src/Views/CommitStatusIndicator.cs
@@ -52,14 +52,13 @@ public override void Render(DrawingContext context)
 
         protected override Size MeasureOverride(Size availableSize)
         {
-            if (DataContext is Models.Commit commit && CurrentBranch is not null)
+            if (DataContext is Models.Commit commit && CurrentBranch is { } b)
             {
                 var sha = commit.SHA;
-                var track = CurrentBranch.TrackStatus;
 
-                if (track.Ahead.Contains(sha))
+                if (b.Ahead.Contains(sha))
                     _status = Status.Ahead;
-                else if (track.Behind.Contains(sha))
+                else if (b.Behind.Contains(sha))
                     _status = Status.Behind;
                 else
                     _status = Status.Normal;
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
@@ -23,11 +23,11 @@
                 VerticalAlignment="Center"
                 CornerRadius="9"
                 Background="{DynamicResource Brush.Badge}"
-                IsVisible="{Binding Target.TrackStatus.IsVisible}">
+                IsVisible="{Binding Target.IsTrackStatusVisible}">
           <TextBlock Foreground="{DynamicResource Brush.BadgeFG}"
                      FontFamily="{DynamicResource Fonts.Monospace}"
                      FontSize="10"
-                     Text="{Binding Target.TrackStatus}"/>
+                     Text="{Binding Target.TrackStatusDescription}"/>
         </Border>
       </StackPanel>
 
diff --git a/src/Views/DeleteMultipleBranches.axaml b/src/Views/DeleteMultipleBranches.axaml
@@ -52,11 +52,11 @@
                       VerticalAlignment="Center"
                       CornerRadius="9"
                       Background="{DynamicResource Brush.Badge}"
-                      IsVisible="{Binding TrackStatus.IsVisible}">
+                      IsVisible="{Binding IsTrackStatusVisible}">
                 <TextBlock Foreground="{DynamicResource Brush.BadgeFG}"
                            FontFamily="{DynamicResource Fonts.Monospace}"
                            FontSize="10"
-                           Text="{Binding TrackStatus}"/>
+                           Text="{Binding TrackStatusDescription, Mode=OneWay}"/>
               </Border>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
@@ -711,7 +711,7 @@ private ContextMenu CreateContextMenuForSingleCommit(ViewModels.Repository repo,
 
             if (!isHead)
             {
-                if (current.TrackStatus.Ahead.Contains(commit.SHA))
+                if (current.Ahead.Contains(commit.SHA))
                 {
                     var upstream = repo.Branches.Find(x => x.FullName.Equals(current.Upstream, StringComparison.Ordinal));
                     var pushRevision = new MenuItem();
@@ -911,7 +911,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, ViewModels.Repository repo,
                 var fastForward = new MenuItem();
                 fastForward.Header = App.Text("BranchCM.FastForward", upstream);
                 fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
-                fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0 && current.TrackStatus.Behind.Count > 0;
+                fastForward.IsEnabled = current.Ahead.Count == 0 && current.Behind.Count > 0;
                 fastForward.Click += async (_, e) =>
                 {
                     var b = repo.Branches.Find(x => x.FriendlyName == upstream);

Original file line number	Diff line number	Diff line change
`@@ -26,39 +26,41 @@ public QueryBranches(string repo)`
`26`	`26`	`return branches;`
`27`	`27`
`28`	`28`	`var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);`
`29`		`- var remoteHeads = new Dictionary<string, string>();`
	`29`	`+ var mismatched = new HashSet<string>();`
	`30`	`+ var remotes = new Dictionary<string, Models.Branch>();`
`30`	`31`	`foreach (var line in lines)`
`31`	`32`	`{`
`32`		`- var b = ParseLine(line);`
	`33`	`+ var b = ParseLine(line, mismatched);`
`33`	`34`	`if (b != null)`
`34`	`35`	`{`
`35`	`36`	`branches.Add(b);`
`36`	`37`	`if (!b.IsLocal)`
`37`		`- remoteHeads.Add(b.FullName, b.Head);`
	`38`	`+ remotes.Add(b.FullName, b);`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`foreach (var b in branches)`
`42`	`43`	`{`
`43`	`44`	`if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))`
`44`	`45`	`{`
`45`		`- if (remoteHeads.TryGetValue(b.Upstream, out var upstreamHead))`
	`46`	`+ if (remotes.TryGetValue(b.Upstream, out var upstream))`
`46`	`47`	`{`
`47`	`48`	`b.IsUpstreamGone = false;`
`48`		`- b.TrackStatus ??= await new QueryTrackStatus(WorkingDirectory, b.Head, upstreamHead).GetResultAsync().ConfigureAwait(false);`
	`49`	`+`
	`50`	`+ if (mismatched.Contains(b.FullName))`
	`51`	`+ await new QueryTrackStatus(WorkingDirectory).GetResultAsync(b, upstream).ConfigureAwait(false);`
`49`	`52`	`}`
`50`	`53`	`else`
`51`	`54`	`{`
`52`	`55`	`b.IsUpstreamGone = true;`
`53`		`- b.TrackStatus ??= new Models.BranchTrackStatus();`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`return branches;`
`59`	`61`	`}`
`60`	`62`
`61`		`- private Models.Branch ParseLine(string line)`
	`63`	`+ private Models.Branch ParseLine(string line, HashSet<string> mismatched)`
`62`	`64`	`{`
`63`	`65`	`var parts = line.Split('\0');`
`64`	`66`	`if (parts.Length != 7)`
`@@ -103,11 +105,11 @@ private Models.Branch ParseLine(string line)`
`103`	`105`	`branch.Upstream = parts[4];`
`104`	`106`	`branch.IsUpstreamGone = false;`
`105`	`107`
`106`		`- if (!branch.IsLocal \|\|`
`107`		`- string.IsNullOrEmpty(branch.Upstream) \|\|`
`108`		`- string.IsNullOrEmpty(parts[5]) \|\|`
`109`		`- parts[5].Equals("=", StringComparison.Ordinal))`
`110`		`- branch.TrackStatus = new Models.BranchTrackStatus();`
	`108`	`+ if (branch.IsLocal &&`
	`109`	`+ !string.IsNullOrEmpty(branch.Upstream) &&`
	`110`	`+ !string.IsNullOrEmpty(parts[5]) &&`
	`111`	`+ !parts[5].Equals("=", StringComparison.Ordinal))`
	`112`	`+ mismatched.Add(branch.FullName);`
`111`	`113`
`112`	`114`	`branch.WorktreePath = parts[6];`
`113`	`115`	`return branch;`
Original file line number	Diff line number	Diff line change
`@@ -5,31 +5,28 @@ namespace SourceGit.Commands`
`5`	`5`	`{`
`6`	`6`	`public class QueryTrackStatus : Command`
`7`	`7`	`{`
`8`		`- public QueryTrackStatus(string repo, string local, string upstream)`
	`8`	`+ public QueryTrackStatus(string repo)`
`9`	`9`	`{`
`10`	`10`	`WorkingDirectory = repo;`
`11`	`11`	`Context = repo;`
`12`		`- Args = $"rev-list --left-right {local}...{upstream}";`
`13`	`12`	`}`
`14`	`13`
`15`		`- public async Task<Models.BranchTrackStatus> GetResultAsync()`
	`14`	`+ public async Task GetResultAsync(Models.Branch local, Models.Branch remote)`
`16`	`15`	`{`
`17`		`- var status = new Models.BranchTrackStatus();`
	`16`	`+ Args = $"rev-list --left-right {local.Head}...{remote.Head}";`
`18`	`17`
`19`	`18`	`var rs = await ReadToEndAsync().ConfigureAwait(false);`
`20`	`19`	`if (!rs.IsSuccess)`
`21`		`- return status;`
	`20`	`+ return;`
`22`	`21`
`23`	`22`	`var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);`
`24`	`23`	`foreach (var line in lines)`
`25`	`24`	`{`
`26`	`25`	`if (line[0] == '>')`
`27`		`- status.Behind.Add(line.Substring(1));`
	`26`	`+ local.Behind.Add(line.Substring(1));`
`28`	`27`	`else`
`29`		`- status.Ahead.Add(line.Substring(1));`
	`28`	`+ local.Ahead.Add(line.Substring(1));`
`30`	`29`	`}`
`31`		`-`
`32`		`- return status;`
`33`	`30`	`}`
`34`	`31`	`}`
`35`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,12 @@ public async Task<bool> CheckoutBranchByDecoratorAsync(Models.Decorator decorato`
`219`	`219`	`return false;`
`220`	`220`
`221`	`221`	`var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);`
`222`		`- if (lb == null \|\| lb.TrackStatus.Ahead.Count > 0)`
	`222`	`+ if (lb == null \|\| lb.Ahead.Count > 0)`
`223`	`223`	`{`
`224`	`224`	`if (_repo.CanCreatePopup())`
`225`	`225`	`_repo.ShowPopup(new CreateBranch(_repo, rb));`
`226`	`226`	`}`
`227`		`- else if (lb.TrackStatus.Behind.Count > 0)`
	`227`	`+ else if (lb.Behind.Count > 0)`
`228`	`228`	`{`
`229`	`229`	`if (_repo.CanCreatePopup())`
`230`	`230`	`_repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));`
`@@ -265,7 +265,7 @@ public async Task CheckoutBranchByCommitAsync(Models.Commit commit)`
`265`	`265`	`continue;`
`266`	`266`
`267`	`267`	`var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);`
`268`		`- if (lb is { TrackStatus.Ahead.Count: 0 })`
	`268`	`+ if (lb.Ahead.Count == 0)`
`269`	`269`	`{`
`270`	`270`	`if (_repo.CanCreatePopup())`
`271`	`271`	`_repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));`