Commit Graph

18 Commits

Author SHA1 Message Date
WeeBull
b57ddd6a67 Use actual commit --amend command for Mercurial
Rather than trying to emulate `git commit --amend` using mercurial queues (which might have side effects if you're using MQ for other things) use the `commit --amend` command which was introduced in Mercurial 2.2 (2012-05-01).
2015-11-26 14:08:53 +00:00
Andrew Janke
cca422eacf Mercurial plugin: revise README
Closes #4616
Changes the `plugins=(... mercurial ...)` to be closer to correct zsh syntax, removing commas and extra spaces.
Revises discussion on configuring themes to avoid sounding like users should modify the theme definition file in the main OMZ folder. Prioritizes the suggestion of using a theme which already supports hg_prompt_info.
2015-11-16 16:57:42 -05:00
Oleksandr Shybystyi
563e1052c7 Added README for mercurial plugin 2015-06-11 21:10:35 +02:00
Murilo Opsfelder Araujo
0a99ca0df0 plugins: mercurial: Update the order prompt vars are displayed
If a user sets ZSH_THEME_HG_PROMPT_* as the following, he ends up with
%{$reset_color%} resetting the bold style of last character ")" because
_SUFFIX was expanded before calling hg_dirty():

    ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[blue]%}hg:(%{$fg[white]%}"
    ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[blue]%})"

With this patch, the variable ZSH_THEME_HG_PROMPT_SUFFIX is lastly
displayed, following the same order as in git_prompt_info(),
i.e. <prefix><dirty><suffix>.
2015-02-20 16:12:39 -02:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Chris Krycho
f82092a0e7 Add a command to show unresolve files in merge 2014-06-07 23:12:32 +02:00
Zhou Hua
de0e7b5dc8 Fix hgsl alias.
The original 'hgsl' missed 'hg' part.
2014-03-10 11:41:25 +08:00
Jens Tinfors
96bd365542 Adds the hgsl alias for one-line shortlog convenience 2013-12-01 15:33:23 +01:00
Chris Krycho
f25e2d2856 Add more capable hg incoming and outgoing count handling
The original hgic and hgoc aliases worked well for the default path, but attempting to call them with a different path failed. I created functions to handle them instead.
2013-06-25 15:52:26 -03:00
Robby Russell
5bccf4b123 Merge pull request #1876 from chriskrycho/patch-1
Add count for incoming and outgoing changesets.
2013-06-25 09:21:32 -07:00
Chris Krycho
c5aaa11cee Add count for incoming and outgoing changesets. 2013-06-07 18:36:07 -03:00
Philipp Tessenow
bf9645224b extend mercurial plugin to be more like git/svn
implement in_hg(), hg_get_branch_name(), hg_prompt_info(), and hg_dirty() for the mercurial plugin
named functions similar to subversion plugin, to give theme maintainers an easier life
2013-04-24 08:33:02 +02:00
Vladimir Zakharov
c8db4f81fa Add alias for 'hg bookmarks' 2013-04-09 14:11:51 +04:00
Vladimir Zakharov
295bac0329 Mercurial: add alias for pull with rebasing 2013-03-27 10:16:46 +04:00
Vladimir Zakharov
6dd286bba3 Mercurial: add aliases for 'incoming' and 'outgoing' commands 2013-03-11 14:24:12 +04:00
Lucas Sampaio
51e05b7579 hg_current_branch added to mercurial plugin 2012-12-02 13:11:55 -08:00
Mark Drago
804c18ca53 remove the -v flag from a few mercurial aliases
The -v flag for these commands really isn't very useful.  It will
output some information about the hooks it is running, but that is
generally not useful and just noisy.  The desire to add -v to these
commands is exceptional and IMHO it's better to make the common
case of not seeing those messages the supported behavior.
2012-01-05 17:39:13 -05:00
ptrv
55eda0c48b Added mercurial plugin with aliases. 2011-06-10 15:38:59 +02:00