Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
37860caf
Commit
37860caf
authored
Jan 05, 2010
by
Dan Nicolaescu
Browse files
(vc-bzr-working-revision): Fix looking for a revision
in a lightweight checkout.
parent
7b47345b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+13
-3
No files found.
lisp/ChangeLog
View file @
37860caf
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
...
...
lisp/vc-bzr.el
View file @
37860caf
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment