Get rid of several uses of the term 'master' in favor of equivalent verbiage

using "repository".  No code changes.
This commit is contained in:
Eric S. Raymond 2010-04-09 13:19:53 -04:00
parent b13aef5499
commit 004f9b3f1b
5 changed files with 25 additions and 19 deletions

View file

@ -3974,7 +3974,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
;;;;;; "bb37ec379c0a523368794491b691fd8d")
;;;;;; "2f8d3d5a31b969b181e23c40d6bb16a0")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\

View file

@ -282,7 +282,7 @@ Not documented
;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist
;;;;;; do* do loop return-from return block etypecase typecase ecase
;;;;;; case load-time-value eval-when destructuring-bind function*
;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "273ba25f4a116c61a464dbe55f1f8c63")
;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "7fad7dd60f2f96ba90432f885015d61b")
;;; Generated autoloads from cl-macs.el
(autoload 'gensym "cl-macs" "\

View file

@ -254,8 +254,7 @@ Only the value `maybe' can be trusted :-(."
(buffer-substring (point-min) (1- (point-max)))))))))
(defun vc-arch-workfile-unchanged-p (file)
"Check if FILE is unchanged by diffing against the master version.
Return non-nil if FILE is unchanged."
"Stub: arch workfiles are always considered to be in a changed state,"
nil)
(defun vc-arch-state (file)

View file

@ -396,7 +396,7 @@ If the argument is a list, the files must all have the same back end."
(defun vc-backend-subdirectory-name (file)
"Return where the master and lock FILEs for the current directory are kept."
"Return where the repository for the current directory is kept."
(symbol-name (vc-backend file)))
(defun vc-name (file)
@ -467,13 +467,13 @@ For registered files, the value returned is one of:
USER The current version of the working file is locked by
some other USER (a string).
'needs-update The file has not been edited by the user, but there is
'needs-update The file has not been edited by the user, but there is
a more recent version on the current branch stored
in the master file.
in the repository.
'needs-merge The file has been edited by the user, and there is also
a more recent version on the current branch stored in
the master file. This state can only occur if locking
the repository. This state can only occur if locking
is not used for the file.
'unlocked-changes The working version of the file is not locked,
@ -552,7 +552,7 @@ and does not employ any heuristic at all."
unchanged))))
(defun vc-default-workfile-unchanged-p (backend file)
"Check if FILE is unchanged by diffing against the master version.
"Check if FILE is unchanged by diffing against the repository version.
Return non-nil if FILE is unchanged."
(zerop (condition-case err
;; If the implementation supports it, let the output

View file

@ -63,11 +63,18 @@
;; although you might prefer to use C-c C-a (i.e. `log-edit-insert-changelog')
;; from the commit buffer instead or to set `log-edit-setup-invert'.
;;
;; The vc code maintains some internal state in order to reduce expensive
;; version-control operations to a minimum. Some names are only computed
;; once. If you perform version control operations with the backend while
;; vc's back is turned, or move/rename master files while vc is running,
;; vc may get seriously confused. Don't do these things!
;; When using SCCS, RCS, CVS: be careful not to do repo surgery, or
;; operations like registrations and deletions and renames, outside VC
;; while VC is running. The support for these systems was designed
;; when disks were much slower, and the code maintains a lot of
;; internal state in order to reduce expensive operations to a
;; minimum. Thus, if you mess with the repo while VC's back is turned,
;; VC may get seriously confused.
;;
;; When using Subversion or a later system, anything you do outside VC
;; *through the VCS tools* should safely interlock with VC
;; operations. Under these VC does little state caching, because local
;; operations are assumed to be fast. The dividing line is
;;
;; ADDING SUPPORT FOR OTHER BACKENDS
;;
@ -196,7 +203,7 @@
;;
;; Return non-nil if FILE is unchanged from the working revision.
;; This function should do a brief comparison of FILE's contents
;; with those of the repository master of the working revision. If
;; with those of the repository copy of the working revision. If
;; the backend does not have such a brief-comparison feature, the
;; default implementation of this function can be used, which
;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff
@ -784,7 +791,7 @@ is sensitive to blank lines."
(defcustom vc-checkout-carefully (= (user-uid) 0)
"Non-nil means be extra-careful in checkout.
Verify that the file really is not locked
and that its contents match what the master file says."
and that its contents match what the repository version says."
:type 'boolean
:group 'vc)
(make-obsolete-variable 'vc-checkout-carefully
@ -1518,7 +1525,7 @@ returns t if the buffer had changes, nil otherwise."
(not (string= (vc-working-revision file) "0")))
(push file filtered)
;; This file is added but not yet committed;
;; there is no master file to diff against.
;; there is no repository version to diff against.
(if (or rev1 rev2)
(error "No revisions of %s exist" file)
;; We regard this as "changed".
@ -2318,7 +2325,7 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
(if unmodified-file
(copy-file unmodified-file file
'ok-if-already-exists 'keep-date)
(when (y-or-n-p "Get base revision from master? ")
(when (y-or-n-p "Get base revision from repository? ")
(vc-revert-file file))))
(vc-call-backend new-backend 'receive-file file rev))
(when modified-file
@ -2405,7 +2412,7 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
;;;###autoload
(defun vc-rename-file (old new)
"Rename file OLD to NEW, and rename its master file likewise."
"Rename file OLD to NEW in both work area and repository."
(interactive "fVC rename file: \nFRename to: ")
;; in CL I would have said (setq new (merge-pathnames new old))
(let ((old-base (file-name-nondirectory old)))