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.

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

Adapt for Magit's move to Transient #11983

Merged
merged 2 commits into from
Feb 16, 2019

Conversation

bmag
Copy link
Contributor

@bmag bmag commented Feb 15, 2019

Magit now uses Transient instead of magit-popup, and we must adapt. Also had to replace the recently removed magit-diff-buffer-file-popup with magit-diff-buffer-file (similar but doesn't offer a popup before displaying the diff).

Note some upstream packages haven't adapted to this change, but when they do we might need similar fixes:

  • magithub
  • magit-gitflow
  • magit-svn

Related: #11978

@duianto
Copy link
Contributor

duianto commented Feb 15, 2019

Could magit-diff be the new equivalent command?

This is what the SPC g f d (magit-diff-buffer-file-popup) popup looked like before:

emacs_2019-02-15_19-37-01

This is what SPC g f d (magit-diff-buffer-file) looks like now:

emacs_2019-02-15_19-32-26

This is what M-x magit-diff looks like now:

emacs_2019-02-15_19-54-46

And pressing d (for Dwim), shows a prompt: Diff for range (magit-transient-PR):
Pressing RET shows the same buffer as SPC g f d (second screenshot) but with a shorter buffer name magit-diff: .emacs.d.

@duianto
Copy link
Contributor

duianto commented Feb 15, 2019

Or if magit-diff isn't correct, then maybe magit-file-dispatch (C-c M-g) works better.

The popup looks different:

emacs_2019-02-15_20-19-07

but pressing d shows the same buffer as in the second screenshot above, with the long buffer-name (that includes the current file name).

Pressing D from that popup shows the same popup as in the third screenshot above.

@syl20bnr syl20bnr self-requested a review February 16, 2019 14:55
bmag and others added 2 commits February 16, 2019 10:20
Magit now uses Transient instead of magit-popup, and we must adapt. Also had to
replace the recently removed magit-diff-buffer-file-popup with
magit-diff-buffer-file (similar but doesn't offer a popup before displaying the
diff).

Note some upstream packages haven't adapted to this change, but when they do we
might need similar fixes:
- magithub
- magit-gitflow
- magit-svn
@syl20bnr syl20bnr force-pushed the magit-popup-to-transient branch from 8ae66a3 to 4e5d8eb Compare February 16, 2019 15:21
@syl20bnr syl20bnr merged commit 0bc5b54 into syl20bnr:develop Feb 16, 2019
@syl20bnr
Copy link
Owner

Thank you ! 💯

@domenzain
Copy link
Contributor

Related: syl20bnr/evil-escape#90
Although magit is useable, with the latest develop, evil-escape fails to escape from these transient windows.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants