diff options
| author | Romain Francoise | 2007-09-06 19:46:17 +0000 |
|---|---|---|
| committer | Romain Francoise | 2007-09-06 19:46:17 +0000 |
| commit | 12451866c75e053089ee0fdde157cf45e9cce03e (patch) | |
| tree | deb60011fdd3ca80a77f4798539396d2a19e3b53 | |
| parent | d175b0ae79c2405bcb08f66a6d7a08381b004969 (diff) | |
| download | emacs-12451866c75e053089ee0fdde157cf45e9cce03e.tar.gz emacs-12451866c75e053089ee0fdde157cf45e9cce03e.zip | |
(vc-bzr-admin-lastrev): New defconst.
(vc-bzr-workfile-version): Use it.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2007-09-06 Romain Francoise <romain@orebokech.com> | ||
| 2 | |||
| 3 | * vc-bzr.el (vc-bzr-admin-lastrev): New defconst. | ||
| 4 | (vc-bzr-workfile-version): Use it. | ||
| 5 | |||
| 1 | 2007-09-06 Sean O'Rourke <sorourke@cs.ucsd.edu> | 6 | 2007-09-06 Sean O'Rourke <sorourke@cs.ucsd.edu> |
| 2 | 7 | ||
| 3 | * complete.el (PC-do-completion): Don't try to treat | 8 | * complete.el (PC-do-completion): Don't try to treat |
| 4 | empty string as an abbreviation. | 9 | empty string as an abbreviation. |
| 5 | 10 | ||
| 6 | 2007-09-06 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> | 11 | 2007-09-06 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> |
| 7 | 12 | ||
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." | |||
| 105 | (concat vc-bzr-admin-dirname "/branch/format")) | 105 | (concat vc-bzr-admin-dirname "/branch/format")) |
| 106 | (defconst vc-bzr-admin-revhistory | 106 | (defconst vc-bzr-admin-revhistory |
| 107 | (concat vc-bzr-admin-dirname "/branch/revision-history")) | 107 | (concat vc-bzr-admin-dirname "/branch/revision-history")) |
| 108 | (defconst vc-bzr-admin-lastrev | ||
| 109 | (concat vc-bzr-admin-dirname "/branch/last-revision")) | ||
| 108 | 110 | ||
| 109 | ;;;###autoload (defun vc-bzr-registered (file) | 111 | ;;;###autoload (defun vc-bzr-registered (file) |
| 110 | ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file) | 112 | ;;;###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." | |||
| 241 | ((rootdir (vc-bzr-root file)) | 243 | ((rootdir (vc-bzr-root file)) |
| 242 | (branch-format-file (concat rootdir "/" vc-bzr-admin-branch-format-file)) | 244 | (branch-format-file (concat rootdir "/" vc-bzr-admin-branch-format-file)) |
| 243 | (revhistory-file (concat rootdir "/" vc-bzr-admin-revhistory)) | 245 | (revhistory-file (concat rootdir "/" vc-bzr-admin-revhistory)) |
| 244 | (lastrev-file (concat rootdir "/" "branch/last-revision"))) | 246 | (lastrev-file (concat rootdir "/" vc-bzr-admin-lastrev))) |
| 245 | ;; Count lines in .bzr/branch/revision-history to avoid forking a | 247 | ;; Count lines in .bzr/branch/revision-history to avoid forking a |
| 246 | ;; bzr process. This looks at internal files. May break if they | 248 | ;; bzr process. This looks at internal files. May break if they |
| 247 | ;; change their format. | 249 | ;; change their format. |