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

Open Changes (with difftool) opens one difftool window per changed file. #503

Closed
phindle opened this Issue Sep 13, 2018 · 5 comments

Comments

Projects
None yet
3 participants
@phindle

phindle commented Sep 13, 2018

  • GitLens Version: 8.5.6
  • VSCode Version: 1.27.1
  • OS Version: Windows 10 Pro (1803)

Steps to Reproduce:

  1. Have a project open with 2 files (.cs files) modified.
  2. Invoke 'GitLens: Open Changes (with difftool)' from the command palette (or use Alt+M keyboard shortcut)
  3. P4Merge (my configured diff tool) opens twice, one for each modified file.

Expected outcome:
Using Open Changes (with difftool) should only difftool the currently open editor.

p.s. Thank you Eric - GitLens is brilliant!

@eamodio eamodio self-assigned this Sep 19, 2018

@eamodio eamodio added the bug label Sep 19, 2018

@eamodio eamodio added this to the Soonish™ milestone Sep 19, 2018

@eamodio

This comment has been minimized.

Owner

eamodio commented Sep 19, 2018

Thanks! 😄 Yeah, that command isn't working properly in that case.

@eamodio eamodio modified the milestones: Soonish™, Soon™ Sep 30, 2018

@eamodio eamodio closed this in 065bd0f Dec 2, 2018

@kaiseiken

This comment has been minimized.

kaiseiken commented Dec 4, 2018

This change actually appears to have removed a second option "Open All Changes (with difftool)", which had the expected outcome that @phindle desired.

"Open Changes (with difftool)" appears to behave exactly how the original bug describes, which was probably not a bug to begin with. But now, with no option to use the previous "Open All Changes (with difftool)" command, that functionality is missing.

Oddly enough, it looks like you can still assign a keyboard shortcut to "Open All Changes (with difftool)", but it merely invokes the "Open Changes (with difftool)".

@kaiseiken

This comment has been minimized.

kaiseiken commented Dec 4, 2018

I was testing this functionality using Meld on Linux and Windows, which supports file comparisons and directory comparisons. I believe this is the difference between the two difftool commands as previously implemented.

@eamodio

This comment has been minimized.

Owner

eamodio commented Dec 4, 2018

@kaiseiken Thanks for the report -- would you mind opening a new issue for this Open All Changes (with difftool) missing or not working?

@kaiseiken

This comment has been minimized.

kaiseiken commented Dec 4, 2018

Sure, no prob.

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