WIP: try to solve "Blame to previous revision" gitextensions#6605

pmiossec · Jun 7, 2019 · 4cae55e · 4cae55e
1 parent 5fdab76
commit 4cae55e
Showing 1 changed file with 37 additions and 13 deletions.
diff --git a/GitUI/UserControls/BlameControl.cs b/GitUI/UserControls/BlameControl.cs
@@ -551,23 +551,47 @@ private void blamePreviousRevisionToolStripMenuItem_Click(object sender, EventAr
 
             var objectId = _blame.Lines[line].Commit.ObjectId;
             int originalLine = _blame.Lines[line].OriginLineNumber;
-            GitBlame blame = Module.Blame(_fileName, objectId + "^", _encoding, originalLine + ",+1");
-            if (blame.Lines.Count > 0)
+
+            // TODO: Finish => blame the direct parent commit from the selected line
+
+            var selectedRevision = _revGrid.GetRevision(objectId);
+            if (!selectedRevision.HasParent)
             {
-                var revision = blame.Lines[0].Commit.ObjectId;
-                if (_revGrid != null)
-                {
-                    _clickedBlameLine = blame.Lines[0];
-                    _revGrid.SetSelectedRevision(revision);
-                }
-                else
+                _revGrid.SetSelectedRevision(selectedRevision);
+                using (var frm = new FormCommitDiff(UICommands, selectedRevision.ObjectId))
                 {
-                    using (var frm = new FormCommitDiff(UICommands, revision))
-                    {
-                        frm.ShowDialog(this);
-                    }
+                    frm.ShowDialog(this);
                 }
+
+                return;
             }
+
+            if (selectedRevision.ParentIds.Count == 1)
+            {
+                _revGrid.SetSelectedRevision(selectedRevision.FirstParentGuid);
+                return;
+            }
+
+            // TODO: Finish => What to do when there are more than 1 parents?!?
+            _revGrid.SetSelectedRevision(selectedRevision.FirstParentGuid);
+
+            ////GitBlame blame = Module.Blame(_fileName, objectId + "^", _encoding, originalLine + ",+1");
+            ////if (blame.Lines.Count > 0)
+            ////{
+            ////    var revision = blame.Lines[0].Commit.ObjectId;
+            ////    if (_revGrid != null)
+            ////    {
+            ////        _clickedBlameLine = blame.Lines[0];
+            ////        _revGrid.SetSelectedRevision(revision);
+            ////    }
+            ////    else
+            ////    {
+            ////        using (var frm = new FormCommitDiff(UICommands, revision))
+            ////        {
+            ////            frm.ShowDialog(this);
+            ////        }
+            ////    }
+            ////}
         }
 
         private void showChangesToolStripMenuItem_Click(object sender, EventArgs e)