X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=c3535f2b76b25a2358d1244b918deaf4115c627f;hb=refs%2Ftags%2F0.3.53;hp=23f653bae700eb0650ef38a9b73884910673bd86;hpb=e89137e535aae3806887fbcc3c0539dfb3f0ee27;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 23f653b..c3535f2 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1284,12 +1284,10 @@ VCS_INFO_svn_get_data () { # {{{ VCS_INFO_bzr_get_data () { # {{{ local msg bzrbranch bzrbase bzrrevno i j - bzrbase=$(bzr info | sed -rne 's, *branch root: ,,p') - case ${bzrbase} in - .) bzrbase=${PWD} ;; - esac + bzrbase=$(bzr info 2>/dev/null | sed -rne 's, *branch root: ,,p') + bzrbase=$(VCS_INFO_realpath ${bzrbase}) - bzr version-info | while read i j; do + bzr version-info 2> /dev/null | while read i j; do case "${i}" in revno:) bzrrevno=${j} ;; @@ -1330,6 +1328,7 @@ VCS_INFO_detect_by_dir() { VCS_INFO_bzr_detect() { check_com -c bzr || return 1 + vcs_comm[detect_need_file]=branch/format VCS_INFO_detect_by_dir '.bzr' return $? }