Commit 05539fb3 authored by Richard Levitte's avatar Richard Levitte Committed by Stefan Monnier
Browse files

* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)

(vc-mtn-workfile-branch): Adjust to new output format.
parent cc4d2366
2010-11-08 Richard Levitte <richard@levitte.org> (tiny patch)
* vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.
2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca> 2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
* international/mule-cmds.el (princ-list): Mark as obsolete. * international/mule-cmds.el (princ-list): Mark as obsolete.
......
...@@ -109,7 +109,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ...@@ -109,7 +109,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(defun vc-mtn-after-dir-status (update-function) (defun vc-mtn-after-dir-status (update-function)
(let (result) (let (result)
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t) (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t)
(while (re-search-forward (while (re-search-forward
"^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t) "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t)
(cond ((match-end 1) (push (list (match-string 3) 'edited) result)) (cond ((match-end 1) (push (list (match-string 3) 'edited) result))
...@@ -128,7 +128,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ...@@ -128,7 +128,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(with-temp-buffer (with-temp-buffer
(vc-mtn-command t 0 file "status") (vc-mtn-command t 0 file "status")
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
(match-string 2)))) (match-string 2))))
(defun vc-mtn-workfile-branch (file) (defun vc-mtn-workfile-branch (file)
...@@ -138,7 +138,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ...@@ -138,7 +138,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(with-temp-buffer (with-temp-buffer
(vc-mtn-command t 0 file "status") (vc-mtn-command t 0 file "status")
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
(match-string 1)))) (match-string 1))))
(defun vc-mtn-workfile-unchanged-p (file) (defun vc-mtn-workfile-unchanged-p (file)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment