mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

(vc-bzr-working-revision): Recognize a newer branch

Browse source 
format.  Use when instead of if.
This commit is contained in:
Dan Nicolaescu 2009-02-04 07:32:51 +00:00
parent 61eee794db
commit 6510501067
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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)

8
lisp/vc-bzr.el
View file

@ -338,11 +338,13 @@ If any error occurred in running `bzr status', then return nil."
;; 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