procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-bzr-after-dir-status): Match another renaming indicator.

Browse source
This commit is contained in:
Dan Nicolaescu 2010-01-29 15:43:31 -08:00
parent c14902e0a0
commit b923687464
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-01-29 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Match another renaming indicator.
2010-01-29 Chong Yidong <cyd@stupidchicken.com>
* dirtrack.el (dirtrack): Warn instead of signalling error if the

3
lisp/vc-bzr.el
View file

@ -679,6 +679,7 @@ stream. Standard error output is discarded."
("? " . unregistered)
;; No such state, but we need to distinguish this case.
("R " . renamed)
("RM " . renamed)
;; For a non existent file FOO, the output is:
;; bzr: ERROR: Path(s) do not exist: FOO
("bzr" . not-found)
@ -713,7 +714,7 @@ stream. Standard error output is discarded."
(when entry
(setf (nth 1 entry) 'conflict))))
((eq translated 'renamed)
(re-search-forward "R \\(.*\\) => \\(.*\\)$" (line-end-position) t)
(re-search-forward "R[ M] \\(.*\\) => \\(.*\\)$" (line-end-position) t)
(let ((new-name (file-relative-name (match-string 2) relative-dir))
(old-name (file-relative-name (match-string 1) relative-dir)))
(push (list new-name 'edited