From 12451866c75e053089ee0fdde157cf45e9cce03e Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Thu, 6 Sep 2007 19:46:17 +0000 Subject: [PATCH] (vc-bzr-admin-lastrev): New defconst. (vc-bzr-workfile-version): Use it. --- lisp/ChangeLog | 7 ++++++- lisp/vc-bzr.el | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0982a0b026f..433a45e5d9a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ +2007-09-06 Romain Francoise + + * vc-bzr.el (vc-bzr-admin-lastrev): New defconst. + (vc-bzr-workfile-version): Use it. + 2007-09-06 Sean O'Rourke * 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,Ae(Brd diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index c42a64969f2..ab304691ee4 100644 --- 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. -- 2.39.5