Refactoring & fixes following reviews...

gitextensions · Jul 1, 2019 · c616642 · c616642
1 parent 162fec4
commit c616642
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/GitUI/UserControls/BlameControl.cs b/GitUI/UserControls/BlameControl.cs
@@ -459,16 +459,14 @@ private void copyCommitHashToClipboardToolStripMenuItem_Click(object sender, Eve
 
         private bool TryGetSelectedRevision(out GitRevision selectedRevision)
         {
-            selectedRevision = null;
-            int line = (int?)contextMenu.Tag ?? -1;
-            if (line < 0)
+            var blameCommit = GetBlameCommit();
+            if (blameCommit == null)
             {
+                selectedRevision = null;
                 return false;
             }
 
-            var objectId = _blame.Lines[line].Commit.ObjectId;
-
-            selectedRevision = _revGrid.GetRevision(objectId);
+            selectedRevision = _revGrid?.GetRevision(blameCommit.ObjectId);
             return selectedRevision != null;
         }
 
@@ -479,7 +477,7 @@ private void blameRevisionToolStripMenuItem_Click(object sender, EventArgs e)
                 return;
             }
 
-            _revGrid.SetSelectedRevision(selectedRevision);
+            BlameRevision(selectedRevision.ObjectId);
         }
 
         private void blamePreviousRevisionToolStripMenuItem_Click(object sender, EventArgs e)
@@ -489,18 +487,25 @@ private void blamePreviousRevisionToolStripMenuItem_Click(object sender, EventAr
                 return;
             }
 
-            if (!selectedRevision.HasParent)
-            {
-                _revGrid.SetSelectedRevision(selectedRevision);
-                using (var frm = new FormCommitDiff(UICommands, selectedRevision.ObjectId))
-                {
-                    frm.ShowDialog(this);
-                }
+            var blameRevision = selectedRevision.HasParent
+                ? selectedRevision.FirstParentGuid
+                : selectedRevision.ObjectId;
 
+            BlameRevision(blameRevision);
+        }
+
+        private void BlameRevision(ObjectId revisionId)
+        {
+            if (_revGrid != null)
+            {
+                _revGrid.SetSelectedRevision(revisionId);
                 return;
             }
 
-            _revGrid.SetSelectedRevision(selectedRevision.FirstParentGuid);
+            using (var frm = new FormCommitDiff(UICommands, revisionId))
+            {
+                frm.ShowDialog(this);
+            }
         }
 
         private void showChangesToolStripMenuItem_Click(object sender, EventArgs e)