(vc-bzr-admin-lastrev): New defconst.

(vc-bzr-workfile-version): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0982a0b026ff5f731c064dda12f24f9de19a93d8..433a45e5d9addb035dbc7a49f4c8fb38bb8fcf35 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+2007-09-06  Romain Francoise  <romain@orebokech.com>
+
+       * vc-bzr.el (vc-bzr-admin-lastrev): New defconst.
+       (vc-bzr-workfile-version): Use it.
+
 2007-09-06  Sean O'Rourke  <sorourke@cs.ucsd.edu>
 
        * complete.el (PC-do-completion): Don't try to treat
-         empty string as an abbreviation.
+       empty string as an abbreviation.
 
 2007-09-06  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
 

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index c42a64969f2daf3f794f4f8c12ad78b3e441b046..ab304691ee4af1d65c548b6bf1fe2c3afed1f979 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -105,6 +105,8 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment."
   (concat vc-bzr-admin-dirname "/branch/format"))
 (defconst vc-bzr-admin-revhistory
   (concat vc-bzr-admin-dirname "/branch/revision-history"))
+(defconst vc-bzr-admin-lastrev
+  (concat vc-bzr-admin-dirname "/branch/last-revision"))
 
 ;;;###autoload (defun vc-bzr-registered (file)
 ;;;###autoload   (if (vc-find-root file vc-bzr-admin-checkout-format-file)
@@ -241,7 +243,7 @@ If any error occurred in running `bzr status', then return nil."
       ((rootdir (vc-bzr-root file))
        (branch-format-file (concat rootdir "/" vc-bzr-admin-branch-format-file))
        (revhistory-file (concat rootdir "/" vc-bzr-admin-revhistory))
-       (lastrev-file (concat rootdir "/" "branch/last-revision")))
+       (lastrev-file (concat rootdir "/" vc-bzr-admin-lastrev)))
     ;; Count lines in .bzr/branch/revision-history to avoid forking a
     ;; bzr process.  This looks at internal files.  May break if they
     ;; change their format.