diff options
| author | Eli Zaretskii | 2019-11-29 11:03:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-11-29 11:03:55 +0200 |
| commit | 6e41b08ea877af91908abaf164a9a00cb82cafa9 (patch) | |
| tree | 7f82392113ee37fa55b972880705218ae84433c6 | |
| parent | b2790db049da98b541d07bac21ca7d7c220d3be0 (diff) | |
| download | emacs-6e41b08ea877af91908abaf164a9a00cb82cafa9.tar.gz emacs-6e41b08ea877af91908abaf164a9a00cb82cafa9.zip | |
Improve documentation and UI of 'C-x v L'
* lisp/vc/vc.el (vc-print-root-log): Improve the wording of
the doc string and of the prompt for the root directory.
* etc/NEWS: Improve and expand the wording of the changes in
'C-x v L'.
* doc/emacs/maintaining.texi (VC Change Log): Improve and
clarify wording of the 'C-x v L' description.
| -rw-r--r-- | doc/emacs/maintaining.texi | 10 | ||||
| -rw-r--r-- | etc/NEWS | 7 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 9 |
3 files changed, 19 insertions, 7 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index c1f7aed114f..66fa54113f9 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -993,8 +993,14 @@ version-controlled directory tree (RCS, SCCS, CVS, and SRC do not | |||
| 993 | support this feature). With a prefix argument, the command prompts | 993 | support this feature). With a prefix argument, the command prompts |
| 994 | for the maximum number of revisions to display. A numeric prefix | 994 | for the maximum number of revisions to display. A numeric prefix |
| 995 | argument specifies the maximum number of revisions without prompting. | 995 | argument specifies the maximum number of revisions without prompting. |
| 996 | When the numeric prefix argument is @kbd{M-1}, the command prompts | 996 | When the numeric prefix argument is 1, as in @w{@kbd{C-1 C-x v L}} or |
| 997 | for the revision ID, and displays its log entry with a diff of changes. | 997 | @w{@kbd{C-u 1 C-x v L}}, the command prompts for the revision ID, and |
| 998 | displays the log entry of that revision together with the changes | ||
| 999 | (diffs) it introduced. (Some less capable version control systems, | ||
| 1000 | such as RCS and CVS, don't have commands to show a revision log with | ||
| 1001 | its diffs; for them the command displays only the log entry, and you | ||
| 1002 | can request to show the diffs by typing @kbd{d} or @kbd{D}, see | ||
| 1003 | below.) | ||
| 998 | 1004 | ||
| 999 | The @kbd{C-x v L} history is shown in a compact form, usually | 1005 | The @kbd{C-x v L} history is shown in a compact form, usually |
| 1000 | showing only the first line of each log entry. However, you can type | 1006 | showing only the first line of each log entry. However, you can type |
| @@ -998,7 +998,12 @@ With a prefix argument asks for a command, so for example, | |||
| 998 | just one log entry found by its revision number. | 998 | just one log entry found by its revision number. |
| 999 | 999 | ||
| 1000 | +++ | 1000 | +++ |
| 1001 | *** 'C-1 C-x v L' asks for a revision and shows its log entry with diff. | 1001 | *** It is now possible to display a specific revision given by its ID. |
| 1002 | If you invoke 'C-x v L' ('vc-print-root-log') with a numeric argument | ||
| 1003 | of 1, as in 'C-1 C-x v L' or 'C-u 1 C-x v L', it asks for a revision | ||
| 1004 | ID, and shows its log entry together with the diffs introduced by the | ||
| 1005 | revision's commit. (For some less capable VCSes, only the log entry | ||
| 1006 | is shown.) | ||
| 1002 | 1007 | ||
| 1003 | *** 'C-x v =' can now mimic Magit's diff format. | 1008 | *** 'C-x v =' can now mimic Magit's diff format. |
| 1004 | Set the new user option 'diff-font-lock-prettify' to t for that, see | 1009 | Set the new user option 'diff-font-lock-prettify' to t for that, see |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index d0d2c39ac3d..5ac07e78891 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2481,13 +2481,14 @@ WORKING-REVISION and LIMIT." | |||
| 2481 | 2481 | ||
| 2482 | ;;;###autoload | 2482 | ;;;###autoload |
| 2483 | (defun vc-print-root-log (&optional limit revision) | 2483 | (defun vc-print-root-log (&optional limit revision) |
| 2484 | "List the change log for the current VC controlled tree in a window. | 2484 | "List the revision history for the current VC controlled tree in a window. |
| 2485 | If LIMIT is non-nil, it should be a number specifying the maximum | 2485 | If LIMIT is non-nil, it should be a number specifying the maximum |
| 2486 | number of revisions to show; the default is `vc-log-show-limit'. | 2486 | number of revisions to show; the default is `vc-log-show-limit'. |
| 2487 | When called interactively with a prefix argument, prompt for LIMIT. | 2487 | When called interactively with a prefix argument, prompt for LIMIT. |
| 2488 | When the prefix argument is a number, use it as LIMIT. | 2488 | When the prefix argument is a number, use it as LIMIT. |
| 2489 | A special case is when the prefix argument is 1, in this case | 2489 | A special case is when the prefix argument is 1: in this case |
| 2490 | it asks for the revision and shows it with its diff." | 2490 | the command asks for the ID of a revision, and shows that revision |
| 2491 | with its diffs (if the underlying VCS supports that)." | ||
| 2491 | (interactive | 2492 | (interactive |
| 2492 | (cond | 2493 | (cond |
| 2493 | ((eq current-prefix-arg 1) | 2494 | ((eq current-prefix-arg 1) |
| @@ -2517,7 +2518,7 @@ it asks for the revision and shows it with its diff." | |||
| 2517 | rootdir) | 2518 | rootdir) |
| 2518 | (if backend | 2519 | (if backend |
| 2519 | (setq rootdir (vc-call-backend backend 'root default-directory)) | 2520 | (setq rootdir (vc-call-backend backend 'root default-directory)) |
| 2520 | (setq rootdir (read-directory-name "Directory for VC root-log: ")) | 2521 | (setq rootdir (read-directory-name "Directory for VC revision log: ")) |
| 2521 | (setq backend (vc-responsible-backend rootdir)) | 2522 | (setq backend (vc-responsible-backend rootdir)) |
| 2522 | (unless backend | 2523 | (unless backend |
| 2523 | (error "Directory is not version controlled"))) | 2524 | (error "Directory is not version controlled"))) |