emacs/lisp/vc/vc-git.el, branch pkg Emacs is the extensible, customizable, self-documenting real-time display editor. * lisp/vc/vc-git.el (vc-git-checkin): Add more checks for vc-git-patch-string 2022-10-02T18:50:08+00:00 Juri Linkov 2022-10-02T18:50:08+00:00 5e37b27ce9785b7b67506f44318fc56d3ce517e5 Check that vc-git-patch-string contains the same changes that already exists in the staged area when files were added/removed by vc commands (bug#52349). 
Check that vc-git-patch-string contains the same changes that already exists
in the staged area when files were added/removed by vc commands (bug#52349).
In vc-git-log-incoming use the repository in the command "fetch" (bug#50340) 2022-10-02T18:34:57+00:00 Juri Linkov 2022-10-02T18:34:57+00:00 c37fda9e3117c8948ee691c79ccf747d45137d97 * lisp/vc/vc-git.el (vc-git-log-incoming): Use repository part from non-nil remote-location in the command "fetch". * lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Mention in docstrings and prompts that REMOTE-LOCATION can be a remote branch name. * doc/emacs/maintaining.texi (VC Change Log): For commands vc-log-incoming and vc-log-outgoing, use the term "remote location" instead of "repository". 
* lisp/vc/vc-git.el (vc-git-log-incoming): Use repository part
from non-nil remote-location in the command "fetch".

* lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Mention in
docstrings and prompts that REMOTE-LOCATION can be a remote branch name.

* doc/emacs/maintaining.texi (VC Change Log): For commands
vc-log-incoming and vc-log-outgoing, use the term "remote location"
instead of "repository".
Make "git pull" output slightly prettier 2022-10-01T14:06:37+00:00 Lars Ingebrigtsen 2022-10-01T14:06:27+00:00 e50a3b57921e8b690d3c3adb993e2441d5970116 * lisp/vc/vc-git.el (vc-git--pushpull): Translate ^M in output (bug#58199). 
* lisp/vc/vc-git.el (vc-git--pushpull): Translate ^M in output
(bug#58199).
Tweak window handling in vc-pull-and-push 2022-09-24T20:43:26+00:00 Lars Ingebrigtsen 2022-09-24T20:43:26+00:00 d98ee767765032acc7f8f14c86dcbbfb67dbcaee * lisp/vc/vc-dispatcher.el (vc--inhibit-async-window): Rename variable. (vc-do-async-command): Allow inhibiting all window changes. * lisp/vc/vc-git.el (vc-git-pull-and-push): Don't pop up the window asynchronously on the "pull" because that gets in the way of doing other things. 
* lisp/vc/vc-dispatcher.el (vc--inhibit-async-window): Rename
variable.
(vc-do-async-command): Allow inhibiting all window changes.

* lisp/vc/vc-git.el (vc-git-pull-and-push): Don't pop up the
window asynchronously on the "pull" because that gets in the way
of doing other things.
; Drop two obsolete defvars 2022-09-24T19:06:47+00:00 Sean Whitton 2022-09-24T19:06:47+00:00 be9e51f61f6c6de17967c139c95d71472bc30137 * lisp/vc/vc-git.el (vc-want-edit-command-p) * lisp/vc/vc.el (vc-want-edit-command-p): Drop obsolete defvar. 
* lisp/vc/vc-git.el (vc-want-edit-command-p)
* lisp/vc/vc.el (vc-want-edit-command-p): Drop obsolete defvar.
Generalize & simplify implementation of user edits to VC commands 2022-09-24T18:00:07+00:00 Sean Whitton 2022-09-24T17:39:52+00:00 9a5176aec018d6cb6c32614b3b1c8b0dd6d9b71a * lisp/vc/vc-dispatcher.el (vc-pre-command-functions) (vc-want-edit-command-p): Delete. (vc-filter-command-function): New variable. (vc-user-edit-command): Factor out of vc-do-command. (vc-do-command, vc-do-async-command) * lisp/vc/vc-git.el (vc-git--pushpull) * lisp/vc/vc.el (vc-print-branch-log): Use vc-filter-command-function in place of vc-pre-command-functions and vc-want-edit-command-p. 
* lisp/vc/vc-dispatcher.el (vc-pre-command-functions)
(vc-want-edit-command-p): Delete.
(vc-filter-command-function): New variable.
(vc-user-edit-command): Factor out of vc-do-command.
(vc-do-command, vc-do-async-command)
* lisp/vc/vc-git.el (vc-git--pushpull)
* lisp/vc/vc.el (vc-print-branch-log): Use vc-filter-command-function
in place of vc-pre-command-functions and vc-want-edit-command-p.
Add a new command vc-pull-and-push 2022-09-24T13:19:03+00:00 Lars Ingebrigtsen 2022-09-24T13:17:23+00:00 8dacd8cd914fdbe0f6f17ca57915611d48e9124d * lisp/vc/vc-svn.el (vc-exec-after): * lisp/vc/vc-hg.el (vc-exec-after): * lisp/vc/vc-git.el (vc-exec-after): * lisp/vc/vc-cvs.el (vc-exec-after): * lisp/vc/vc-bzr.el (vc-exec-after): * lisp/org/org-macro.el (vc-exec-after): * lisp/obsolete/vc-mtn.el (vc-exec-after): * lisp/obsolete/vc-arch.el (vc-exec-after): Update declaration. * lisp/vc/vc-dispatcher.el (vc--process-sentinel): Allow running code only on success. (vc-exec-after): Ditto. (vc--inhibit-change-window-start): New variable. (vc-do-async-command): Use it to allow chaining commands without moving window point. Return the process instead of the buffer, since the process may have exited already, and then we can't get at the process. * lisp/vc/vc-git.el (vc-git--pushpull): Return the process object. (vc-git-pull-and-push): New function. * lisp/vc/vc.el (vc-pull-and-push): New command (bug#51964). 
* lisp/vc/vc-svn.el (vc-exec-after):
* lisp/vc/vc-hg.el (vc-exec-after):
* lisp/vc/vc-git.el (vc-exec-after):
* lisp/vc/vc-cvs.el (vc-exec-after):
* lisp/vc/vc-bzr.el (vc-exec-after):
* lisp/org/org-macro.el (vc-exec-after):
* lisp/obsolete/vc-mtn.el (vc-exec-after):
* lisp/obsolete/vc-arch.el (vc-exec-after): Update declaration.
* lisp/vc/vc-dispatcher.el (vc--process-sentinel): Allow running
code only on success.
(vc-exec-after): Ditto.
(vc--inhibit-change-window-start): New variable.
(vc-do-async-command): Use it to allow chaining commands without
moving window point.  Return the process instead of the buffer,
since the process may have exited already, and then we can't get
at the process.

* lisp/vc/vc-git.el (vc-git--pushpull): Return the process object.
(vc-git-pull-and-push): New function.

* lisp/vc/vc.el (vc-pull-and-push): New command (bug#51964).
vc-git--pushpull: Restore handling of vc-git-program 2022-09-23T21:55:02+00:00 Sean Whitton 2022-09-23T17:43:31+00:00 77fb8a16120a03227a8851ef23bb0293f6a11d2d * lisp/vc/vc-git.el (vc-git--pushpull): Restore handling of vc-git-program before recent change: respect a buffer-local value of vc-git-program, and don't ignore user edits to the git program name when PROMPT. 
* lisp/vc/vc-git.el (vc-git--pushpull): Restore handling of
vc-git-program before recent change: respect a buffer-local value of
vc-git-program, and don't ignore user edits to the git program name
when PROMPT.
Add support for user edits to VC command arguments 2022-09-21T19:31:05+00:00 Sean Whitton 2022-09-18T21:47:23+00:00 101f3cf5b9b5600147d4406c3be8daf174e1a543 * lisp/vc/vc-dispatcher.el (vc-pre-command-functions): New hook. (vc-want-edit-command-p): New variable. (vc-do-command): If vc-want-edit-command-p is non-nil, prompt the user to edit the VC command & arguments before execution. Run the new hook. (vc-do-async-command): Use the new hook to insert into BUFFER the command that's next to be run. * lisp/vc/vc-git.el (vc-git--pushpull): Drop prompting code. Bind vc-want-edit-command-p so that vc-do-command handles the prompting. Use the new hook to update compile-command with the edited command. * lisp/vc/vc.el (vc-print-branch-log): A non-nil prefix argument now means vc-want-edit-command-p is bound to a non-nil value (bug#57807). 
* lisp/vc/vc-dispatcher.el (vc-pre-command-functions): New hook.
(vc-want-edit-command-p): New variable.
(vc-do-command): If vc-want-edit-command-p is non-nil, prompt the user
to edit the VC command & arguments before execution.  Run the new hook.
(vc-do-async-command): Use the new hook to insert into BUFFER the
command that's next to be run.
* lisp/vc/vc-git.el (vc-git--pushpull): Drop prompting code.  Bind
vc-want-edit-command-p so that vc-do-command handles the prompting.
Use the new hook to update compile-command with the edited command.
* lisp/vc/vc.el (vc-print-branch-log): A non-nil prefix argument now
means vc-want-edit-command-p is bound to a non-nil value (bug#57807).
Don't use autoloaded functions for safe-local-variable 2022-09-16T10:36:15+00:00 Lars Ingebrigtsen 2022-09-16T10:36:15+00:00 7be7ad279e96f90cc70e384a350331de8e1607df * doc/lispref/symbols.texi (Standard Properties): Clarify how safe-local-variable should look. * lisp/emacs-lisp/checkdoc.el (checkdoc-ispell-lisp-words) (checkdoc-symbol-words): Use list-of-strings-p. (checkdoc-list-of-strings-p): Obsolete. * lisp/vc/vc-git.el (vc-git-annotate-switches): Remove. (vc-git-annotate-switches): Open-code the check. 
* doc/lispref/symbols.texi (Standard Properties): Clarify how
safe-local-variable should look.

* lisp/emacs-lisp/checkdoc.el (checkdoc-ispell-lisp-words)
(checkdoc-symbol-words): Use list-of-strings-p.
(checkdoc-list-of-strings-p): Obsolete.

* lisp/vc/vc-git.el (vc-git-annotate-switches): Remove.
(vc-git-annotate-switches): Open-code the check.