From 42a47c2daed90cc75713343469ebe96b3675f327 Mon Sep 17 00:00:00 2001 From: Scott Rice Date: Thu, 24 Sep 2015 09:43:27 -0700 Subject: [PATCH 1/2] [hg] Allow turning off the `hg status` call in a similar fashion to the git plugin In some very large repositories, `hg status` can take a pretty long time. It doesn't feel great to have a multi second delay every time you run a command while you wait for hg status to complete. Mirroring the functionality in the git plugin, this diff adds a check for a new configuration option in `hg config`. If this option is enabled we disable the `hg status` check and just show the clean marker. --- plugins/mercurial/mercurial.plugin.zsh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 86200ccf..87dca5e5 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -20,7 +20,7 @@ alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' 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 } @@ -42,13 +42,20 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$ 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. + # 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 } From 5de6253b0c83a12fb3a7c145f711a1ea9ca9207e Mon Sep 17 00:00:00 2001 From: Scott Rice Date: Thu, 24 Sep 2015 09:58:04 -0700 Subject: [PATCH 2/2] [hg] Cache the result of the `in_hg` call within `hg_prompt_info` helpers The helper functions are smart only work if the user is in an hg repository. Unfortunately checking that fact can take a while for large repos, so these redundant checks are taking a while. This diff stores the result of the first call from `hg_prompt_info` in a local variable and just checks that for every other function. This gave me a multi-second speedup locally. --- plugins/mercurial/mercurial.plugin.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 87dca5e5..bb95fd33 100644 --- a/plugins/mercurial/mercurial.plugin.zsh +++ b/plugins/mercurial/mercurial.plugin.zsh @@ -26,22 +26,24 @@ function in_hg() { } 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 + 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.