Mercurial > emacs

changeset 111384:90d8fda00161

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status) (vc-mtn-workfile-branch): Adjust to new output format.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 08 Nov 2010 13:42:24 -0500
parents fad6eee38123
children 85a2b871f225
files lisp/ChangeLog lisp/vc-mtn.el
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Nov 08 10:45:49 2010 -0500
+++ b/lisp/ChangeLog	Mon Nov 08 13:42:24 2010 -0500
@@ -1,3 +1,8 @@
+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>
 
 	* international/mule-cmds.el (princ-list): Mark as obsolete.
--- a/lisp/vc-mtn.el	Mon Nov 08 10:45:49 2010 -0500
+++ b/lisp/vc-mtn.el	Mon Nov 08 13:42:24 2010 -0500
@@ -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)