adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 5de6253b0c into 4fec0a46e7

Browse Source
This commit is contained in:
Scott Rice 2018-04-17 21:02:43 +00:00 committed by GitHub
commit e5d8d8963c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/mercurial/mercurial.plugin.zsh
View File

@ -19,35 +19,44 @@ alias hgca='hg commit --amend'
alias hgun='hg resolve --list' alias hgun='hg resolve --list'
function in_hg() { 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 echo 1
fi fi
} }
function hg_get_branch_name() { function hg_get_branch_name() {
if [ $(in_hg) ]; then if [ $_INHG ]; then
echo $(hg branch) echo $(hg branch)
fi fi
} }
function hg_prompt_info { function hg_prompt_info {
if [ $(in_hg) ]; then _INHG=$(in_hg)
if [ $_INHG ]; then
_DISPLAY=$(hg_get_branch_name) _DISPLAY=$(hg_get_branch_name)
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\ 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" $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 unset _DISPLAY
fi fi
unset _INHG
} }
function hg_dirty_choose { function hg_dirty_choose {
if [ $(in_hg) ]; then if [ $_INHG ]; then
hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]' # Allow turning off the 'hg status' call. Useful in large repos where that
if [ $pipestatus[-1] -eq 0 ]; then # can take a while. Mirror the functionality of the git plugin by just
# Grep exits with 0 when "One or more lines were selected", return "dirty". # showing the "clean" prompt in this case.
echo $1 if [[ "$(command hg config oh-my-zsh.hide-dirty)" = "1" ]]; then
else
# Otherwise, no lines were found, or an error occurred. Return clean.
echo $2 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
fi fi
} }