Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(vc-bzr-working-revision): Fix looking for a revision

Browse source 
in a lightweight checkout.
This commit is contained in:
Dan Nicolaescu 2010-01-05 13:19:34 -08:00
parent 7b47345b7c
commit 37860cafd5
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-05 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-working-revision): Fix looking for a revision
in a lightweight checkout.
2010-01-05 Kenichi Handa <handa@m17n.org>
* language/indian.el (malayalam-composable-pattern): Fix ZWNJ and

16
lisp/vc-bzr.el
View file

@ -356,9 +356,19 @@ If any error occurred in running `bzr status', then return nil."
(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)