summaryrefslogtreecommitdiff
path: root/lisp/vc/vc.el
Commit message (Collapse)AuthorAgeFilesLines
* ; * lisp/vc/vc.el (vc-clone): Fix wording of doc string.Eli Zaretskii2024-02-271-5/+10
|
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
|
* ; Fix typosStefan Kangas2023-12-031-1/+1
|
* ; Improve documentation of VC commandsEli Zaretskii2023-10-081-10/+22
| | | | | | | | | * doc/emacs/maintaining.texi (Basic VC Editing) (VC With A Merging VCS, VC With A Locking VCS, Advanced C-x v v) (Registering, Pulling / Pushing, Merging): Improve wording, accuracy, and indexing. * lisp/vc/vc.el (vc-next-action): Doc fix.
* ; * lisp/vc/vc.el (vc-next-action): Improve commentary.Eli Zaretskii2023-09-291-0/+2
|
* Fix applying patches with Git on MS-WindowsEli Zaretskii2023-08-271-4/+17
| | | | | | | * lisp/vc/vc.el (vc-diff-internal): For Git, always suppress EOL conversion when reading the diffs into a buffer. Doc fix. * lisp/vc/vc-git.el (vc-git-checkin): Make sure to suppress EOL conversion when the patch file is written. (Bug#65049)
* Fix "vc-print-log does not erase buffer" and associated problemsDmitry Gutov2023-06-241-4/+9
| | | | | * lisp/vc/vc.el (vc-deduce-fileset): Make sure to retain the buffer switch (if it did), bug#63949.
* ; Minor fixes in documentation of recently-changed VC commandsEli Zaretskii2023-05-261-13/+36
| | | | | | | | | | * lisp/vc/vc.el (vc-print-branch-log, vc-create-branch) (vc-create-tag, vc-retrieve-tag, vc-switch-branch): Doc fixes. * lisp/vc/vc-hooks.el (vc-menu-map): Minor wording change in :help text. * doc/emacs/maintaining.texi (VC Change Log, Creating Branches): Minor wording and markup changes.
* Add vc-create/switch/print-branch to menu and update documentation (bug#63690)Juri Linkov2023-05-251-1/+2
| | | | | | | | | | | | | * doc/emacs/maintaining.texi (VC Change Log): Add 'C-x v b l' (vc-print-branch-log). (Creating Branches): Add @kindex and @findex for vc-create-branch. (Switching Branches): Add @kindex and @findex for vc-switch-branch. * lisp/vc/vc-hooks.el (vc-menu-map): Add menu items for new commands vc-create-branch and vc-switch-branch, and also vc-print-branch-log. * lisp/vc/vc.el (vc-print-branch-log): Improve docstring.
* ; vc-checkout: Wrap var lookup in 'bound-and-true-p'Dmitry Gutov2023-04-121-1/+1
|
* vc-checkout: Try to use the vc-dir's backend firstDmitry Gutov2023-04-111-1/+1
| | | | | | * lisp/vc/vc.el (vc-checkout): Try to use the vc-dir's backend before looking for the file's one. The latter doesn't work when the file doesn't exist on disk yet (bug#62674).
* Improve documentation of VC commands, including in DiredEli Zaretskii2023-02-231-16/+38
| | | | | | | | | | | | * doc/emacs/dired.texi (Operating on Files): * doc/emacs/maintaining.texi (VC Change Log, VC Directory Mode) (Version Control, Basic VC Editing): Document VC command invocation from Dired buffers. Improve documentation of vc-log commands. * lisp/dired-aux.el (dired-vc-next-action): * lisp/vc/vc.el (vc-print-log, vc-log-search, vc-log-mergebase) (vc-log-view-type, vc-print-root-log, vc-next-action): Doc fixes.
* * lisp/vc/vc.el (vc-find-revision-no-save): Fix parens (bug#61256).Juri Linkov2023-02-051-2/+2
| | | | Move '(setq failed nil)' from UNWINDFORMS of 'unwind-protect' to BODYFORM.
* * lisp/vc/vc-bzr.el (vc-bzr--pushpull): Return buffer's process.Juri Linkov2023-01-241-1/+2
| | | | | | | * lisp/vc/vc-git.el (vc-git--pushpull): Add comment. * lisp/vc/vc.el (vc-pull-and-push): Expand docstring about prerequisites for backend to support this command (bug#60569).
* Generalize vc-pull-and-push to support more backends (bug#60569)Juri Linkov2023-01-221-3/+14
| | | | | | | * lisp/vc/vc-git.el (vc-git-pull-and-push): Remove and move its logic to vc-pull-and-push. * lisp/vc/vc.el (vc-pull-and-push): Add code from vc-git-pull-and-push.
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
|
* Don't use diff-mode buffer as a patch when it's visiting a file (bug#59962)Juri Linkov2022-12-111-1/+1
| | | | | | | * lisp/vc/vc.el (vc-deduce-fileset-1): Don't call diff-vc-deduce-fileset for diff-mode when buffer-file-name is non-nil. This is because in this case a file with a diff might be committed to VCS. So don't use it as a patch to commit with 'C-x v v'.
* ; Fix typosStefan Kangas2022-11-231-1/+1
|
* ; Avoid "Local Variables" popups in Emacs treeEli Zaretskii2022-11-201-0/+2
| | | | | * lisp/vc/vc.el (vc-prepare-patches-separately): Add an autoloaded form for the 'safe-local-variable' property. (Bug#59384)
* * lisp/vc/vc.el (vc-default-last-change): Use 'vc-call'Philip Kaludercic2022-11-171-3/+1
|
* Have 'vc-prepare-patch' handle prefix arguments.Philip Kaludercic2022-11-171-15/+33
| | | | | | | | | * lisp/emacs-lisp/package-vc.el (package-vc-prepare-patch): Use 'vc-prepare-patch-prompt-revisions'. * lisp/vc/vc.el (vc-prepare-patch-prompt-revisions): Extract common function and handle prefix arguments. (vc-prepare-patch): Pull logic out to 'vc-prepare-patch-prompt-revisions'.
* ; * lisp/*.el: Fix typos in docstringsJuanma Barranquero2022-11-171-1/+1
| | | | | | | | | | * lisp/gnus/nnrss.el (nnrss-use-local, nnrss-fetch, nnrss-find-el): * lisp/leim/quail/japanese.el ("japanese"): * lisp/org/ol.el (org-link-search-must-match-exact-headline): * lisp/org/org-faces.el (org-column): * lisp/progmodes/eglot.el (eglot--stay-out-of-p) (eglot-workspace-configuration, eglot--read-execute-code-action): * lisp/vc/vc.el (vc-clone): Fix typos in docstrings.
* Merge branch 'feature/package+vc'Philip Kaludercic2022-11-041-0/+51
|\
| * Have 'last-change' accept a line number instead of a rangePhilip Kaludercic2022-10-301-13/+16
| | | | | | | | | | | | | | | | * lisp/emacs-lisp/package-vc.el (package-vc-release-rev): Use new signature. * lisp/vc/vc-git.el (vc-git-last-change): Update signature * lisp/vc/vc.el (vc-default-last-change): Update signature and use 'annotate-command'.
| * Extract last source package release from local VCS dataPhilip Kaludercic2022-10-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/package-vc.el (package-vc-archive-spec-alist): Unmention :release-rev (package-vc-desc->spec): Fall back on other archives if a specification is missing. (package-vc-main-file): Add new function, copying the behaviour of elpa-admin.el. (package-vc-generate-description-file): Use 'package-vc-main-file'. (package-vc-unpack): Handle special value ':last-release'. (package-vc-release-rev): Add new function using 'last-change'. (package-vc-install): Pass ':last-release' as REV instead of a release. * lisp/vc/vc-git.el (vc-git-last-change): Add Git 'last-change' implementation. * lisp/vc/vc.el (vc-default-last-change): Add default 'last-change' implementation. This attempts to replicate the behaviour of elpa-admin.el's "elpaa--get-last-release-commit".
| * ; Update 'clone' documentation in headerPhilip Kaludercic2022-10-231-2/+5
| |
| * Immediately check out the right branch or revisionPhilip Kaludercic2022-10-231-4/+5
| | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/package-vc.el (package-vc-unpack) Use REV to avoid checking out the wrong branch/revision first. * lisp/vc/vc-bzr.el: Handle REV. * lisp/vc/vc-git.el: Handle REV. * lisp/vc/vc-hg.el: Handle REV. * lisp/vc/vc-svn.el: Handle REV. * lisp/vc/vc.el: Make BACKEND optional and add REV.
| * Merge remote-tracking branch 'origin/master' into feature/package+vcPhilip Kaludercic2022-10-181-3/+47
| |\
| * | Have 'vc-clone' return a directoryPhilip Kaludercic2022-10-181-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-clone): Return directory. * lisp/vc/vc-git.el (vc-git-clone): Return directory. * lisp/vc/vc-hg.el (vc-hg-clone): Return directory. * lisp/vc/vc-svn.el (vc-svn-clone): Return directory. * lisp/vc/vc.el (vc-clone): Ensure the backend returns directory.
| * | Merge branch 'master' into feature/package+vcPhilip Kaludercic2022-10-151-14/+32
| |\ \
| * \ \ Merge branch 'master' into feature/package+vcPhilip Kaludercic2022-10-081-44/+293
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into feature/package+vcPhilip Kaludercic2022-08-121-1/+1
| |\ \ \ \
| * | | | | Ignore files in .elpaignore during byte compilationPhilip Kaludercic2022-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * package.el (package--parse-elpaignore): Add new function. (package--compile): Bind 'byte-compile-ignore-files' to the result of 'package--parse-elpaignore'.
| * | | | | Merge remote-tracking branch 'origin/master' into feature/package+vcPhilip Kaludercic2022-07-311-3/+6
| |\ \ \ \ \
| * | | | | | Add new command to clone a repositoryPhilip Kaludercic2022-02-141-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc.el (vc-clone): Add command
* | | | | | | Speed up vc-default-checkin-patch a littleDmitry Gutov2022-10-311-3/+0
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-default-checkin-patch): Drop some 'revert-buffer' calls to speed up the process a little (bug#52349).
* | | | | | ; Fix commentDmitry Gutov2022-10-181-1/+1
| | | | | |
* | | | | | Follow-up fixes for vc-default-checkin-patchDmitry Gutov2022-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-default-checkin-patch): Call vc-revert-file on buffer-file-name (vc-backend failed on relative name sometimes). Delete the tmp dir after copying all files back, not just the first one. Bug#52349, https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01446.html.
* | | | | | Add default implementation for 'checkin-patch'Dmitry Gutov2022-10-171-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-default-checkin-patch): Add default implementation for 'checkin-patch' (bug#52349). The first attempt was here: https://lists.gnu.org/archive/html/emacs-devel/2022-08/msg01464.html
* | | | | | ; * lisp/vc/vc.el (vc-prepare-patch): Fix pluralisationPhilip Kaludercic2022-10-161-1/+2
| | | | | |
* | | | | | ; * lisp/vc/vc.el (vc-prepare-patch): Remove 'exit-recursive-edit'Philip Kaludercic2022-10-161-2/+1
| |_|_|_|/ |/| | | |
* | | | | ; * lisp/vc/vc.el (vc-default-prepare-patch): Add missing argumentPhilip Kaludercic2022-10-141-1/+1
| | | | |
* | | | | Prepare all inline patches at oncePhilip Kaludercic2022-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-prepare-patch): Remove the usage of 'recursive-edit' when 'vc-prepare-patches-separately' is non-nil.
* | | | | Allow reordering commits in 'vc-prepare-patch' promptPhilip Kaludercic2022-10-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-prepare-patch): Use marked log-view commits as initial input.
* | | | | Fix `vc-prepare-patch' docstringRobert Pluim2022-10-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-prepare-patch): Correct description of `vc-prepare-patches-separately'.
* | | | | ; * lisp/vc/vc.el (vc-prepare-patches-separately): Doc fix.Eli Zaretskii2022-10-081-5/+5
| | | | |
* | | | | ; * lisp/vc/vc.el (vc-prepare-patches-separately): Fix docstringPhilip Kaludercic2022-10-081-4/+5
| | | | | | | | | | | | | | | | | | | | Noticed by German Pacenza.
* | | | | ; Add missing documentation stringsPhilip Kaludercic2022-10-081-0/+11
| |_|_|/ |/| | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-read-revision): Add a docstring. (vc-read-multiple-revisions): Add a docstring.
* | | | Add a VC command to prepare patchesPhilip Kaludercic2022-10-081-4/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/vc1-xtra.texi (Miscellaneous VC): Add new node. (Editing VC Commands): Document new feature. * etc/NEWS: Mention 'vc-prepare-patch'. * lisp/vc/log-view.el: Autoload 'log-view-get-marked'. * lisp/vc/vc-git.el (vc-git-prepare-patch): Add Git implementation. * lisp/vc/vc-hg.el (vc-git-prepare-patch): Add Mercurial implementation. * lisp/vc/vc-bzr.el (vc-git-prepare-patch): Add Bazaar implementation. * lisp/vc/vc.el (vc-read-revision): Add a MULTIPLE argument. (vc-read-multiple-revisions): Add an auxiliary function that always calls 'vc-read-revision' with a non-nil value for MULTIPLE. (vc-prepare-patches-separately): Add user option. (message-goto-body): Declare function. (message--name-table): Declare function. (vc-default-prepare-patch): Add a default implementation. (vc-prepare-patch): Add command. (Bug#57400)
* | | | In vc-git-log-incoming use the repository in the command "fetch" (bug#50340)Juri Linkov2022-10-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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".