Select remote branch on [Ctrl+]Alt+Click in ROT

Implements most important part of gitextensions#9194
mstv · Jul 31, 2021 · d068314 · d068314
1 parent b65e7bc
commit d068314
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.BaseBranchNode.cs b/GitUI/BranchTreePanel/RepoObjectsTree.BaseBranchNode.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using GitCommands;
 using GitExtUtils.GitUI.Theming;
 using GitUI.Properties;
 
@@ -33,6 +34,8 @@ protected BaseBranchNode(Tree tree, string fullPath, bool visible)
 
             protected string? AheadBehind { get; set; }
 
+            protected string? RelatedBranch { get; set; }
+
             /// <summary>
             /// Short name of the branch/branch path. <example>"issue1344"</example>.
             /// </summary>
@@ -68,9 +71,10 @@ public override bool Equals(object obj)
                     && Visible == other.Visible;
             }
 
-            public void UpdateAheadBehind(string aheadBehindData)
+            public void UpdateAheadBehind(string aheadBehindData, string relatedBranch)
             {
                 AheadBehind = aheadBehindData;
+                RelatedBranch = relatedBranch;
             }
 
             public bool Rebase()
@@ -118,7 +122,9 @@ protected void SelectRevision()
             {
                 TreeViewNode.TreeView?.BeginInvoke(new Action(() =>
                 {
-                    UICommands.BrowseGoToRef(FullPath, showNoRevisionMsg: true, toggleSelection: ModifierKeys.HasFlag(Keys.Control));
+                    string branch = RelatedBranch is null || !ModifierKeys.HasFlag(Keys.Alt)
+                        ? FullPath : RelatedBranch.Substring(GitRefName.RefsRemotesPrefix.Length);
+                    UICommands.BrowseGoToRef(branch, showNoRevisionMsg: true, toggleSelection: ModifierKeys.HasFlag(Keys.Control));
                     TreeViewNode.TreeView?.Focus();
                 }));
             }

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.BranchTree.cs b/GitUI/BranchTreePanel/RepoObjectsTree.BranchTree.cs
@@ -113,9 +113,12 @@ private Nodes FillBranchTree(IReadOnlyList<IGitRef> branches, CancellationToken
                     bool isVisible = !IsFiltering.Value || _refsSource.Contains(branch.ObjectId);
                     LocalBranchNode localBranchNode = new(this, branch.ObjectId, branch.Name, branch.Name == currentBranch, isVisible);
 
-                    if (aheadBehindData is not null && aheadBehindData.ContainsKey(localBranchNode.FullPath))
+                    if (aheadBehindData is not null)
                     {
-                        localBranchNode.UpdateAheadBehind(aheadBehindData[localBranchNode.FullPath].ToDisplay());
+                        if (aheadBehindData.TryGetValue(localBranchNode.FullPath, out AheadBehindData aheadBehind))
+                        {
+                            localBranchNode.UpdateAheadBehind(aheadBehind.ToDisplay(), aheadBehind.RemoteRef);
+                        }
                     }
 
                     var parent = localBranchNode.CreateRootNode(pathToNode, (tree, parentPath) => new BranchPathNode(tree, parentPath));