Rename vc-name to vc-master-rename.

* vc-hooks.el, vc-rcs.el, vc-sccs.el: vc-name -> vc-master-name.  This
is preaparatory to isolating all the 'master' functions used only by
the file-oriented back ends.  With this done first, the substantive
diffs will be easier to read.

4 files changed, 57 insertions, 50 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e9dbfe4fc2..4ff16657e1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-22  Eric S. Raymond  <esr@snark>
+
+        * vc-hooks.el, vc-rcs.el, vc-sccs.el: vc-name  -> vc-master-name.
+        This is preaparatory to isolating all the 'master' functions
+        used only by the file-oriented back ends.  With this done first,
+        the substantive diffs will be easier to read.
+
 2014-11-21  Rüdiger Sonderfeld  <ruediger@c-plusplus.net>
 
         * play/morse.el (nato-alphabet): Mark URL in docstring in a way
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 28fbaae9d1d..b62a64012e9 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -454,18 +454,18 @@ If the argument is a list, the files must all have the same back end."
   "Return where the repository for the current directory is kept."
   (symbol-name (vc-backend file)))
 
-(defun vc-name (file)
+(defun vc-master-name (file)
   "Return the master name of FILE.
 If the file is not registered, or the master name is not known, return nil."
   ;; TODO: This should ultimately become obsolete, at least up here
   ;; in vc-hooks.
-  (or (vc-file-getprop file 'vc-name)
+  (or (vc-file-getprop file 'vc-master-name)
       ;; force computation of the property by calling
       ;; vc-BACKEND-registered explicitly
       (let ((backend (vc-backend file)))
         (if (and backend
                  (vc-call-backend backend 'registered file))
-            (vc-file-getprop file 'vc-name)))))
+            (vc-file-getprop file 'vc-master-name)))))
 
 (defun vc-checkout-model (backend files)
   "Indicate how FILES are checked out.
@@ -647,7 +647,7 @@ If FILE is not registered, this function always returns nil."
       (put backend 'vc-templates-grabbed t))
     (let ((result (vc-check-master-templates file (symbol-value sym))))
       (if (stringp result)
-          (vc-file-setprop file 'vc-name result)
+          (vc-file-setprop file 'vc-master-name result)
         nil))))                         ; Not registered
 
 (defun vc-possible-master (s dirname basename)
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 2d713c9a70c..0b839a622e1 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -238,11 +238,11 @@ When VERSION is given, perform check for that version."
              (if (vc-rcs-trunk-p version)
                  (progn
                    ;; Compare VERSION to the head version number.
-                   (vc-insert-file (vc-name file) "^[0-9]")
+                   (vc-insert-file (vc-master-name file) "^[0-9]")
                    (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1))
                ;; If we are not on the trunk, we need to examine the
                ;; whole current branch.
-               (vc-insert-file (vc-name file) "^desc")
+               (vc-insert-file (vc-master-name file) "^desc")
                (vc-rcs-find-most-recent-rev (vc-branch-part version))))))
 
 (defun vc-rcs-workfile-unchanged-p (file)
@@ -309,9 +309,9 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
                            (match-string 1))))
             ;; if we couldn't find the master name,
             ;; run vc-rcs-registered to get it
-            ;; (will be stored into the vc-name property)
+            ;; (will be stored into the vc-master-name property)
             (vc-rcs-registered file)
-          (vc-file-setprop file 'vc-name
+          (vc-file-setprop file 'vc-master-name
                            (if (file-name-absolute-p name)
                                name
                              (expand-file-name
@@ -343,7 +343,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
   "Unregister FILE from RCS.
 If this leaves the RCS subdirectory empty, ask the user
 whether to remove it."
-  (let* ((master (vc-name file))
+  (let* ((master (vc-master-name file))
          (dir (file-name-directory master))
          (backup-info (find-backup-file-name master)))
     (if (not backup-info)
@@ -379,7 +379,7 @@ whether to remove it."
         (if old-version
             (setq rev (vc-branch-part old-version))
           (error "can't find current branch"))
-        (apply #'vc-do-command "*vc*" 0 "ci" (vc-name file)
+        (apply #'vc-do-command "*vc*" 0 "ci" (vc-master-name file)
                ;; if available, use the secure check-in option
                (and (vc-rcs-release-p "5.6.4") "-j")
                (concat (if vc-keep-workfiles "-u" "-r") rev)
@@ -411,12 +411,12 @@ whether to remove it."
           (if (not (vc-rcs-release-p "5.6.2"))
               ;; exit status of 1 is also accepted.
               ;; It means that the lock was removed before.
-              (vc-do-command "*vc*" 1 "rcs" (vc-name file)
+              (vc-do-command "*vc*" 1 "rcs" (vc-master-name file)
                              (concat "-u" old-version)))))))))
 
 (defun vc-rcs-find-revision (file rev buffer)
   (apply #'vc-do-command
-         (or buffer "*vc*") 0 "co" (vc-name file)
+         (or buffer "*vc*") 0 "co" (vc-master-name file)
          "-q" ;; suppress diagnostic output
          (concat "-p" rev)
          (vc-switches 'RCS 'checkout)))
@@ -448,7 +448,7 @@ attempt the checkout for all registered files beneath it."
                    (vc-rcs-set-default-branch file nil))
               ;; now do the checkout
               (apply #'vc-do-command
-                     "*vc*" 0 "co" (vc-name file)
+                     "*vc*" 0 "co" (vc-master-name file)
                      ;; If locking is not strict, force to overwrite
                      ;; the writable workfile.
                      (if (eq (vc-rcs-checkout-model (list file)) 'implicit) "-f")
@@ -501,7 +501,7 @@ expanded to all registered subfiles in them."
                                            discard file)))
                 (error "Aborted"))
             (message "Removing revision %s from %s." discard file)
-            (vc-do-command "*vc*" 0 "rcs" (vc-name file) (concat "-o" discard))
+            (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) (concat "-o" discard))
             ;; Check out the most recent remaining version.  If it
             ;; fails, because the whole branch got deleted, do a
             ;; double-take and check out the version where the branch
@@ -509,7 +509,7 @@ expanded to all registered subfiles in them."
             (while (not done)
               (condition-case err
                   (progn
-                    (vc-do-command "*vc*" 0 "co" (vc-name file) "-f"
+                    (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f"
                                    (concat "-u" previous))
                     (setq done t))
                 (error (set-buffer "*vc*")
@@ -529,14 +529,14 @@ expanded to all registered subfiles in them."
 revert all registered files beneath it."
   (if (file-directory-p file)
       (mapc 'vc-rcs-revert (vc-expand-dirs (list file)))
-    (vc-do-command "*vc*" 0 "co" (vc-name file) "-f"
+    (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f"
                    (concat (if (eq (vc-state file) 'edited) "-u" "-r")
                            (vc-working-revision file)))))
 
 (defun vc-rcs-merge (file first-version &optional second-version)
   "Merge changes into current working copy of FILE.
 The changes are between FIRST-VERSION and SECOND-VERSION."
-  (vc-do-command "*vc*" 1 "rcsmerge" (vc-name file)
+  (vc-do-command "*vc*" 1 "rcsmerge" (vc-master-name file)
                  "-kk"                  ; ignore keyword conflicts
                  (concat "-r" first-version)
                  (if second-version (concat "-r" second-version))))
@@ -547,16 +547,16 @@ If FILE is a directory, steal the lock on all registered files beneath it.
 Needs RCS 5.6.2 or later for -M."
   (if (file-directory-p file)
       (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file)))
-    (vc-do-command "*vc*" 0 "rcs" (vc-name file) "-M" (concat "-u" rev))
+    (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) "-M" (concat "-u" rev))
     ;; Do a real checkout after stealing the lock, so that we see
     ;; expanded headers.
-    (vc-do-command "*vc*" 0 "co" (vc-name file) "-f" (concat "-l" rev))))
+    (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f" (concat "-l" rev))))
 
 (defun vc-rcs-modify-change-comment (files rev comment)
   "Modify the change comments change on FILES on a specified REV.  If FILE is a
 directory the operation is applied to all registered files beneath it."
   (dolist (file (vc-expand-dirs files))
-    (vc-do-command "*vc*" 0 "rcs" (vc-name file)
+    (vc-do-command "*vc*" 0 "rcs" (vc-master-name file)
                    (concat "-m" rev ":" comment))))
 
 
@@ -582,7 +582,7 @@ Remaining arguments are ignored.
 If FILE is a directory the operation is applied to all registered
 files beneath it."
   (vc-do-command (or buffer "*vc*") 0 "rlog"
-                 (mapcar 'vc-name (vc-expand-dirs files)))
+                 (mapcar 'vc-master-name (vc-expand-dirs files)))
   (with-current-buffer (or buffer "*vc*")
     (vc-rcs-print-log-cleanup))
   (when limit 'limit-unsupported))
@@ -845,7 +845,7 @@ systime, or nil if there is none.  Also, reposition point."
       (vc-file-tree-walk
        dir
        (lambda (f)
-         (vc-do-command "*vc*" 0 "rcs" (vc-name f) (concat "-n" name ":")))))))
+         (vc-do-command "*vc*" 0 "rcs" (vc-master-name f) (concat "-n" name ":")))))))
 
 
 ;;;
@@ -978,7 +978,7 @@ Uses `rcs2log' which only works for RCS and CVS."
 
 (defun vc-rcs-rename-file (old new)
   ;; Just move the master file (using vc-rcs-master-templates).
-  (vc-rename-master (vc-name old) new vc-rcs-master-templates))
+  (vc-rename-master (vc-master-name old) new vc-rcs-master-templates))
 
 (defun vc-rcs-find-file-hook ()
   ;; If the file is locked by some other user, make
@@ -997,7 +997,7 @@ Uses `rcs2log' which only works for RCS and CVS."
 This likely means that FILE has been changed with respect
 to its master version."
   (let ((file-time (nth 5 (file-attributes file)))
-        (master-time (nth 5 (file-attributes (vc-name file)))))
+        (master-time (nth 5 (file-attributes (vc-master-name file)))))
     (or (> (nth 0 file-time) (nth 0 master-time))
         (and (= (nth 0 file-time) (nth 0 master-time))
              (> (nth 1 file-time) (nth 1 master-time))))))
@@ -1024,10 +1024,10 @@ This function sets the properties `vc-working-revision' and
 `vc-checkout-model' to their correct values, based on the master
 file."
   (with-temp-buffer
-    (if (or (not (vc-insert-file (vc-name file) "^[0-9]"))
+    (if (or (not (vc-insert-file (vc-master-name file) "^[0-9]"))
             (progn (goto-char (point-min))
                    (not (looking-at "^head[ \t\n]+[^;]+;$"))))
-        (error "File %s is not an RCS master file" (vc-name file)))
+        (error "File %s is not an RCS master file" (vc-master-name file)))
     (let ((workfile-is-latest nil)
           (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1)))
       (vc-file-setprop file 'vc-rcs-default-branch default-branch)
@@ -1047,7 +1047,7 @@ file."
                         default-branch)
           (setq working-revision default-branch))
          ;; else, search for the head of the default branch
-         (t (vc-insert-file (vc-name file) "^desc")
+         (t (vc-insert-file (vc-master-name file) "^desc")
             (setq working-revision
                   (vc-rcs-find-most-recent-rev default-branch))
             (setq workfile-is-latest t)))
@@ -1238,7 +1238,7 @@ variable `vc-rcs-release' is set to the returned value."
   (set-file-modes file (logior (file-modes file) 128)))
 
 (defun vc-rcs-set-default-branch (file branch)
-  (vc-do-command "*vc*" 0 "rcs" (vc-name file) (concat "-b" branch))
+  (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) (concat "-b" branch))
   (vc-file-setprop file 'vc-rcs-default-branch branch))
 
 (defun vc-rcs-parse (&optional buffer)
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index f1e437b1d9f..780efc48e96 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -181,7 +181,7 @@ For a description of possible values, see `vc-check-master-templates'."
     ;; To find this number, search the entire delta table,
     ;; rather than just the first entry, because the
     ;; first entry might be a deleted ("R") revision.
-    (vc-insert-file (vc-name file) "^\001e\n\001[^s]")
+    (vc-insert-file (vc-master-name file) "^\001e\n\001[^s]")
     (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1)))
 
 ;; Cf vc-sccs-find-revision.
@@ -189,7 +189,7 @@ For a description of possible values, see `vc-check-master-templates'."
   "Write the SCCS version of input file FILE to output file OUTFILE.
 Optional string REV is a revision."
   (with-temp-buffer
-    (apply 'vc-sccs-do-command t 0 "get" (vc-name file)
+    (apply 'vc-sccs-do-command t 0 "get" (vc-master-name file)
            (append '("-s" "-p" "-k") ; -k: no keyword expansion
                    (if rev (list (concat "-r" rev)))))
     (write-region nil nil outfile nil 'silent)))
@@ -233,10 +233,10 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
     (let* ((dirname (or (file-name-directory file) ""))
            (basename (file-name-nondirectory file))
            (project-file (vc-sccs-search-project-dir dirname basename)))
-      (let ((vc-name
+      (let ((vc-master-name
              (or project-file
                  (format (car vc-sccs-master-templates) dirname basename))))
-        (apply 'vc-sccs-do-command nil 0 "admin" vc-name
+        (apply 'vc-sccs-do-command nil 0 "admin" vc-master-name
                (and rev (not (string= rev "")) (concat "-r" rev))
                "-fb"
                (concat "-i" (file-relative-name file))
@@ -244,7 +244,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
                (vc-switches 'SCCS 'register)))
       (delete-file file)
       (if vc-keep-workfiles
-          (vc-sccs-do-command nil 0 "get" (vc-name file))))))
+          (vc-sccs-do-command nil 0 "get" (vc-master-name file))))))
 
 (defun vc-sccs-responsible-p (file)
   "Return non-nil if SCCS thinks it would be responsible for registering FILE."
@@ -256,15 +256,15 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
 (defun vc-sccs-checkin (files comment)
   "SCCS-specific version of `vc-backend-checkin'."
   (dolist (file (vc-expand-dirs files))
-    (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file)
+    (apply 'vc-sccs-do-command nil 0 "delta" (vc-master-name file)
            (concat "-y" comment)
            (vc-switches 'SCCS 'checkin))
     (if vc-keep-workfiles
-        (vc-sccs-do-command nil 0 "get" (vc-name file)))))
+        (vc-sccs-do-command nil 0 "get" (vc-master-name file)))))
 
 (defun vc-sccs-find-revision (file rev buffer)
   (apply 'vc-sccs-do-command
-         buffer 0 "get" (vc-name file)
+         buffer 0 "get" (vc-master-name file)
          "-s" ;; suppress diagnostic output
          "-p"
          (and rev
@@ -298,7 +298,7 @@ locked.  REV is the revision to check out."
             (and rev (or (string= rev "")
                          (not (stringp rev)))
                  (setq rev nil))
-            (apply 'vc-sccs-do-command nil 0 "get" (vc-name file)
+            (apply 'vc-sccs-do-command nil 0 "get" (vc-master-name file)
                    "-e"
                    (and rev (concat "-r" (vc-sccs-lookup-triple file rev)))
                    switches))))
@@ -317,16 +317,16 @@ are expanded to all version-controlled subfiles."
                 (error "Aborted"))
             (message "Removing revision %s from %s..." discard file)
             (vc-sccs-do-command nil 0 "rmdel"
-                                (vc-name file) (concat "-r" discard))
-            (vc-sccs-do-command nil 0 "get" (vc-name file) nil))))
+                                (vc-master-name file) (concat "-r" discard))
+            (vc-sccs-do-command nil 0 "get" (vc-master-name file) nil))))
 
 (defun vc-sccs-revert (file &optional _contents-done)
   "Revert FILE to the version it was based on. If FILE is a directory,
 revert all subfiles."
   (if (file-directory-p file)
       (mapc 'vc-sccs-revert (vc-expand-dirs (list file)))
-    (vc-sccs-do-command nil 0 "unget" (vc-name file))
-    (vc-sccs-do-command nil 0 "get" (vc-name file))
+    (vc-sccs-do-command nil 0 "unget" (vc-master-name file))
+    (vc-sccs-do-command nil 0 "get" (vc-master-name file))
     ;; Checking out explicit revisions is not supported under SCCS, yet.
     ;; We always "revert" to the latest revision; therefore
     ;; vc-working-revision is cleared here so that it gets recomputed.
@@ -337,14 +337,14 @@ revert all subfiles."
   (if (file-directory-p file)
       (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file)))
     (vc-sccs-do-command nil 0 "unget"
-                        (vc-name file) "-n" (if rev (concat "-r" rev)))
+                        (vc-master-name file) "-n" (if rev (concat "-r" rev)))
     (vc-sccs-do-command nil 0 "get"
-                        (vc-name file) "-g" (if rev (concat "-r" rev)))))
+                        (vc-master-name file) "-g" (if rev (concat "-r" rev)))))
 
 (defun vc-sccs-modify-change-comment (files rev comment)
   "Modify (actually, append to) the change comments for FILES on a specified REV."
   (dolist (file (vc-expand-dirs files))
-    (vc-sccs-do-command nil 0 "cdc" (vc-name file)
+    (vc-sccs-do-command nil 0 "cdc" (vc-master-name file)
                         (concat "-y" comment) (concat "-r" rev))))
 
 
@@ -356,7 +356,7 @@ revert all subfiles."
   "Print commit log associated with FILES into specified BUFFER.
 Remaining arguments are ignored."
   (setq files (vc-expand-dirs files))
-  (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
+  (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-master-name files))
   (when limit 'limit-unsupported))
 
 (autoload 'vc-setup-buffer "vc-dispatcher")
@@ -475,12 +475,12 @@ Remaining arguments are ignored."
 
 (defun vc-sccs-rename-file (old new)
   ;; Move the master file (using vc-rcs-master-templates).
-  (vc-rename-master (vc-name old) new vc-sccs-master-templates)
+  (vc-rename-master (vc-master-name old) new vc-sccs-master-templates)
   ;; Update the tag file.
   (with-current-buffer
       (find-file-noselect
        (expand-file-name vc-sccs-name-assoc-file
-                         (file-name-directory (vc-name old))))
+                         (file-name-directory (vc-master-name old))))
     (goto-char (point-min))
     ;; (replace-regexp (concat ":" (regexp-quote old) "$") (concat ":" new))
     (while (re-search-forward (concat ":" (regexp-quote old) "$") nil t)
@@ -524,7 +524,7 @@ find any project directory."
 
 (defun vc-sccs-lock-file (file)
   "Generate lock file name corresponding to FILE."
-  (let ((master (vc-name file)))
+  (let ((master (vc-master-name file)))
     (and
      master
      (string-match "\\(.*/\\)\\(s\\.\\)\\(.*\\)" master)
@@ -546,7 +546,7 @@ The result is a list of the form ((REVISION . USER) (REVISION . USER) ...)."
   (with-current-buffer
       (find-file-noselect
        (expand-file-name vc-sccs-name-assoc-file
-                         (file-name-directory (vc-name file))))
+                         (file-name-directory (vc-master-name file))))
     (goto-char (point-max))
     (insert name "\t:\t" file "\t" rev "\n")
     (basic-save-buffer)
@@ -562,7 +562,7 @@ If NAME is nil or a revision number string it's just passed through."
     (with-temp-buffer
       (vc-insert-file
        (expand-file-name vc-sccs-name-assoc-file
-                         (file-name-directory (vc-name file))))
+                         (file-name-directory (vc-master-name file))))
       (vc-parse-buffer (concat name "\t:\t" file "\t\\(.+\\)") 1))))
 
 (provide 'vc-sccs)