procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc.el (vc-next-action): Doc fix; remove CVS-isms.

Browse source
This commit is contained in:
Chong Yidong 2011-12-16 23:55:00 +08:00
parent f16c898aa3
commit 99a289d98d
2 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2011-12-16 Chong Yidong <cyd@gnu.org>
* vc/vc.el (vc-next-action): Doc fix; remove CVS-isms.
2011-12-16 Andreas Schwab <schwab@linux-m68k.org>
* calc/calc-misc.el (calc-help): Avoid wrapping help message.

45
lisp/vc/vc.el
View file

@ -1048,34 +1048,27 @@ current buffer."
;;;###autoload
(defun vc-next-action (verbose)
"Do the next logical version control operation on the current fileset.
This requires that all files in the fileset be in the same state.
This requires that all files in the current VC fileset be in the
same state. If not, signal an error.
For locking systems:
If every file is not already registered, this registers each for version
control.
If every file is registered and not locked by anyone, this checks out
a writable and locked file of each ready for editing.
If every file is checked out and locked by the calling user, this
first checks to see if each file has changed since checkout. If not,
it performs a revert on that file.
If every file has been changed, this pops up a buffer for entry
of a log message; when the message has been entered, it checks in the
resulting changes along with the log message as change commentary. If
the variable `vc-keep-workfiles' is non-nil (which is its default), a
read-only copy of each changed file is left in place afterwards.
If the affected file is registered and locked by someone else, you are
given the option to steal the lock(s).
For merging-based version control systems:
If every file in the VC fileset is not registered for version
control, register the fileset (but don't commit).
If every work file in the VC fileset is added or changed, pop
up a *vc-log* buffer to commit the fileset.
For a centralized version control system, if any work file in
the VC fileset is out of date, offer to update the fileset.
For merging systems:
If every file is not already registered, this registers each one for version
control. This does an add, but not a commit.
If every file is added but not committed, each one is committed.
If every working file is changed, but the corresponding repository file is
unchanged, this pops up a buffer for entry of a log message; when the
message has been entered, it checks in the resulting changes along
with the logmessage as change commentary. A writable file is retained.
If the repository file is changed, you are asked if you want to
merge in the changes into your working copy."
For old-style locking-based version control systems, like RCS:
If every file is not registered, register the file(s).
If every file is registered and unlocked, check out (lock)
the file(s) for editing.
If every file is locked by you and has changes, pop up a
*vc-log* buffer to check in the changes. If the variable
`vc-keep-workfiles' is non-nil (the default), leave a
read-only copy of each changed file after checking in.
If every file is locked by you and unchanged, unlock them.
If every file is locked by someone else, offer to steal the lock."
(interactive "P")
(let* ((vc-fileset (vc-deduce-fileset nil t 'state-model-only-files))
(backend (car vc-fileset))