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

git: Add new evil-magit bindings #3578

Merged
merged 1 commit into from
Oct 29, 2015
Merged

git: Add new evil-magit bindings #3578

merged 1 commit into from
Oct 29, 2015

Conversation

justbur
Copy link
Contributor

@justbur justbur commented Oct 28, 2015

Also turn off evilification for magit conditional on the evil-magit
package being used.

@justbur
Copy link
Contributor Author

justbur commented Oct 28, 2015

@a13ph @mbertheau

@syl20bnr
Copy link
Owner

Nice work 👍
Can we wait for this being available in MELPA or is there anything holding it from being hosted there ?

@justbur
Copy link
Contributor Author

justbur commented Oct 28, 2015

I wanted to do it officially through the magit repo to get others to look
at it and critique it. I could obviously make my own package though. What
do you think?
On Wed, Oct 28, 2015 at 10:05 AM Sylvain Benner notifications@github.com
wrote:

Nice work [image: 👍]
Can we wait for this being available MELPA or is there anything holding it
from being hosted there ?


Reply to this email directly or view it on GitHub
#3578 (comment).

@syl20bnr
Copy link
Owner

I wanted to do it officially through the magit repo to get others to look at it and critique it.

Good point. As soon as it is merged (by me or @TheBB), we can open an issue to discuss about the proposal and reference the PR link in the evil-magit repo.

@nixmaniack
Copy link
Contributor

@justbur Amazing experience! Pretty evil! 😈 👍 Been using it for some time, feels home.

@CestDiego
Copy link
Contributor

I can't wait for this to be merged. :)

@TheBB
Copy link
Collaborator

TheBB commented Oct 29, 2015

Is this magit 2.3 certified ® © ™?

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@TheBB It looks to me like we were getting the 2.3 commits the whole time. In other words, it's only a significant upgrade for the stable users

Also turn off evilification for magit conditional on the evil-magit
package being used.
@syl20bnr syl20bnr merged commit 150e38e into syl20bnr:develop Oct 29, 2015
@syl20bnr
Copy link
Owner

Thank you 👍

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

Thank you @syl20bnr !

@CestDiego
Copy link
Contributor

#itsHappening! :)

@PierreR
Copy link
Contributor

PierreR commented Oct 29, 2015

For the record, the latest commit t 150e38e in develop has increased the loading startup time significantly. At least for me ;-)

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@PierreR It's quelpa downloading the package. It should only happen once. As soon as this new package is on melpa we'll switch back. For the record, this is not the only quelpa package in use

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@PierreR hm. It looks like quelpa is not handling the dependency correctly

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@PierreR After spacemacs loads do M-x package-install RET magit RET as a workaround

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

then restart

@PierreR
Copy link
Contributor

PierreR commented Oct 29, 2015

After spacemacs loads do M-x package-install RET magit RET as a workaround

@justbur well I have a lot of magit-* package when I do that but no magit alone

@CestDiego
Copy link
Contributor

I lost the ability to go up/down one line :( to have precise selection staging. is this expected?

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@PierreR ok, then it seems it is installed but can't be found. Go into .emacs.d/elpa and look for a magit-[date] folder and a evil-magit-[date] folder. Delete both and restart. You might have a bad download of magit

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@CestDiego magit uses n and p to navigate sections and C-n and C-p to navigate by line. Just swap j for n and k for p in those

@CestDiego
Copy link
Contributor

n makes a search forward D: p works ok though

@PierreR
Copy link
Contributor

PierreR commented Oct 29, 2015

@justbur Thanks. Your last tip fixes it ;-)

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@PierreR 👍 I get an abnormal number of corrupted downloads from melpa. I have no idea why, but usually redownloading the package works

@CestDiego
Copy link
Contributor

I thought updating would make this work.

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

I thought updating would make this work.

Is that directed at me? What do you mean?

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@CestDiego anyway use #3592 for comments on the bindings

@CestDiego
Copy link
Contributor

@justbur I thought that updating spacemacs (given that this PR was merged) would make n and p work as evil-magit makes it. And would not make n do next-search

@justbur
Copy link
Contributor Author

justbur commented Oct 29, 2015

@CestDiego please read the documentation I linked to which is merged by the way. j and k play the role of n and p. also see the pull request at magit/evil-magit

@CestDiego
Copy link
Contributor

I misunderstood your comment and was confused by the link. Now I get it :) C-j and C-k are what moves one in lines :) amazing :) thanks

@CestDiego
Copy link
Contributor

@justbur @syl20bnr I want to raise a big concern regading j k for chunks and C-j C-k for lines.

I want to explain why this is not a good translation directly from the Emacs keybindings:

In Emacs you move up and down lines with C-p and C-n, and that is unchanged in magit, additionally, in magit you use p and n to move up and down chunks... So basically the way you move lines is not changed.

In Evil, you move up and down with k and j, but in evil-magit you move up and down in lines with C-k and C-j which is very confusing , and more when you try to select lines and have to switch your mind from using j|k to move between lines to C-j|C-k ... I hope you guys can see my point and evaluate it while you also use the region staging features.

@justbur
Copy link
Contributor Author

justbur commented Nov 6, 2015

@CestDiego update your packages. this was already changed

@CestDiego
Copy link
Contributor

@justbur I just updated, the behaviour is changed :) but when I try to select regions, I can't use j nor k only C-n and C-p is this expected?

@justbur
Copy link
Contributor Author

justbur commented Nov 6, 2015

@CestDiego no not expected. What's the context? What buffer?
On Fri, Nov 6, 2015 at 3:52 PM Diego Berrocal notifications@github.com
wrote:

@justbur https://github.com/justbur I just updated, the behaviour is
changed :) but when I try to select regions, I can't use j nor k only C-n
and C-p is this expected?


Reply to this email directly or view it on GitHub
#3578 (comment).

@CestDiego
Copy link
Contributor

@justbur the magit-status buffer....just trying to select regions to stage.

@justbur
Copy link
Contributor Author

justbur commented Nov 6, 2015

@CestDiego after hitting v or V?
On Fri, Nov 6, 2015 at 4:11 PM Diego Berrocal notifications@github.com
wrote:

@justbur https://github.com/justbur the magit-status buffer....just
trying to select regions to stage.


Reply to this email directly or view it on GitHub
#3578 (comment).

@CestDiego
Copy link
Contributor

any of those will say: Mark Activated and after pressing j it'll exit the mark

@justbur
Copy link
Contributor Author

justbur commented Nov 6, 2015

What does exit the mark mean?

@CestDiego
Copy link
Contributor

woops, I meant exit the selection..and the marks dissappear.

@justbur
Copy link
Contributor Author

justbur commented Nov 6, 2015

I own the repo now. Just open an issue and I'll look into it.
On Fri, Nov 6, 2015 at 4:20 PM Diego Berrocal notifications@github.com
wrote:

woops, I meant exit the selection..and the marks dissappear.


Reply to this email directly or view it on GitHub
#3578 (comment).

@nixmaniack
Copy link
Contributor

I can use jk when selecting regions to stage after hitting v/V. Does the evil-state matter? I'm using hybrid.

@justbur
Copy link
Contributor Author

justbur commented Nov 7, 2015

@nixmaniack right now no it shouldn't make any difference what editing style you use.

@justbur justbur deleted the evil-magit branch November 15, 2015 20:19
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.

6 participants