[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/02/04 07:32:53

Modified files:
        lisp           : ChangeLog vc-bzr.el 

Log message:
        (vc-bzr-working-revision): Recognize a newer branch
        format.  Use when instead of if.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15252&r2=1.15253
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.73&r2=1.74

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15252
retrieving revision 1.15253
diff -u -b -r1.15252 -r1.15253
--- ChangeLog   4 Feb 2009 05:48:16 -0000       1.15252
+++ ChangeLog   4 Feb 2009 07:32:51 -0000       1.15253
@@ -1,3 +1,8 @@
+2009-02-04  Dan Nicolaescu  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-working-revision): Recognize a newer branch
+       format.  Use when instead of if.
+
 2009-02-04  Miles Bader  <address@hidden>
 
        * emacs-lisp/lisp.el (forward-sexp, backward-sexp, forward-list)

Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- vc-bzr.el   10 Jan 2009 21:50:41 -0000      1.73
+++ vc-bzr.el   4 Feb 2009 07:32:53 -0000       1.74
@@ -338,10 +338,12 @@
             ;; 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)
+            (when (re-search-forward "[0-9]+" nil t)
                 (buffer-substring (match-beginning 0) (match-end 0))))))
       ;; fallback to calling "bzr revno"
       (lexical-let*