aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSean Whitton2025-08-17 11:36:13 +0100
committerSean Whitton2025-08-17 11:36:30 +0100
commitda3973b657db46501e650fb4af4a4f3bb07c77fd (patch)
tree4266aef001ec7211db151a2916cfe7d6334d1166 /etc
parent70b5ad0192b2dd6232c1961b49e94a6620d02152 (diff)
downloademacs-da3973b657db46501e650fb4af4a4f3bb07c77fd.tar.gz
emacs-da3973b657db46501e650fb4af4a4f3bb07c77fd.zip
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.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS12
1 files changed, 8 insertions, 4 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 4a193484591..ebf03b53e12 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2131,15 +2131,19 @@ relevant buffers before generating the contents of a VC Directory buffer
2131(like the third-party package Magit does with its status buffer). 2131(like the third-party package Magit does with its status buffer).
2132 2132
2133+++ 2133+++
2134*** New commands 'vc-root-diff-incoming' and 'vc-root-diff-outgoing'. 2134*** New commands to report incoming and outgoing diffs.
2135These commands report diffs of all the changes that would be pulled and 2135'vc-root-diff-incoming' and 'vc-root-diff-outgoing' report diffs of all
2136would be pushed, respectively. They are the diff analogues of the 2136the changes that would be pulled and would be pushed, respectively.
2137existing commands 'vc-log-incoming' and 'vc-log-outgoing'. 2137They are the diff analogues of the existing commands 'vc-log-incoming'
2138and 'vc-log-outgoing'.
2138 2139
2139In particular, 'vc-root-diff-outgoing' is useful as a way to preview 2140In particular, 'vc-root-diff-outgoing' is useful as a way to preview
2140your push and ensure that all and only the changes you intended to 2141your push and ensure that all and only the changes you intended to
2141include were committed and will be pushed. 2142include were committed and will be pushed.
2142 2143
2144'vc-fileset-diff-incoming' and 'vc-fileset-diff-outgoing' are similar
2145but limited to the current VC fileset.
2146
2143+++ 2147+++
2144*** New user option 'vc-use-incoming-outgoing-prefixes'. 2148*** New user option 'vc-use-incoming-outgoing-prefixes'.
2145If this is customized to non-nil, 'C-x v I' and 'C-x v O' become prefix 2149If this is customized to non-nil, 'C-x v I' and 'C-x v O' become prefix