From ef7b27ef14161df98ee199ace01258fc54aea013 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 25 Mar 2010 20:04:48 -0400 Subject: [PATCH] * maintaining.texi (Old Revisions): Document vc-root-diff. --- doc/emacs/ChangeLog | 2 +- doc/emacs/maintaining.texi | 31 ++++++++++++++++++++----------- etc/NEWS | 8 +++++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index dbed31f865c..ca70c699b72 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -4,7 +4,7 @@ repository if there is none. (VC Change Log): Rename from VC Status. Document vc-log-show-limit and vc-print-root-log. - (Old Revisions): Copyedits. + (Old Revisions): Copyedits. Document vc-root-diff. * programs.texi (Program Modes): Mention Javascript mode. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 87292968e14..8cc5b97d919 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -647,14 +647,18 @@ to examine any revision of a file, or compare two revisions. @table @kbd @item C-x v ~ -Prompt for a revision of the visited file, and visit it in a buffer of +Prompt for a revision of the current file, and visit it in a buffer of its own (@code{vc-revision-other-window}). @item C-x v = -Compare the buffer associated with the current fileset with the -working revision(s) from which you started editing (@code{vc-diff}). -With a prefix argument, prompt for two revisions of the current -fileset and compare them. +Compare the files in the current fileset with the working revision(s) +you started from (@code{vc-diff}). With a prefix argument, prompt for +two revisions of the current fileset and compare them. + +@item C-x v D +Compare the entire tree corresponding to the current fileset with the +tree you started from (@code{vc-root-diff}). With a prefix argument, +prompt for two revisions and compare their trees. @item C-x v g Display an annotated version of the file: for each line, show the @@ -679,12 +683,11 @@ buffer in a separate window. @findex vc-diff @kindex C-x v = - @kbd{C-x v =} (@code{vc-diff}) compares the current buffer contents -of each file in the current VC fileset (saving them if necessary) with -the repository revision from which you started editing. Note that the -latter may or may not be the latest revision of the file(s). The diff -is displayed in a special buffer in another window. @xref{Comparing -Files}. + @kbd{C-x v =} (@code{vc-diff}) compares each file in the current VC +fileset (saving them if necessary) with the repository revision(s) +from which you started editing. Note that the latter may or may not +be the latest revision of the file(s). The diff is displayed in a +special buffer in another window. @xref{Comparing Files}. @findex vc-diff @kindex C-u C-x v = @@ -706,6 +709,12 @@ revision ID for a multi-file fileset (as opposed to a symbolic tag name) is unlikely to return diffs that are connected in any meaningful way. + The command @kbd{C-x v D} (@code{vc-root-diff}) is similar to +@kbd{C-x v =}, but it compares the entire tree associated with the +current VC fileset with the tree you started with. This means all the +files controlled by the current version control repository, even those +that are not part of the current VC fileset. + If you invoke @kbd{C-x v =} or @kbd{C-u C-x v =} from a buffer that is neither visiting a version-controlled file nor a VC directory buffer, these commands generate a diff of all registered files in the diff --git a/etc/NEWS b/etc/NEWS index 7d7e4085f9b..0ab134b2e7c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -301,8 +301,10 @@ file. *** New command `vc-root-print-log', bound to `C-x v L'. This displays a `*vc-change-log*' buffer showing the history of the version-controlled directory tree as a whole. - -*** FIXME: vc-root-diff. ++++ +*** New command `vc-root-diff', bound to `C-x v D'. +This is similar to `vc-diff', but compares the entire directory tree +of the current VC directory with its working revision. +++ *** `C-x v l' and `C-x v L' do not show the full log by default. The number of entries shown can be chosen interactively with a prefix @@ -310,7 +312,7 @@ argument, or by customizing vc-log-show-limit. The `*vc-change-log*' buffer now contains buttons at the end of the buffer, which can be used to increase the number of entries shown. RCS, SCCS, and CVS do not support this feature. - +--- *** vc-annotate supports annotations through file copies and renames, it displays the old names for the files and it can show logs/diffs for the corresponding lines. Currently only Git and Mercurial take -- 2.11.4.GIT