Mercurial > emacs
diff lisp/vc-bzr.el @ 106742:debedd261607
(vc-bzr-working-revision): Fix looking for a revision
in a lightweight checkout.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Tue, 05 Jan 2010 13:19:34 -0800 |
parents | d804f575197b |
children | d94786c1fa6c |
line wrap: on
line diff
--- a/lisp/vc-bzr.el Tue Jan 05 21:37:43 2010 +0100 +++ b/lisp/vc-bzr.el Tue Jan 05 13:19:34 2010 -0800 @@ -356,9 +356,19 @@ (if (file-exists-p location-fname) (with-temp-buffer (insert-file-contents location-fname) - (when (re-search-forward "file://\(.+\)" nil t) - (setq branch-format-file (match-string 1)) - (file-exists-p branch-format-file))) + ;; If the lightweight checkout points to a + ;; location in the local file system, then we can + ;; look there for the version information. + (when (re-search-forward "file://\\(.+\\)" nil t) + (let ((l-c-parent-dir (match-string 1))) + (setq branch-format-file + (expand-file-name vc-bzr-admin-branch-format-file + l-c-parent-dir)) + (setq lastrev-file + (expand-file-name vc-bzr-admin-lastrev l-c-parent-dir)) + ;; FIXME: maybe it's overkill to check if both these files exist. + (and (file-exists-p branch-format-file) + (file-exists-p lastrev-file))))) t))) (with-temp-buffer (insert-file-contents branch-format-file)