Commit 9cff91f8 authored by Chong Yidong's avatar Chong Yidong
Browse files

More updates for VC documentation.

* doc/emacs/maintaining.texi (VCS Concepts): Make "revision" terminology
less CVS-specific.
(VC With A Merging VCS, VC With A Locking VCS): Add xref to
Registering node.
(Secondary VC Commands): Deleted.  Promote subnodes.
(Log Buffer): Add command name for C-c C-c.  Fix the name of the
log buffer.  Add index entries.
(VCS Changesets, Types of Log File, VC With A Merging VCS): Use
"commit" terminology.
(Old Revisions): Move it to just before VC Change Log.  "Tag" here
doesn't refer to tags tables.  Note other possible forms of the
revision ID.  C-x v = does not save.
(Registering): Note similarity to C-x v v action.  Fix description
of how backends are chosen.  De-document vc-default-init-revision.
(VC Change Log): Document C-x v l in VC-Dir buffer.  Document RET
in root log buffers.

* lisp/vc/vc.el (vc-deduce-fileset): Minor doc fix.
parent 301b181a
2011-12-17 Chong Yidong <cyd@gnu.org>
* maintaining.texi (VCS Concepts): Make "revision" terminology
less CVS-specific.
(VC With A Merging VCS, VC With A Locking VCS): Add xref to
Registering node.
(Secondary VC Commands): Deleted. Promote subnodes.
(Log Buffer): Add command name for C-c C-c. Fix the name of the
log buffer. Add index entries.
(VCS Changesets, Types of Log File, VC With A Merging VCS): Use
"commit" terminology.
(Old Revisions): Move it to just before VC Change Log. "Tag" here
doesn't refer to tags tables. Note other possible forms of the
revision ID. C-x v = does not save.
(Registering): Note similarity to C-x v v action. Fix description
of how backends are chosen. De-document vc-default-init-revision.
(VC Change Log): Document C-x v l in VC-Dir buffer. Document RET
in root log buffers.
2011-12-16 Chong Yidong <cyd@gnu.org> 2011-12-16 Chong Yidong <cyd@gnu.org>
* maintaining.texi (Version Control Systems): Drop Meta-CVS. * maintaining.texi (Version Control Systems): Drop Meta-CVS.
......
...@@ -741,15 +741,17 @@ Version Control ...@@ -741,15 +741,17 @@ Version Control
* VC Mode Line:: How the mode line shows version control status. * VC Mode Line:: How the mode line shows version control status.
* Basic VC Editing:: How to edit a file under version control. * Basic VC Editing:: How to edit a file under version control.
* Log Buffer:: Features available in log entry buffers. * Log Buffer:: Features available in log entry buffers.
* Registering:: Putting a file under version control.
* Old Revisions:: Examining and comparing old versions. * Old Revisions:: Examining and comparing old versions.
* Secondary VC Commands:: The commands used a little less frequently. * VC Change Log:: Viewing the VC Change Log.
* VC Undo:: Canceling changes before or after committing.
* VC Directory Mode:: Listing files managed by version control. * VC Directory Mode:: Listing files managed by version control.
* Branches:: Multiple lines of development. * Branches:: Multiple lines of development.
* Remote Repositories:: Efficient access to remote CVS servers. * Remote Repositories:: Efficient access to remote CVS servers.
* Revision Tags:: Symbolic names for revisions. * Revision Tags:: Symbolic names for revisions.
* Miscellaneous VC:: Various other commands and features of VC. * Miscellaneous VC:: Various other commands and features of VC.
* Customizing VC:: Variables that change VC's behavior. * Customizing VC:: Variables that change VC's behavior.
Introduction to Version Control Introduction to Version Control
* Why Version Control?:: Understanding the problems it addresses. * Why Version Control?:: Understanding the problems it addresses.
...@@ -766,12 +768,6 @@ Basic Editing under Version Control ...@@ -766,12 +768,6 @@ Basic Editing under Version Control
* VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS. * VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS.
* Advanced C-x v v:: Advanced features available with a prefix argument. * Advanced C-x v v:: Advanced features available with a prefix argument.
The Secondary Commands of VC
* Registering:: Putting a file under version control.
* VC Change Log:: Viewing the VC Change Log.
* VC Undo:: Canceling changes before or after check-in.
VC Directory Mode VC Directory Mode
* VC Directory Buffer:: What the buffer looks like and means. * VC Directory Buffer:: What the buffer looks like and means.
......
This diff is collapsed.
...@@ -852,6 +852,7 @@ the user for specifics, e.g. a merge source. ...@@ -852,6 +852,7 @@ the user for specifics, e.g. a merge source.
*** New option `vc-revert-show-diff' controls whether `vc-revert' *** New option `vc-revert-show-diff' controls whether `vc-revert'
shows a diff while querying the user. It defaults to t. shows a diff while querying the user. It defaults to t.
+++
*** Log entries in some Log View buffers can be toggled to display a *** Log entries in some Log View buffers can be toggled to display a
longer description by typing RET (log-view-toggle-entry-display). longer description by typing RET (log-view-toggle-entry-display).
In the Log View buffers made by `C-x v L' (vc-print-root-log), you can In the Log View buffers made by `C-x v L' (vc-print-root-log), you can
...@@ -862,6 +863,7 @@ use this to display the full log entry for the revision at point. ...@@ -862,6 +863,7 @@ use this to display the full log entry for the revision at point.
**** Packages using Log View mode can enable this functionality by **** Packages using Log View mode can enable this functionality by
binding `log-view-expanded-log-entry-function' to a suitable function. binding `log-view-expanded-log-entry-function' to a suitable function.
+++
*** New command `vc-ediff' allows visual comparison of two revisions *** New command `vc-ediff' allows visual comparison of two revisions
of a file similar to `vc-diff', but using ediff backend. of a file similar to `vc-diff', but using ediff backend.
......
2011-12-16 Chong Yidong <cyd@gnu.org> 2011-12-17 Chong Yidong <cyd@gnu.org>
* vc/vc.el (vc-next-action): Doc fix; remove CVS-isms. * vc/vc.el (vc-next-action): Doc fix; remove CVS-isms.
(vc-deduce-fileset): Doc fix.
2011-12-16 Andreas Schwab <schwab@linux-m68k.org> 2011-12-16 Andreas Schwab <schwab@linux-m68k.org>
......
...@@ -951,13 +951,13 @@ Within directories, only files already under version control are noticed." ...@@ -951,13 +951,13 @@ Within directories, only files already under version control are noticed."
(defun vc-deduce-fileset (&optional observer allow-unregistered (defun vc-deduce-fileset (&optional observer allow-unregistered
state-model-only-files) state-model-only-files)
"Deduce a set of files and a backend to which to apply an operation. "Deduce a set of files and a backend to which to apply an operation.
Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL). Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL).
If we're in VC-dir mode, the fileset is the list of marked files.
Otherwise, if we're looking at a buffer visiting a version-controlled file, If we're in VC-dir mode, FILESET is the list of marked files.
the fileset is a singleton containing this file. Otherwise, if in a buffer visiting a version-controlled file,
If none of these conditions is met, but ALLOW_UNREGISTERED is on and the FILESET is a single-file fileset containing that file.
visited file is not registered, return a singleton fileset containing it. Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file
is unregistered, FILESET is a single-file fileset containing it.
Otherwise, throw an error. Otherwise, throw an error.
STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment