VC: New commands for incoming and outgoing fileset diffs

* lisp/vc/vc.el (vc-fileset-diff-incoming)
(vc-fileset-diff-outgoing): New commands.
(vc-root-diff-incoming): Refactor to call
vc-fileset-diff-incoming.
(vc-root-diff-outgoing): Refactor to call
vc-fileset-diff-outgoing.
* lisp/vc/vc-hooks.el (vc-incoming-prefix-map)
(vc-outgoing-prefix-map): Bind the new commands.
* doc/emacs/maintaining.texi (VC Change Log):
* etc/NEWS: Document the new commands.

1 files changed, 27 insertions, 4 deletions

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index ffa3b7f2a58..4e531805f26 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1070,11 +1070,18 @@ non-@code{nil}, @kbd{C-x v I} becomes a prefix key, and
 @code{vc-log-incoming} becomes bound to @kbd{C-x v I L}.
 
 @item M-x vc-root-diff-incoming
-Display a diff of the changes that a pull operation will retrieve.
+Display a diff of all changes that a pull operation will retrieve.
 
 If you customize @code{vc-use-incoming-outgoing-prefixes} to
 non-@code{nil}, this command becomes available on @kbd{C-x v I D}.
 
+@item M-x vc-fileset-diff-incoming
+Display a diff of changes that a pull operation will retrieve, but
+limited to the current fileset.
+
+If you customize @code{vc-use-incoming-outgoing-prefixes} to
+non-@code{nil}, this command becomes available on @kbd{C-x v I =}.
+
 @item C-x v O
 Display log entries for the changes that will be sent by the next
 ``push'' operation (@code{vc-log-outgoing}).
@@ -1084,12 +1091,19 @@ non-@code{nil}, @kbd{C-x v O} becomes a prefix key, and
 @code{vc-log-outgoing} becomes bound to @kbd{C-x v O L}.
 
 @item M-x vc-root-diff-outgoing
-Display a diff of the changes that will be sent by the next push
+Display a diff of all changes that will be sent by the next push
 operation.
 
 If you customize @code{vc-use-incoming-outgoing-prefixes} to
 non-@code{nil}, this command is bound to @kbd{C-x v O D}.
 
+@item M-x vc-fileset-diff-outgoing
+Display a diff of changes that will be sent by the next push operation,
+but limited to the current fileset.
+
+If you customize @code{vc-use-incoming-outgoing-prefixes} to
+non-@code{nil}, this command becomes available on @kbd{C-x v O =}.
+
 @item C-x v h
 Display the history of changes made in the region of file visited by
 the current buffer (@code{vc-region-history}).
@@ -1176,13 +1190,22 @@ version control system can be a branch name.
 @findex vc-root-diff-outgoing
   The closely related commands @code{vc-root-diff-incoming} and
 @code{vc-root-diff-outgoing} are the diff analogues of
-@code{vc-log-incoming} and @code{vc-log-outgoing}.  These display a diff
-buffer reporting the changes that would be pulled or pushed.  You can
+@code{vc-log-incoming} and @code{vc-log-outgoing}.  These display diff
+buffers reporting the changes that would be pulled or pushed.  You can
 use a prefix argument here too to specify a particular remote location.
 @code{vc-root-diff-outgoing} is useful as a way to preview your push and
 quickly check that all and only the changes you intended to include were
 committed and will be pushed.
 
+@findex vc-fileset-diff-incoming
+@findex vc-fileset-diff-outgoing
+  The commands @code{vc-fileset-diff-incoming} and
+@code{vc-fileset-diff-outgoing} are very similar.  They also display
+changes that would be pulled or pushed.  The difference is that the
+diffs reported are limited to the current fileset.  Don't forget that
+actual pull and push operations always affect the whole working tree,
+not just the current fileset.
+
 @cindex VC log buffer, commands in
 @cindex vc-log buffer
   In the @file{*vc-change-log*} buffer, you can use the following keys