emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use -outstanding not -outgoing-base in VC command names

Browse source 
* lisp/vc/vc.el (vc-root-diff-outgoing-base)
(vc-diff-outgoing-base, vc-log-outgoing-base)
(vc-root-log-outgoing-base): Rename from these ...
(vc-root-diff-outstanding, vc-diff-outstanding)
(vc-log-outstanding, vc-root-log-outstanding): ... to these.
All uses changed.
This commit is contained in:
Sean Whitton 2026-02-17 15:26:20 +00:00
parent 09f2e436ba
commit 39a2a2e3b5
6 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/emacs/vc1-xtra.texi
View file

@ -300,20 +300,20 @@ yet merged into the target branch.
@table @kbd
@item C-x v T =
Display diffs of changes to the VC fileset since the merge base of this
branch and its upstream counterpart (@code{vc-diff-outgoing-base}).
branch and its upstream counterpart (@code{vc-diff-outstanding}).
@item C-x v T D
Display a diff of all changes since the merge base of this branch and
its upstream counterpart (@code{vc-root-diff-outgoing-base}).
its upstream counterpart (@code{vc-root-diff-outstanding}).
@item C-x v T l
Display log messages for changes to the VC fileset since the merge base
of this branch and its upstream counterpart
(@code{vc-log-outgoing-base}).
(@code{vc-log-outstanding}).
@item C-x v T L
Display log messages for all changes since the merge base of this branch
and its upstream counterpart (@code{vc-root-log-outgoing-base}).
and its upstream counterpart (@code{vc-root-log-outstanding}).
@end table
For decentralized version control systems (@pxref{VCS Repositories}),
@ -331,14 +331,14 @@ cases the reason these changes are not pushed yet is that they are not
finished: the changes committed so far don't make sense in isolation.
@kindex C-x v T =
@findex vc-diff-outgoing-base
@findex vc-diff-outstanding
@kindex C-x v T D
@findex vc-root-diff-outgoing-base
Type @kbd{C-x v T D} (@code{vc-root-diff-outgoing-base}) to display a
@findex vc-root-diff-outstanding
Type @kbd{C-x v T D} (@code{vc-root-diff-outstanding}) to display a
summary of all these changes, committed and uncommitted. This summary
is in the form of a diff of what committing and pushing (@pxref{Pulling
/ Pushing}) all these changes would do to the upstream repository. You
can use @kbd{C-x v T =} (@code{vc-diff-outgoing-base}) instead to limit
can use @kbd{C-x v T =} (@code{vc-diff-outstanding}) instead to limit
the display of changes to the current VC fileset. (The difference
between @w{@kbd{C-x v T D}} and @w{@kbd{C-x v T =}} is like the
difference between @kbd{C-x v D} and @kbd{C-x v =} (@pxref{Old
@ -350,13 +350,13 @@ commands, you can use a prefix argument to specify a particular upstream
location.}
@kindex C-x v T l
@findex vc-log-outgoing-base
@findex vc-log-outstanding
@kindex C-x v T L
@findex vc-root-log-outgoing-base
Type @kbd{C-x v T L} (@code{vc-root-log-outgoing-base}) to display a
@findex vc-root-log-outstanding
Type @kbd{C-x v T L} (@code{vc-root-log-outstanding}) to display a
summary of the same changes in the form of a revision log; this does not
include uncommitted changes. You can use @kbd{C-x v T l}
(@code{vc-log-outgoing-base}) instead to limit the display of changes to
(@code{vc-log-outstanding}) instead to limit the display of changes to
the current VC fileset.
Second, consider developing a feature on a separate branch. Call this

8
etc/NEWS
View file

@ -2815,11 +2815,11 @@ current VC fileset.
+++
*** New commands to report information about outstanding changes.
'C-x v T =' ('vc-diff-outgoing-base') and 'C-x v T D'
('vc-root-diff-outgoing-base') report diffs of changes since the merge
'C-x v T =' ('vc-diff-outstanding') and 'C-x v T D'
('vc-root-diff-outstanding') report diffs of changes since the merge
base with the remote branch, including uncommitted changes.
'C-x v T l' ('vc-log-outgoing-base') and 'C-x v T L'
('vc-root-log-outgoing-base') show the corresponding revision logs.
'C-x v T l' ('vc-log-outstanding') and 'C-x v T L'
('vc-root-log-outstanding') show the corresponding revision logs.
These are useful to view all outstanding (unmerged, unpushed) changes on
the current branch. They are also available as 'T =', 'T D', 'T l' and
'T L' in VC Directory buffers.

12
lisp/ldefs-boot.el
View file

@ -36836,7 +36836,7 @@ to. When called interactively with a prefix argument, prompt for
UPSTREAM-LOCATION. In some version control systems UPSTREAM-LOCATION
can be a remote branch name.
This command is like `vc-root-diff-outgoing-base' except that it does
This command is like `vc-root-diff-outstanding' except that it does
not include uncommitted changes.
See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@ -36852,7 +36852,7 @@ can be a remote branch name.
When called from Lisp optional argument FILESET overrides the VC
fileset.
This command is like `vc-diff-outgoing-base' except that it does not
This command is like `vc-diff-outstanding' except that it does not
include uncommitted changes.
See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@ -36863,7 +36863,7 @@ global binding.
#'vc--safe-branch-regexps-p)
(put 'vc-topic-branch-regexps 'safe-local-variable
#'vc--safe-branch-regexps-p)
(autoload 'vc-root-diff-outgoing-base "vc"
(autoload 'vc-root-diff-outstanding "vc"
"Report diff of all changes since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.
@ -36888,7 +36888,7 @@ topic branch. (With a double prefix argument, this command is like
`vc-diff-outgoing' except that it includes uncommitted changes.)
(fn &optional UPSTREAM-LOCATION)" t)
(autoload 'vc-diff-outgoing-base "vc"
(autoload 'vc-diff-outstanding "vc"
"Report changes to VC fileset since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
@ -36916,7 +36916,7 @@ topic branch. (With a double prefix argument, this command is like
When called from Lisp, optional argument FILESET overrides the fileset.
(fn &optional UPSTREAM-LOCATION FILESET)" t)
(autoload 'vc-log-outgoing-base "vc"
(autoload 'vc-log-outstanding "vc"
"Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.
@ -36941,7 +36941,7 @@ topic branch.
When called from Lisp, optional argument FILESET overrides the fileset.
(fn &optional UPSTREAM-LOCATION FILESET)" t)
(autoload 'vc-root-log-outgoing-base "vc"
(autoload 'vc-root-log-outstanding "vc"
"Show log of revisions since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.

8
lisp/vc/vc-dir.el
View file

@ -397,10 +397,10 @@ That is, refreshing the VC-Dir buffer also hides `up-to-date' and
(define-key map (kbd "M-s a M-C-s") #'vc-dir-isearch-regexp)
(define-key map "G" #'vc-dir-ignore)
(define-key map "@" #'vc-revert)
(define-key map "Tl" #'vc-log-outgoing-base)
(define-key map "TL" #'vc-root-log-outgoing-base)
(define-key map "T=" #'vc-diff-outgoing-base)
(define-key map "TD" #'vc-root-diff-outgoing-base)
(define-key map "Tl" #'vc-log-outstanding)
(define-key map "TL" #'vc-root-log-outstanding)
(define-key map "T=" #'vc-diff-outstanding)
(define-key map "TD" #'vc-root-diff-outstanding)
(let ((branch-map (make-sparse-keymap)))
(define-key map "b" branch-map)

8
lisp/vc/vc-hooks.el
View file

@ -1020,10 +1020,10 @@ In the latter case, VC mode is deactivated for this buffer."
"O" #'vc-root-log-outgoing
"M L" #'vc-log-mergebase
"M D" #'vc-diff-mergebase
"T l" #'vc-log-outgoing-base
"T L" #'vc-root-log-outgoing-base
"T =" #'vc-diff-outgoing-base
"T D" #'vc-root-diff-outgoing-base
"T l" #'vc-log-outstanding
"T L" #'vc-root-log-outstanding
"T =" #'vc-diff-outstanding
"T D" #'vc-root-diff-outstanding
"m" #'vc-merge
"r" #'vc-retrieve-tag
"s" #'vc-create-tag

16
lisp/vc/vc.el
View file

@ -3096,7 +3096,7 @@ to. When called interactively with a prefix argument, prompt for
UPSTREAM-LOCATION. In some version control systems UPSTREAM-LOCATION
can be a remote branch name.
This command is like `vc-root-diff-outgoing-base' except that it does
This command is like `vc-root-diff-outstanding' except that it does
not include uncommitted changes.
See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@ -3115,7 +3115,7 @@ can be a remote branch name.
When called from Lisp optional argument FILESET overrides the VC
fileset.
This command is like `vc-diff-outgoing-base' except that it does not
This command is like `vc-diff-outstanding' except that it does not
include uncommitted changes.
See `vc-use-incoming-outgoing-prefixes' regarding giving this command a
@ -3353,7 +3353,7 @@ REFRESH is passed on to `vc--incoming-revision'."
refresh)))
;;;###autoload
(defun vc-root-diff-outgoing-base (&optional upstream-location)
(defun vc-root-diff-outstanding (&optional upstream-location)
"Report diff of all changes since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.
@ -3379,10 +3379,10 @@ topic branch. (With a double prefix argument, this command is like
`vc-diff-outgoing' except that it includes uncommitted changes.)"
(interactive (list (vc--maybe-read-outgoing-base)))
(vc--with-backend-in-rootdir "VC root-diff"
(vc-diff-outgoing-base upstream-location `(,backend (,rootdir)))))
(vc-diff-outstanding upstream-location `(,backend (,rootdir)))))
;;;###autoload
(defun vc-diff-outgoing-base (&optional upstream-location fileset)
(defun vc-diff-outstanding (&optional upstream-location fileset)
"Report changes to VC fileset since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
@ -3420,7 +3420,7 @@ When called from Lisp, optional argument FILESET overrides the fileset."
(called-interactively-p 'interactive))))
;;;###autoload
(defun vc-log-outgoing-base (&optional upstream-location fileset)
(defun vc-log-outstanding (&optional upstream-location fileset)
"Show log for the VC fileset since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.
@ -3454,7 +3454,7 @@ When called from Lisp, optional argument FILESET overrides the fileset."
upstream-location))))
;;;###autoload
(defun vc-root-log-outgoing-base (&optional upstream-location)
(defun vc-root-log-outstanding (&optional upstream-location)
"Show log of revisions since the merge base with UPSTREAM-LOCATION.
The merge base with UPSTREAM-LOCATION means the common ancestor of the
working revision and UPSTREAM-LOCATION.
@ -3478,7 +3478,7 @@ i.e., treat this branch as a trunk branch even if Emacs thinks it is a
topic branch."
(interactive (list (vc--maybe-read-outgoing-base)))
(vc--with-backend-in-rootdir "VC revision log"
(vc-log-outgoing-base upstream-location `(,backend (,rootdir)))))
(vc-log-outstanding upstream-location `(,backend (,rootdir)))))
(declare-function ediff-load-version-control "ediff" (&optional silent))
(declare-function ediff-vc-internal "ediff-vers"