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

Merge 392a8ee02d into 4fec0a46e7

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

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

@ -19,37 +19,38 @@ 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 $(hg branch > /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 branch=`hg branch 2>/dev/null`
echo $(hg branch) if [ $? -eq 0 ]; then
echo $branch
fi fi
unset branch
} }
function hg_prompt_info { function hg_prompt_info {
if [ $(in_hg) ]; then _DISPLAY=`hg branch 2>/dev/null`
_DISPLAY=$(hg_get_branch_name) if [ $? -eq 0 ]; then
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
fi fi
unset _DISPLAY
} }
function hg_dirty_choose { function hg_dirty_choose {
if [ $(in_hg) ]; then hg status -mar 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]' if [ $? -eq 0 ]; then
if [ $pipestatus[-1] -eq 0 ]; then if [ $pipestatus[-1] -eq 0 ]; then
# Grep exits with 0 when "One or more lines were selected", return "dirty". # Grep exits with 0 when "One or more lines were selected", return "dirty".
echo $1 echo $1
else return
# Otherwise, no lines were found, or an error occurred. Return clean.
echo $2
fi fi
fi fi
echo $2
} }
function hg_dirty { function hg_dirty {
@ -57,9 +58,9 @@ function hg_dirty {
} }
function hgic() { function hgic() {
hg incoming "$@" | grep "changeset" | wc -l hg incoming "$@" | grep "changeset" | wc -l
} }
function hgoc() { function hgoc() {
hg outgoing "$@" | grep "changeset" | wc -l hg outgoing "$@" | grep "changeset" | wc -l
} }