Merge from gnus--devo--0

[gnu-emacs] / lisp / vc-mtn.el

diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el
index e2002f4e782b679be9ae5401501a6c1ee71f69dc..4a415bbf34a94ad7e56565fcd5e894871c76b75b 100644 (file)
--- a/lisp/vc-mtn.el
+++ b/lisp/vc-mtn.el
@@ -5,20 +5,20 @@
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: 
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -49,7 +49,7 @@
 ;;;###autoload         (vc-mtn-registered file))))
 
 (defun vc-mtn-revision-granularity () 'repository)
-(defun vc-mtn-checkout-model (file) 'implicit)
+(defun vc-mtn-checkout-model (files) 'implicit)
 
 (defun vc-mtn-root (file)
   (setq file (if (file-directory-p file)
@@ -67,7 +67,10 @@
 
 (defun vc-mtn-command (buffer okstatus files &rest flags)
   "A wrapper around `vc-do-command' for use in vc-mtn.el."
-  (apply 'vc-do-command buffer okstatus vc-mtn-command files flags))
+  (let ((process-environment
+         ;; Avoid localization of messages so we can parse the output.
+         (cons "LC_MESSAGES=C" process-environment)))
+    (apply 'vc-do-command (or buffer "*vc*") okstatus vc-mtn-command files flags)))
 
 (defun vc-mtn-state (file)
   ;; If `mtn' fails or returns status>0, or if the search files, just
@@ -76,10 +79,11 @@
     (with-temp-buffer
       (vc-mtn-command t 0 file "status")
       (goto-char (point-min))
-      (re-search-forward "^  \\(?:patched \\(.*\\)\\|no changes$\\)")
-      (if (match-end 1)
-          'edited
-        'up-to-date))))
+      (re-search-forward
+       "^  \\(?:\\(patched\\)\\|\\(added\\) \\(?:.*\\)\\)\\|no changes$")
+      (cond  ((match-end 1) 'edited)
+            ((match-end 2) 'added)
+            (t 'up-to-date)))))
 
 (defun vc-mtn-working-revision (file)
   ;; If `mtn' fails or returns status>0, or if the search fails, just
@@ -110,6 +114,7 @@
   '(("\\`[^:/#]*[:/#]" . ""))           ;Drop the host part.
   "Rewrite rules to shorten Mtn's revision names on the mode-line."
   :type '(repeat (cons regexp string))
+  :version "22.2"
   :group 'vc)
 
 (defun vc-mtn-mode-line-string (file)
@@ -120,7 +125,7 @@
          (setq branch (replace-match (cdr rule) t nil branch))))
     (format "Mtn%c%s"
            (case (vc-state file)
-             ((up-to-date needs-patch) ?-)
+             ((up-to-date needs-update) ?-)
              (added ?@)
              (t ?:))
            branch)))
@@ -170,8 +175,6 @@
 ;; (defun vc-mtn-show-log-entry (revision)
 ;;   )
 
-(defun vc-mtn-wash-log (file))
-
 (defun vc-mtn-diff (files &optional rev1 rev2 buffer)
   (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff"
          (append (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2)))))
@@ -280,8 +283,8 @@
                                 ;; Completion not implemented for these.
                                 "a:" "c:" "d:" "e:" "l:")
                               string pred))))))
-        
-        
+
+
 
 (provide 'vc-mtn)