Mercurial > emacs
changeset 84350:13fc3289f099
(vc-bzr-admin-lastrev): New defconst.
(vc-bzr-workfile-version): Use it.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Thu, 06 Sep 2007 19:46:17 +0000 |
| parents | 786ae2b7b452 |
| children | 162e36293ef2 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 06 18:41:46 2007 +0000 +++ b/lisp/ChangeLog Thu Sep 06 19:46:17 2007 +0000 @@ -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,Ae(Brd <bojohan@dd.chalmers.se>
--- a/lisp/vc-bzr.el Thu Sep 06 18:41:46 2007 +0000 +++ b/lisp/vc-bzr.el Thu Sep 06 19:46:17 2007 +0000 @@ -105,6 +105,8 @@ (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 @@ ((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.