Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blame: Fix "blame previous revision" feature #6841

Merged
merged 4 commits into from Jul 6, 2019
Merged

Blame: Fix "blame previous revision" feature #6841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb142f1
Fix "Blame to previous revision"
pmiossec May 29, 2019
43cf4ec
Blame: Add a context menu item to blame selected revision
pmiossec Jun 22, 2019
cfbea4b
Refactoring & fixes following reviews...
pmiossec Jun 25, 2019
7be58af
Disable blame menu items if revision is not in the revision grid
pmiossec Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions GitUI/GitUI.csproj
View file
Open in desktop
Expand Up @@ -1865,6 +1865,9 @@
<ItemGroup>
<None Include="Resources\bug.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icons\Blame.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icons\FileStatusAdded.png" />
</ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions GitUI/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions GitUI/Properties/Resources.resx
View file
Open in desktop
Expand Up @@ -213,4 +213,7 @@ Alexander Eifler, Marcelo Ghelman, ghanique, olshevskiy87</value>
<data name="bug" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bug.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Blame" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\Blame.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
4 changes: 4 additions & 0 deletions GitUI/Translation/English.xlf
View file
Open in desktop
Expand Up @@ -248,6 +248,10 @@ See http://en.gravatar.com/site/implement/images#default-image for more details.
<source>Blame previous revision</source>
<target />
</trans-unit>
<trans-unit id="blameRevisionToolStripMenuItem.Text">
<source>Blame this revision</source>
<target />
</trans-unit>
<trans-unit id="commitHashToolStripMenuItem.Text">
<source>Commit hash</source>
<target />
Expand Down
8 changes: 8 additions & 0 deletions GitUI/UserControls/BlameControl.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 47 additions & 19 deletions GitUI/UserControls/BlameControl.cs
View file
Open in desktop
Expand Up @@ -415,6 +415,16 @@ private int GetBlameLine()
private void contextMenu_Opened(object sender, EventArgs e)
{
contextMenu.Tag = GetBlameLine();

if (_revGrid == null || !TryGetSelectedRevision(out var selectedRevision))
{
blameRevisionToolStripMenuItem.Enabled = false;
blamePreviousRevisionToolStripMenuItem.Enabled = false;
return;
}

blameRevisionToolStripMenuItem.Enabled = true;
blamePreviousRevisionToolStripMenuItem.Enabled = selectedRevision.HasParent;
}

[CanBeNull]
Expand Down Expand Up @@ -457,32 +467,50 @@ private void copyCommitHashToClipboardToolStripMenuItem_Click(object sender, Eve
CopyToClipboard(c => c.ObjectId.ToString());
}

private bool TryGetSelectedRevision(out GitRevision selectedRevision)
{
var blameCommit = GetBlameCommit();
if (blameCommit == null)
{
selectedRevision = null;
return false;
}

selectedRevision = _revGrid?.GetRevision(blameCommit.ObjectId);
return selectedRevision != null;
}

private void blameRevisionToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!TryGetSelectedRevision(out var selectedRevision))
{
return;
}

BlameRevision(selectedRevision.ObjectId);
}

private void blamePreviousRevisionToolStripMenuItem_Click(object sender, EventArgs e)
{
int line = (int?)contextMenu.Tag ?? -1;
if (line < 0)
if (!TryGetSelectedRevision(out var selectedRevision) || !selectedRevision.HasParent)
{
return;
}

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)
BlameRevision(selectedRevision.FirstParentGuid);
}

private void BlameRevision(ObjectId revisionId)
{
if (_revGrid != null)
{
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);
}
}
_revGrid.SetSelectedRevision(revisionId);
return;
}

using (var frm = new FormCommitDiff(UICommands, revisionId))
{
frm.ShowDialog(this);
}
}

Expand Down