Mercurial > emacs
changeset 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 | 7d131969b5e2 |
| children | b6da45c113db |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 04 05:48:16 2009 +0000 +++ b/lisp/ChangeLog Wed Feb 04 07:32:51 2009 +0000 @@ -1,3 +1,8 @@ +2009-02-04 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-working-revision): Recognize a newer branch + format. Use when instead of if. + 2009-02-04 Miles Bader <miles@gnu.org> * emacs-lisp/lisp.el (forward-sexp, backward-sexp, forward-list)
--- 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