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

Add support for magit-status #29

Merged
merged 1 commit into from Jun 5, 2017
Merged

Conversation

DamienCassou
Copy link
Owner

No description provided.

@DamienCassou
Copy link
Owner Author

/cc @Fuco1

@DamienCassou DamienCassou requested a review from Fuco1 May 26, 2017 11:44
@Fuco1
Copy link
Collaborator

Fuco1 commented May 26, 2017

I was just about to write this myself actually :D Made a note for today's evening.

beginend.el Outdated
(progn
(re-search-forward "^$")
(forward-line))
(progn))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also add some end logic, for example when you have the "Unpulled from" or "Unmerged into" headings I would like to get to the last commit (for example I want to do an interactive rebase). Right now it goes two lines below that, which is pretty useless probably.

Unmerged into upstream-branch (2)
85d8881 Bar
499b347 Foo

<point ends up here>

Should land at the last hash. What do you think?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done. Does it work for you now?

@Fuco1
Copy link
Collaborator

Fuco1 commented May 26, 2017

@DamienCassou Also if you want a review you can use the "Reviewers" in the right-hand column and select me there. That pings me the same way as adding an @ mention and it doesn't require additional comment.

@Fuco1
Copy link
Collaborator

Fuco1 commented May 26, 2017

You can also see all your requested reviews in the dashboard so that is also helpful for organization: https://github.com/pulls/review-requested

@DamienCassou DamienCassou force-pushed the magit-status-support branch 2 times, most recently from 39f2de5 to ef53816 Compare May 26, 2017 13:52
@DamienCassou
Copy link
Owner Author

Thanks for the feedback and comments.

use the "Reviewers" in the right-hand column and select me

I will do that

You can also see all your requested reviews in the dashboard

I didn't know that, thanks!

beginend.el Outdated
(re-search-forward "^$")
(forward-line))
(progn
(beginend--goto-nonwhitespace)))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This gets really crazy for me because magit uses invisible blocks a lot. These simple searches don't handle it very well.

I think using

(magit-section-backward)
(magit-section-backward)

would work best. Look at the definition of that, it is insanely complicated! (I think we need to call it twice to get to the beginning of the previous relevant line)

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you tell me how to get a status buffer where (beginend--goto-nonwhitespace) doesn't work?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you have the section Unstaged changes as the last one (or Staged changes) and the last change set is collapsed, the cursor will jump to different positions on repeated invocations.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you very much. I implemented your suggestion. I guess that for magit-status, imenu support makes more sense than beginend. But it's still cool to have it working. Thanks.

@DamienCassou DamienCassou added this to the v2.0.0 milestone Jun 2, 2017
@DamienCassou DamienCassou force-pushed the magit-status-support branch 3 times, most recently from 5c0f2e0 to e7792b1 Compare June 5, 2017 11:52
@DamienCassou DamienCassou merged commit 28806d0 into master Jun 5, 2017
@DamienCassou DamienCassou deleted the magit-status-support branch June 5, 2017 12:41
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.

None yet

2 participants