[Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/10/10 18:52:45

Index: lisp/vc-arch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-arch.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- lisp/vc-arch.el     7 Sep 2007 19:00:30 -0000       1.33
+++ lisp/vc-arch.el     10 Oct 2007 18:52:44 -0000      1.34
@@ -265,7 +265,7 @@
              ;; ID not found.
              (if (equal (file-name-nondirectory sigfile)
                         (subst-char-in-string
-                         ?/ ?% (vc-arch-workfile-version file)))
+                         ?/ ?% (vc-arch-working-revision file)))
                  'added
                ;; Might be `added' or `up-to-date' as well.
                ;; FIXME: Check in the patch logs to find out.
@@ -283,7 +283,7 @@
                    'up-to-date
                  'edited)))))))))
 
-(defun vc-arch-workfile-version (file)
+(defun vc-arch-working-revision (file)
   (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
         (defbranch (vc-arch-default-version file)))
     (when (and defbranch (string-match 
"\\`\\(address@hidden/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" 
defbranch))
@@ -321,7 +321,7 @@
 
 (defun vc-arch-mode-line-string (file)
   "Return string for placement in modeline by `vc-mode-line' for FILE."
-  (let ((rev (vc-workfile-version file)))
+  (let ((rev (vc-working-revision file)))
     (dolist (rule vc-arch-mode-line-rewrite)
       (if (string-match (car rule) rev)
          (setq rev (replace-match (cdr rule) t nil rev))))
@@ -389,7 +389,7 @@
   (let ((file (car files)))
     (if (and newvers
              (vc-up-to-date-p file)
-             (equal newvers (vc-workfile-version file)))
+             (equal newvers (vc-working-revision file)))
         ;; Newvers is the base revision and the current file is unchanged,
         ;; so we can diff with the current file.
         (setq newvers nil))
@@ -406,7 +406,7 @@
                ;; Arch does not support the typical flags.
                ;; (vc-switches 'Arch 'diff)
                (file-relative-name file)
-               (if (equal oldvers (vc-workfile-version file))
+               (if (equal oldvers (vc-working-revision file))
                    nil
                  oldvers))))
         (if async 1 status)))))               ; async diff, pessimistic 
assumption.
@@ -423,7 +423,7 @@
   "A wrapper around `vc-do-command' for use in vc-arch.el."
   (apply 'vc-do-command buffer okstatus vc-arch-command file flags))
 
-(defun vc-arch-init-version () nil)
+(defun vc-arch-init-revision () nil)
 
 ;;; Completion of versions and revisions.
 
@@ -559,7 +559,7 @@
 
 ;;; Less obvious implementations.
 
-(defun vc-arch-find-version (file rev buffer)
+(defun vc-arch-find-revision (file rev buffer)
   (let ((out (make-temp-file "vc-out")))
     (unwind-protect
         (progn