merge trunk

[bpt/emacs.git] / lisp / vc / vc-mtn.el

diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index cb03853..0b263e9 100644 (file)
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -1,6 +1,6 @@
 ;;; vc-mtn.el --- VC backend for Monotone
 
-;; Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: vc
@@ -110,7 +110,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (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))
@@ -129,7 +129,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
     (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)
@@ -139,7 +139,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
     (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)
@@ -175,7 +175,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 (declare-function log-edit-extract-headers "log-edit" (headers string))
 
-(defun vc-mtn-checkin (files rev comment  &optional extra-args-ignored)
+(defun vc-mtn-checkin (files rev comment)
   (apply 'vc-mtn-command nil 0 files
         (nconc (list "commit" "-m")
                (log-edit-extract-headers '(("Author" . "--author")
@@ -341,5 +341,4 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 (provide 'vc-mtn)
 
-;; arch-tag: 2b89ffbc-cbb8-405a-9080-2eafd4becb70
 ;;; vc-mtn.el ends here