diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 3ae59496..852529cb 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -19,35 +19,44 @@ alias hgca='hg commit --amend' alias hgun='hg resolve --list' function in_hg() { - if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then + if [[ -d .hg ]] || $(hg root > /dev/null 2>&1); then echo 1 fi } function hg_get_branch_name() { - if [ $(in_hg) ]; then + if [ $_INHG ]; then echo $(hg branch) fi } function hg_prompt_info { - if [ $(in_hg) ]; then + _INHG=$(in_hg) + if [ $_INHG ]; 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_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR" unset _DISPLAY fi + unset _INHG } function hg_dirty_choose { - if [ $(in_hg) ]; then - hg status 2> /dev/null | command 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. + if [ $_INHG ]; then + # Allow turning off the 'hg status' call. Useful in large repos where that + # can take a while. Mirror the functionality of the git plugin by just + # showing the "clean" prompt in this case. + if [[ "$(command hg config oh-my-zsh.hide-dirty)" = "1" ]]; then echo $2 + else + hg status 2> /dev/null | command 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 fi }