[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100176: * lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)

[Stefan Monnier]

------------------------------------------------------------
revno: 100176
author: Richard Levitte <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-11-08 13:42:24 -0500
message:
  * lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
  (vc-mtn-workfile-branch): Adjust to new output format.
modified:
  lisp/ChangeLog
  lisp/vc-mtn.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-08 15:45:49 +0000
+++ b/lisp/ChangeLog    2010-11-08 18:42:24 +0000
@@ -1,3 +1,8 @@
+2010-11-08  Richard Levitte  <address@hidden>  (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  <address@hidden>
 
        * international/mule-cmds.el (princ-list): Mark as obsolete.

=== modified file 'lisp/vc-mtn.el'
--- a/lisp/vc-mtn.el    2010-11-01 03:13:42 +0000
+++ b/lisp/vc-mtn.el    2010-11-08 18:42:24 +0000
@@ -109,7 +109,7 @@
 (defun vc-mtn-after-dir-status (update-function)
   (let (result)
     (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
            "^  \\(?:\\(patched  \\)\\|\\(added    \\)\\)\\(.*\\)$" nil t)
       (cond  ((match-end 1) (push (list (match-string 3) 'edited) result))
@@ -128,7 +128,7 @@
     (with-temp-buffer
       (vc-mtn-command t 0 file "status")
       (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))))
 
 (defun vc-mtn-workfile-branch (file)
@@ -138,7 +138,7 @@
     (with-temp-buffer
       (vc-mtn-command t 0 file "status")
       (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))))
 
 (defun vc-mtn-workfile-unchanged-p (file)