New features

[kuribas]

Hi, I implemented some new features that I found useful

• merging and updating doesn't open an external merge editor. You can use ediff on the unresolved file by pressing e. Also fixes a bug where an unresolved item doesn't show up.
• Pressing e on a diff prompts for a repository, and shows a diff using ediff
• Pressing enter on a branch checks out the branch
• Optional run update after a pull (with a customizable variable)
• Merge branches and revisions by pressing M on a branch or revision. Pressing M in the status buffer prompts for a revision.
• Open repositories using an alias, by calling monky-open-repository

I removed fetch, because it's a deprecated command.

[ananthakumaran]

I don't have time to review new feature PRs (I very rarely use hg nowadays). @lbolla has commit access. I am actually looking for more maintainers, if you could get somebody to review and test it, I could give you commit access.

[kuribas]

Thanks, but I haven't found anyone in the small intersection of emacs-lisp programmers and mercurial users...

[juszczakn]

I use it at work, I might be able to take a look at this later, no promises though.

[Bounga]

@ananthakumaran @kuribas I'd love to review and test this. I use Mercurial on a daily basis for my personal stuff so I'd be glad to see improvements making their way into Monky.

[ananthakumaran]

@Bounga @kuribas I have given commit access to both of you guys. Feel to free merge once tested. It's already in melpa, so merging to master will make it available for everyone.

[Bounga]

@ananthakumaran Thanks a lot. I'll take time to test things available in PR and merge them if it's working well and useful.

[muffinmad]

Optional run update after a pull (with a customizable variable)

Can it be configured to run rebase after pull?

[Bounga]

@muffinmad Just had a look at the code and it seems like it would be easy to add this option.

[Bounga]

@kuribas Would you mind to resolve the conflict and maybe add the option @muffinmad is talking about or do you prefer that I do this by myself?

[kuribas]

I'll have a look at it

[kuribas]

@muffinmad can you try if it does what you want? Feel free to commit when you're satisfied.

[muffinmad]

@kuribas sure, no problem. I think it will be better to make separate PR.

[Bounga]

Gonna try it too this week end

[kuribas]

I added the tool option because it worked rather badly with the default settings. I expect a tool to work well out of the box, and to be able to change it. Perhaps this should be an option as well?

[muffinmad]

@kuribas monky-pull-args option can solve it. Also there are monky-hg-standart-options variable. By default it can include "--config" "ui.merge=:merge".

[muffinmad]

I use this branch as primary mercurial tool. No issues so far.

[Bounga]

@muffinmad Nice. however it would be great to avoid the hardcoded merge tool before merging.

[muffinmad]

@Bounga indeed

[kuribas]

Make it an option as well? It'd be nice to have a sensible default for emacs.

[muffinmad]

@kuribas We already have monky-hg-standart-options where one can specify "--config" "ui.merge=:merge". I think one merge tool for all monky commands it's enough for the moment. Hardcoded merge tool can be safely deleted from monky-merge.

[Bounga]

LGTM Think we can merge now.

[kuribas]

Fine for me