* lisp/vc/log-edit.el (log-edit-font-lock-gnu-style): Mark safe if boolean.

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

diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 3d76d34..122743c 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-2012  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: vc
@@ -34,6 +34,11 @@
 
 (eval-when-compile (require 'cl) (require 'vc))
 
+(defgroup vc-mtn nil
+  "VC Monotone (mtn) backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-mtn-diff-switches t
   "String or list of strings specifying switches for monotone diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@@ -42,13 +47,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-mtn)
 
 (define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1")
 (defcustom vc-mtn-program "mtn"
   "Name of the monotone executable."
   :type 'string
-  :group 'vc)
+  :group 'vc-mtn)
 
 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@@ -59,9 +64,10 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (setq vc-handled-backends (delq 'Mtn vc-handled-backends)))
 
 ;;;###autoload
-(defconst vc-mtn-admin-dir "_MTN")
+(defconst vc-mtn-admin-dir "_MTN" "Name of the monotone directory.")
 ;;;###autoload
-(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format"))
+(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format")
+  "Name of the monotone directory's format file.")
 
 ;;;###autoload (defun vc-mtn-registered (file)
 ;;;###autoload   (if (vc-find-root file vc-mtn-admin-format)
@@ -110,7 +116,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 +135,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 +145,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)
@@ -152,7 +158,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   "Rewrite rules to shorten Mtn's revision names on the mode-line."
   :type '(repeat (cons regexp string))
   :version "22.2"
-  :group 'vc)
+  :group 'vc-mtn)
 
 (defun vc-mtn-mode-line-string (file)
   "Return string for placement in modeline by `vc-mode-line' for FILE."
@@ -192,7 +198,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (unless contents-done
     (vc-mtn-command nil 0 file "revert")))
 
-;; (defun vc-mtn-roolback (files)
+;; (defun vc-mtn-rollback (files)
 ;;   )
 
 (defun vc-mtn-print-log (files buffer &optional shortlog start-revision limit)
@@ -299,7 +305,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
       ids)))
 
 (defun vc-mtn-revision-completion-table (files)
-  ;; TODO: Implement completion for for selectors
+  ;; TODO: Implement completion for selectors
   ;; TODO: Implement completion for composite selectors.
   (lexical-let ((files files))
     ;; What about using `files'?!?  --Stef
@@ -341,5 +347,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