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.

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

Add "Launch Diff Tool" option to DAG viewer #468

Closed
nocnokneo opened this Issue Jun 30, 2015 · 7 comments

Comments

Projects
None yet
3 participants
@nocnokneo

nocnokneo commented Jun 30, 2015

Just like the main window allows for viewing changes to an individual file in an external diff viewer, it would be nice to be able to view changesets in an external diff viewer (i.e. using git difftool -d ... mode). There would be two ways of using this feature:

  • Select a single commit (either in the Log or the Graph view), then right click to get a "Launch Diff Tool" context menu option (or just use Ctrl-D shortcut). This would show the differences between the selected commit and its parent (git difftool -d xxxxxxx^..xxxxxxx)
  • Select two commits by holding Ctrl and selecting two commits (either in the Log or the Graph view), then right click to get a "Launch Diff Tool" context menu option (or just use Ctrl-D shortcut). This would show the differences between the two selected commits (git difftool -d xxxxxxx..yyyyyyy)

Related side note: selecting two commits in the Log view is currently broken for me - holding Ctrl while clicking multiple commits behaves as if I where holding Shift.

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Jul 1, 2015

Member

Sounds like good idea. Right now the log view should work for diffing commits by clicking one, and then, without trying to select it, just right-click a different commit. Like gitk, it should have "Diff selected -> this", and vice versa in the context menu.

Member

davvid commented Jul 1, 2015

Sounds like good idea. Right now the log view should work for diffing commits by clicking one, and then, without trying to select it, just right-click a different commit. Like gitk, it should have "Diff selected -> this", and vice versa in the context menu.

davvid added a commit that referenced this issue Nov 7, 2015

dag: allow non-contiguous selection
Related-to: #468
Suggested-by: Taylor Braun-Jones <taylor@braun-jones.org>
Signed-off-by: David Aguilar <davvid@gmail.com>

AndiDog added a commit to AndiDog/git-cola that referenced this issue Nov 7, 2015

dag: allow non-contiguous selection
Related-to: #468
Suggested-by: Taylor Braun-Jones <taylor@braun-jones.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
@feinstaub

This comment has been minimized.

Show comment
Hide comment
@feinstaub

feinstaub Feb 7, 2016

What about adding a new button "Show in external diff tool" to the embedded diff viewer? So by default one would see the diff in the embedded viewer and when this is not enough the external one can be launched.

feinstaub commented Feb 7, 2016

What about adding a new button "Show in external diff tool" to the embedded diff viewer? So by default one would see the diff in the embedded viewer and when this is not enough the external one can be launched.

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Feb 8, 2016

Member

That sounds like it'd be pretty useful.

Member

davvid commented Feb 8, 2016

That sounds like it'd be pretty useful.

@nocnokneo

This comment has been minimized.

Show comment
Hide comment
@nocnokneo

nocnokneo Feb 8, 2016

I agree - sounds like a good idea. It goes against git-cola's current UI pattern a bit (minimal buttons; most operations accessed by context menu or keyboard shortcut) but I'd still say it makes sense here.

nocnokneo commented Feb 8, 2016

I agree - sounds like a good idea. It goes against git-cola's current UI pattern a bit (minimal buttons; most operations accessed by context menu or keyboard shortcut) but I'd still say it makes sense here.

@davvid davvid closed this in bc30de2 Sep 9, 2016

@nocnokneo

This comment has been minimized.

Show comment
Hide comment
@nocnokneo

nocnokneo Sep 9, 2016

Cool, thanks. Although I was hoping to get a directory diff (git difftool -d ...) somehow. Could we add a "Compare All" button to the "git-cola diff" dialog?

nocnokneo commented Sep 9, 2016

Cool, thanks. Although I was hoping to get a directory diff (git difftool -d ...) somehow. Could we add a "Compare All" button to the "git-cola diff" dialog?

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Sep 10, 2016

Member

I'll take your "Compare All" button and raise you a Ctrl+Enter hotkey (for that dialog) and a standalone Ctrl+Shift+D hotkey for launching dir-diff via git-dag.

Member

davvid commented Sep 10, 2016

I'll take your "Compare All" button and raise you a Ctrl+Enter hotkey (for that dialog) and a standalone Ctrl+Shift+D hotkey for launching dir-diff via git-dag.

davvid added a commit that referenced this issue Sep 10, 2016

difftool: add a helper for launching a diff against commit^!
Reuse the left_take_parent logic to add a helper that adds the '^!' diff
suffix for easily seeing the contents of a specific commit.

Related-to: #468
Signed-off-by: David Aguilar <davvid@gmail.com>

davvid added a commit that referenced this issue Sep 10, 2016

difftool: add a "Compare All" button for directory diff
Add a Ctrl+Enter hotkey and "Compare All" button for launching directory
diffs using the difftool dialog.

Related-to: #468
Suggested-by: Taylor Braun-Jones <taylor@braun-jones.org>
Signed-off-by: David Aguilar <davvid@gmail.com>

davvid added a commit that referenced this issue Sep 10, 2016

dag: add a Ctrl+Enter hotkey for launching directory diffs
Make `git difftool --dir-diff` more accessible by adding a Ctrl+Enter
hotkey for launching directory diffs.

Related-to: #468
Suggested-by: Taylor Braun-Jones <taylor@braun-jones.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
@nocnokneo

This comment has been minimized.

Show comment
Hide comment
@nocnokneo

nocnokneo commented Sep 10, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment