Mercurial > emacs
diff lisp/vc-bzr.el @ 101790:e98ddfaefcae
(vc-bzr-working-revision): Recognize a newer branch
format. Use when instead of if.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 04 Feb 2009 07:32:51 +0000 |
| parents | 5f4e85fd7c0a |
| children | acda56dde7fb |
line wrap: on
line diff
--- a/lisp/vc-bzr.el Wed Feb 04 05:48:16 2009 +0000 +++ b/lisp/vc-bzr.el Wed Feb 04 07:32:51 2009 +0000 @@ -338,11 +338,13 @@ ;; count lines in .bzr/branch/revision-history (insert-file-contents revhistory-file) (number-to-string (count-lines (line-end-position) (point-max)))) - ((looking-at "Bazaar Branch Format 6 (bzr 0.15)") + ((or + (looking-at "Bazaar Branch Format 6 (bzr 0.15)") + (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)")) ;; revno is the first number in .bzr/branch/last-revision (insert-file-contents lastrev-file) - (if (re-search-forward "[0-9]+" nil t) - (buffer-substring (match-beginning 0) (match-end 0)))))) + (when (re-search-forward "[0-9]+" nil t) + (buffer-substring (match-beginning 0) (match-end 0)))))) ;; fallback to calling "bzr revno" (lexical-let* ((result (vc-bzr-command-discarding-stderr