X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fsvn-completion.bashrc;h=3f32703ef99204396dc8adebdda4c8a7b8a76f65;hb=d6ccc8abb1b587d6c9e2b4f416c1236cc61e7c3c;hp=3ccc6273aa6f51a9c2d85f8942a5d20c6162d369;hpb=69660d7ffcf12c1da215713e613f759e4abf2bec;p=profile.git diff --git a/.profile.d/svn-completion.bashrc b/.profile.d/svn-completion.bashrc index 3ccc627..3f32703 100644 --- a/.profile.d/svn-completion.bashrc +++ b/.profile.d/svn-completion.bashrc @@ -1,12 +1,20 @@ +# Get UUID for the working copy. function __svn_uuid() { svn info 2>/dev/null | sed -n 's/^Repository UUID: //p' return $? } +# Get SVN toplevel. function __svn_dir() { local last="$1"; shift local uuid=$(__svn_uuid) + # Bomb out if we ended up in an unexecutable directory. + if [ ! -x "$PWD" ]; then + return 1 + fi + + # Return the last directory if we just changed and found a different repo. if [ -n "$last" -a ! "$uuid" = "$last" ]; then echo "$OLDPWD" return 0 @@ -14,6 +22,8 @@ function __svn_dir() { last="$uuid" cd .. + + # Root? if [ "$PWD" = "$OLDPWD" ]; then return 1 fi @@ -22,6 +32,7 @@ function __svn_dir() { return $? } +# Find the URL for the working copy and detect if we are on trunk. function __svn_url() { local url=$(svn info "$1" 2>/dev/null | sed -n 's/^URL: //p') [ $? -gt 0 ] && return 1