comparison .shell.d/50.vcs_functions.sh @ 298:901e85174513

rps1: show hg bookmark (if any) in rps1 instead of current branch
author Augie Fackler <raf@durin42.com>
date Mon, 12 Nov 2012 16:29:06 -0600
parents 533bde18976e
children 51aaf8bcd6ec
comparison
equal deleted inserted replaced
297:6be920ed2fe4 298:901e85174513
125 echo $br $rev 125 echo $br $rev
126 return 0 126 return 0
127 fi 127 fi
128 hg branch 2> /dev/null > /dev/null 128 hg branch 2> /dev/null > /dev/null
129 if [ $? = 0 ] ; then 129 if [ $? = 0 ] ; then
130 local bm=$(hg book | egrep ' \* ' | awk '{print $2}')
130 local br=`hg branch | head -c 10` 131 local br=`hg branch | head -c 10`
131 local rid=`hg parents --template '{node}\n' | head -n 1 | head -c 7` 132 local rid=`hg parents --template '{node}\n' | head -n 1 | head -c 7`
132 echo "$br $rid" 133 if [ -z "$bm" ] ; then
134 echo "$br $rid"
135 else
136 echo "$bm $rid"
137 fi
133 return 0 138 return 0
134 fi 139 fi
135 return 1 140 return 1
136 } 141 }
137 142