From bf9645224b529be0e03655b4cef9c32f66c76015 Mon Sep 17 00:00:00 2001 From: Philipp Tessenow Date: Wed, 24 Apr 2013 08:33:02 +0200 Subject: 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 --- plugins/mercurial/mercurial.plugin.zsh | 38 +++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'plugins/mercurial/mercurial.plugin.zsh') diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 9aa2d167a..83dd578b3 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -17,8 +17,40 @@ alias hgs='hg status' # this is the 'git commit --amend' equivalent alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' -function hg_current_branch() { - if [ -d .hg ]; then - echo hg:$(hg branch) +function in_hg() { + if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then + echo 1 fi } + +function hg_get_branch_name() { + if [ $(in_hg) ]; then + echo $(hg branch) + fi +} + +function hg_prompt_info { + if [ $(in_hg) ]; then + _DISPLAY=$(hg_get_branch_name) + echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\ +$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_PROMPT_BASE_COLOR" + unset _DISPLAY + fi +} + +function hg_dirty_choose { + if [ $(in_hg) ]; then + hg status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]' + if [ $pipestatus[-1] -eq 0 ]; then + # Grep exits with 0 when "One or more lines were selected", return "dirty". + echo $1 + else + # Otherwise, no lines were found, or an error occurred. Return clean. + echo $2 + fi + fi +} + +function hg_dirty { + hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN +} -- cgit v1.2.3-70-g09d2 From c5aaa11ceee00142e0f385f157b90910d692705f Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Fri, 7 Jun 2013 18:36:07 -0300 Subject: Add count for incoming and outgoing changesets. --- plugins/mercurial/mercurial.plugin.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/mercurial/mercurial.plugin.zsh') diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 9aa2d167a..2d1a0ac0d 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -1,4 +1,3 @@ - # Mercurial alias hgc='hg commit' alias hgb='hg branch' @@ -9,9 +8,11 @@ alias hgd='hg diff' alias hged='hg diffmerge' # pull and update alias hgi='hg incoming' +alias hgic='hg incoming | grep "changeset" | wc -l' alias hgl='hg pull -u' alias hglr='hg pull --rebase' alias hgo='hg outgoing' +alias hgoc='hg outgoing | grep 'changeset' | wc -l' alias hgp='hg push' alias hgs='hg status' # this is the 'git commit --amend' equivalent -- cgit v1.2.3-70-g09d2 From f25e2d2856281698914f21f7d22f84ae7e421f39 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Tue, 25 Jun 2013 15:52:26 -0300 Subject: 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. --- plugins/mercurial/mercurial.plugin.zsh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins/mercurial/mercurial.plugin.zsh') diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index de036e44d..c18aa726c 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -8,11 +8,9 @@ alias hgd='hg diff' alias hged='hg diffmerge' # pull and update alias hgi='hg incoming' -alias hgic='hg incoming | grep "changeset" | wc -l' alias hgl='hg pull -u' alias hglr='hg pull --rebase' alias hgo='hg outgoing' -alias hgoc='hg outgoing | grep 'changeset' | wc -l' alias hgp='hg push' alias hgs='hg status' # this is the 'git commit --amend' equivalent @@ -55,3 +53,11 @@ function hg_dirty_choose { function hg_dirty { hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN } + +function hgic() { + hg incoming "$@" | grep "changeset" | wc -l +} + +function hgoc() { + hg outgoing "$@" | grep "changeset" | wc -l +} -- cgit v1.2.3-70-g09d2