( )⚙ D792 scm-prompt: include .hg in $hg variable

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D792

scm-prompt: include .hg in $hg variable
ClosedPublic

Authored by ryanmce on Sep 22 2017, 10:29 AM.
Tags
None
Subscribers
None

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXb85b4870dc08: scm-prompt: include .hg in $hg variable
Summary

This has been a big source of confusion and errors when sporadically hacking on
this script that usually doubles the time it takes to add a new feature. This
is the more sane way to do it anyway.

Test Plan

rt

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ryanmce created this revision.Sep 22 2017, 10:29 AM
stash accepted this revision.Sep 22 2017, 10:36 AM
This revision is now accepted and ready to land.Sep 22 2017, 10:36 AM
Closed by commit rFBHGXb85b4870dc08: scm-prompt: include .hg in $hg variable (authored by ryanmce). · Explain WhySep 22 2017, 11:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2024

scripts/scm-prompt.sh

# find out if we're in a git or hg repo by looking for the control dir # find out if we're in a git or hg repo by looking for the control dir
dir=$PWD dir=$PWD
while : ; do while : ; do
if test -d "$dir/.git" ; then if test -d "$dir/.git" ; then
git="$dir" git="$dir"
break break
elif test -d "$dir/.hg" ; then elif test -d "$dir/.hg" ; then
hg="$dir" hg="$dir/.hg"
break break
fi fi
test "$dir" = "/" && break test "$dir" = "/" && break
# portable "realpath" equivalent # portable "realpath" equivalent
dir=$(cd -P "$dir/.." && command echo "$PWD") dir=$(cd -P "$dir/.." && command echo "$PWD")
done done
local br local br
if test -n "$hg" ; then if test -n "$hg" ; then
local extra local extra
if [[ -f "$hg/.hg/bisect.state" ]]; then if [[ -f "$hg/bisect.state" ]]; then
extra="|BISECT" extra="|BISECT"
elif [[ -f "$hg/.hg/histedit-state" ]]; then elif [[ -f "$hg/histedit-state" ]]; then
extra="|HISTEDIT" extra="|HISTEDIT"
elif [[ -f "$hg/.hg/graftstate" ]]; then elif [[ -f "$hg/graftstate" ]]; then
extra="|GRAFT" extra="|GRAFT"
elif [[ -f "$hg/.hg/unshelverebasestate" ]]; then elif [[ -f "$hg/unshelverebasestate" ]]; then
extra="|UNSHELVE" extra="|UNSHELVE"
elif [[ -f "$hg/.hg/rebasestate" ]]; then elif [[ -f "$hg/rebasestate" ]]; then
extra="|REBASE" extra="|REBASE"
elif [[ -d "$hg/.hg/merge" ]]; then elif [[ -d "$hg/merge" ]]; then
extra="|MERGE" extra="|MERGE"
elif [[ -L "$hg/.hg/store/lock" ]]; then elif [[ -L "$hg/store/lock" ]]; then
extra="|STORE-LOCKED" extra="|STORE-LOCKED"
elif [[ -L "$hg/.hg/wlock" ]]; then elif [[ -L "$hg/wlock" ]]; then
extra="|WDIR-LOCKED" extra="|WDIR-LOCKED"
fi fi
local dirstate=$( \ local dirstate=$( \
(test -f "$hg/.hg/dirstate" && \ (test -f "$hg/dirstate" && \
command hexdump -vn 20 -e '1/1 "%02x"' "$hg/.hg/dirstate") || \ command hexdump -vn 20 -e '1/1 "%02x"' "$hg/dirstate") || \
(test -f "$hg/.eden/client/SNAPSHOT" && \ (test -f "$hg/../.eden/client/SNAPSHOT" && \
command hexdump -s 8 -vn 20 -e '1/1 "%02x"' "$hg/.eden/client/SNAPSHOT") || \ command hexdump -s 8 -vn 20 -e '1/1 "%02x"' \
"$hg/../.eden/client/SNAPSHOT") || \
command echo "empty") command echo "empty")
local active="$hg/.hg/bookmarks.current" local active="$hg/bookmarks.current"
if [[ -f "$active" ]]; then if [[ -f "$active" ]]; then
br=$(command cat "$active") br=$(command cat "$active")
# check to see if active bookmark needs update (eg, moved after pull) # check to see if active bookmark needs update (eg, moved after pull)
local marks="$hg/.hg/bookmarks" local marks="$hg/bookmarks"
if [[ -f "$hg/.hg/sharedpath" && -f "$hg/.hg/shared" ]] && if [[ -f "$hg/sharedpath" && -f "$hg/shared" ]] &&
command grep -q '^bookmarks$' "$hg/.hg/shared"; then command grep -q '^bookmarks$' "$hg/shared"; then
marks="$(command cat $hg/.hg/sharedpath)/bookmarks" marks="$(command cat $hg/sharedpath)/bookmarks"
fi fi
if [[ -z "$extra" ]] && [[ -f "$marks" ]]; then if [[ -z "$extra" ]] && [[ -f "$marks" ]]; then
local markstate=$(command grep " $br$" "$marks" | \ local markstate=$(command grep " $br$" "$marks" | \
command cut -f 1 -d ' ') command cut -f 1 -d ' ')
if [[ $markstate != "$dirstate" ]]; then if [[ $markstate != "$dirstate" ]]; then
extra="|UPDATE_NEEDED" extra="|UPDATE_NEEDED"
fi fi
fi fi
else else
br=$(command echo "$dirstate" | command cut -c 1-7) br=$(command echo "$dirstate" | command cut -c 1-7)
fi fi
local remote="$hg/.hg/remotenames" local remote="$hg/remotenames"
if [[ -f "$remote" ]]; then if [[ -f "$remote" ]]; then
local allremotemarks="$(command grep "^$dirstate bookmarks" "$remote" | \ local allremotemarks="$(command grep "^$dirstate bookmarks" "$remote" | \
command cut -f 3 -d ' ')" command cut -f 3 -d ' ')"
if [[ -n "$allremotemarks" ]]; then if [[ -n "$allremotemarks" ]]; then
local remotemark="$(_find_most_relevant "$allremotemarks")" local remotemark="$(_find_most_relevant "$allremotemarks")"
if [[ -n "$remotemark" ]]; then if [[ -n "$remotemark" ]]; then
br="$br|${remotemark}..." br="$br|${remotemark}..."
fi fi
fi fi
fi fi
local branch local branch
if [[ -f "$hg/.hg/branch" ]]; then if [[ -f "$hg/branch" ]]; then
branch=$(command cat "$hg/.hg/branch") branch=$(command cat "$hg/branch")
if [[ $branch != "default" ]]; then if [[ $branch != "default" ]]; then
br="$br|$branch" br="$br|$branch"
fi fi
fi fi
br="$br$extra" br="$br$extra"
elif test -n "$git" ; then elif test -n "$git" ; then
if test -f "$git/.git/HEAD" ; then if test -f "$git/.git/HEAD" ; then
read br < "$git/.git/HEAD" read br < "$git/.git/HEAD"