summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Collapse)AuthorAgeFilesLines
* * lisp/vc/vc.el: Update args of backend API calls in the header commentsJuri Linkov2020-12-061-8/+8
| | | | https://lists.gnu.org/archive/html/emacs-devel/2020-12/msg00283.html
* ; Fix many typos in symbols in docs and commentsStefan Kangas2020-10-021-2/+1
|
* diff-no-select doc string clarificationLars Ingebrigtsen2020-09-121-2/+10
| | | | | * lisp/vc/diff.el (diff-no-select): Update doc string from the trunk, don't merge.
* Fix edge case errors in filename-matching regexpsMattias Engdegård2020-04-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes fix actual or latent bugs in regexps that match file names, such as PATTERN arguments to 'directory-files'. See https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg00265.html * admin/authors.el (authors-obsolete-files-regexps) (authors-renamed-files-regexps): * lisp/auth-source-pass.el (auth-source-pass-entries): * lisp/calendar/todo-mode.el (todo-show, todo-find-filtered-items-file) (todo-filter-items, todo-reset-nondiary-marker, todo-reset-done-string) (todo-reset-comment-string, todo-reset-highlight-item): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-load-ebrowse-caches): * lisp/cedet/semantic/texi.el (semantic-texi-associated-files): * lisp/cedet/srecode/map.el (srecode-map-update-map): * lisp/dired.el (dired-re-no-dot): * lisp/emacs-lisp/autoload.el (update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-find): * lisp/files.el (auto-mode-alist, directory-files-no-dot-files-regexp): * lisp/finder.el (finder-compile-keywords): * lisp/generic-x.el (inetd-conf-generic-mode, named-boot-generic-mode) (resolve-conf-generic-mode, etc-modules-conf-generic-mode): * lisp/gnus/gnus-agent.el (gnus-agent-read-agentview) (gnus-agent-regenerate-group, gnus-agent-update-files-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-articles-in-group): * lisp/gnus/gnus-score.el (gnus-score-search-global-directories): * lisp/gnus/gnus-util.el (gnus-delete-directory): * lisp/gnus/gnus-uu.el (gnus-uu-dir-files): * lisp/gnus/nndraft.el (nndraft-request-group): * lisp/gnus/nnmh.el (nnmh-request-group, nnmh-request-create-group): (nnmh-request-delete-group, nnmh-active-number, nnmh-update-gnus-unreads): * lisp/gnus/nnspool.el (nnspool-request-group): * lisp/gnus/spam-stat.el (spam-stat-process-directory) (spam-stat-test-directory): * lisp/help-fns.el (help-fns--first-release): * lisp/help.el (view-emacs-news): * lisp/international/quail.el (quail-update-leim-list-file): * lisp/international/titdic-cnv.el (batch-titdic-convert): * lisp/mail/mspools.el (mspools-set-vm-spool-files) (mspools-get-spool-files): * lisp/mail/rmail.el (rmail-secondary-file-regexp) (rmail-speedbar-match-folder-regexp): * lisp/net/ange-ftp.el (ange-ftp-delete-directory): * lisp/net/tramp.el (tramp-use-absolute-autoload-file-names): * lisp/obsolete/gulp.el (gulp-send-requests): * lisp/obsolete/vc-arch.el (vc-arch-trim-revlib): * lisp/org/ob-core.el (org-babel-remove-temporary-directory): * lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp, ebnf-style-database): * lisp/progmodes/executable.el (executable-command-find-posix-p): * lisp/startup.el (command-line): * lisp/textmodes/refer.el (refer-get-bib-files): * lisp/url/url-about.el (url-probe-protocols): * lisp/vc/vc-rcs.el (vc-rcs-register, vc-rcs-unregister): * test/lisp/net/tramp-archive-tests.el (tramp-archive-test19-directory-files-and-attributes): * test/lisp/net/tramp-tests.el (tramp-test19-directory-files-and-attributes): Replace ^ and $ with \` and \', respectively. Use (rx (or (not ".") "...")), translated into "[^.]\\|\\.\\.\\.", to match anything but "." and "..", instead of several incorrect regexps.
* Handle filling of indented ChangeLog function entriesNoam Postavsky2020-04-041-1/+1
| | | | | | * lisp/vc/log-edit.el (log-edit-fill-entry): Relax regexp a bit to recognize function entries with leading blanks. * test/lisp/vc/log-edit-tests.el: New test.
* Fix a couple of problems in changelog generating functionsNoam Postavsky2020-03-222-35/+40
| | | | | | | | | | | * lisp/vc/diff-mode.el (diff-add-log-current-defuns): If there is a scan-error when calling end-of-defun, go to end of hunk. This can easily happen since we are calling end-of-defun on a partial code fragment from a diff. * lisp/vc/log-edit.el (log-edit-generate-changelog-from-diff): Bind display-buffer-overriding-action around the log-edit-show-diff call only. Otherwise, it can affect, for example, debugger windows triggered by the diff-add-log-current-defuns call.
* * lisp/vc/vc-cvs.el (vc-cvs-ignore): Copy-edit doc stringMattias Engdegård2020-02-281-10/+11
|
* vc-dir-ignore: More accurately choose base directoryDmitry Gutov2020-02-252-11/+14
| | | | | | | | * lisp/vc/vc-dir.el: (vc-dir-ignore): Use it (bug#37189). * lisp/vc/vc.el: (vc--ignore-base-dir): Extract from vc-ignore.
* Move more logic to vc-ignore from vc-default-ignoreDmitry Gutov2020-02-232-28/+33
| | | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-ignore): Pass relative file names to vc-ignore. * lisp/vc/vc.el (vc-ignore): Move the responsibility of constructing the ignore pattern (right now, most often a relative file name) using a file name received from the user, here. (vc-default-ignore): ...from here (bug#37189, see discussion). Also clarify the docstring.
* Don't write absolute filenames and duplicate strings to CVS ignore filesWolfgang Scherer2020-02-222-15/+34
| | | | | | | | | | * lisp/vc/vc-cvs.el (vc-cvs-ignore): Expand filename correctly and pass on only the basename as the pattern. (vc-cvs-append-to-ignore) Do not write duplicate strings to .cvsignore. New optional parameter SORT to more explicitly control sorting of the ignore entries. (Bug#37215) * lisp/vc/pcvs.el (cvs-mode-ignore): Call 'vc-cvs-append-to-ignore' with SORT argument.
* Make sure not to mark directoriesWolfgang Scherer2020-02-121-2/+3
| | | | | * lisp/vc/vc-dir.el (vc-dir-mark-all-files): Make sure not to mark directories (bug#37182).
* ; Add a TODODmitry Gutov2020-02-121-0/+3
|
* vc-hg-dir-status-files: Fix when DIR is not repository rootDmitry Gutov2020-02-121-6/+6
| | | | | | | * lisp/vc/vc-hg.el (vc-hg-dir-status-files): Make sure it works correctly in a subdirectory of the repo root. Bind default-directory to DIR and add 're: -I .' to the arguments (bug#39380).
* Wrap some set-auto-mode calls with delay-mode-hooks (bug#39190)Juri Linkov2020-02-062-2/+6
| | | | | | | | | * lisp/gnus/mm-view.el (mm-display-inline-fontify): * lisp/vc/diff-mode.el (diff-syntax-fontify-props): * lisp/vc/vc.el (vc-find-revision-no-save): Add delay-mode-hooks around set-auto-mode calls to not run hooks that might assume buffer-file-name really associates buffer with a file.
* * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456Stefan Monnier2020-01-211-1/+4
| | | | | This situation is not an internal error, but a perfectly normal occurrence, so a `cl-assert` is not right
* vc-dir: ensure we don't use a pager with gitRobert Pluim2020-01-131-2/+1
| | | | | * lisp/vc/vc-git.el (vc-git--call): Call git with '--no-pager' to avoid hangs caused by remote pager settings (Bug#38688).
* Update copyright year to 2020Paul Eggert2020-01-0140-40/+40
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Improve vc--add-line, vc--remove-regexpWolfgang Scherer2019-12-251-9/+11
| | | | | | | | * lisp/vc/vc.el (vc--add-line): Create file if it does not exist. Use existing buffer to avoid discrepancies with filesytem. Make sure that the file ends with a newline. (vc--remove-line): Do not create file if it does not exist. Use existing buffer to avoid discrepancies with filesytem. (bug#37185)
* Speed up vc-dir-updateDmitry Gutov2019-12-211-12/+15
| | | | | * lisp/vc/vc-dir.el (vc-dir-update): Speed up. (https://lists.gnu.org/archive/html/emacs-devel/2019-12/msg00568.html)
* Make ls-files-unknown only return proper files, not directoriesAndrii Kolomoiets2019-12-171-2/+1
| | | | | | * lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Make ls-files-unknown only return proper files, not directories (bug#38615).
* vc-git-after-dir-status-stage: Avoid erroneous up-to-date statusDmitry Gutov2019-12-171-8/+13
| | | | | | * lisp/vc/vc-git.el (vc-git-after-dir-status-stage): Don't set `up-to-date' status if the previous stage (`diff-index') has assigned some other status to the file (bug#38615).
* New command 'diff-buffers'Phil Sainty2019-12-161-1/+32
| | | | | | | | * lisp/vc/diff.el (diff-buffers): New command. (diff, diff-no-select, diff-file-local-copy): Improve docstrings. * doc/emacs/files.texi: * etc/NEWS: Document new command, and the previously-undocumented ability for 'diff' to compare buffers.
* * lisp/vc/diff-mode.el (diff-context): Set 'extend t' (bug#37774).Dmitry Gutov2019-12-021-2/+2
|
* Fix compilation warning in vc-hg.elJuanma Barranquero2019-11-301-0/+2
| | | | * lisp/vc/vc-hg.el (vc-read-revision): Declare.
* vc-hg: prompt for branch to mergeAndrii Kolomoiets2019-11-301-4/+9
| | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-merge-branch): Prompt for revision to merge. (vc-hg-revision-table): Use branches, tags and bookmarks as competion candidates. * etc/NEWS: Mention changes of vc-hg.el * doc/emacs/maintaining.texi (Switching Branches): Mention 'hg update' command. (Merging): Mention 'hg merge' command. This fixes bug#22860
* Add ':extend' attribute to faces and themesEli Zaretskii2019-11-304-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * etc/themes/wombat-theme.el: * etc/themes/wheatgrass-theme.el: * etc/themes/tsdh-light-theme.el: * etc/themes/tsdh-dark-theme.el: * etc/themes/tango-theme.el: * etc/themes/tango-dark-theme.el: * etc/themes/misterioso-theme.el: * etc/themes/manoj-dark-theme.el: * etc/themes/light-blue-theme.el: * etc/themes/leuven-theme.el: * etc/themes/dichromacy-theme.el: * etc/themes/deeper-blue-theme.el: * etc/themes/adwaita-theme.el: Add ':extend' attribute to all faces that are by default defined with it. * lisp/vc/smerge-mode.el (smerge-upper, smerge-lower) (smerge-base): * lisp/vc/log-view.el (log-view-file, log-view-message): * lisp/vc/ediff-init.el (ediff-current-diff-A) (ediff-current-diff-B, ediff-current-diff-C) (ediff-current-diff-Ancestor, ediff-even-diff-A) (ediff-even-diff-B, ediff-even-diff-C) (ediff-even-diff-Ancestor, ediff-odd-diff-A) (ediff-odd-diff-B, ediff-odd-diff-C) (ediff-odd-diff-Ancestor): * lisp/vc/diff-mode.el (diff-header, diff-file-header) (diff-removed, diff-added): Make sure all definitions of faces have the same value of the ':extend' property, otherwise customizing background color or underline etc. attributes of these faces on some displays will produce effects different from other displays.
* Support showing one revision with MercurialEli Zaretskii2019-11-291-0/+2
| | | | | * lisp/vc/vc-hg.el (vc-hg-print-log): Support 'with-diff' invocation of "C-1 C-x v L".
* Support showing one revision with SubversionEli Zaretskii2019-11-291-2/+6
| | | | | * lisp/vc/vc-svn.el (vc-svn-print-log): Support 'with-diff' invocation of "C-1 C-x v L".
* Minor fix in 'vc-print-root-log's prompt for revision IDEli Zaretskii2019-11-291-1/+1
| | | | | * lisp/vc/vc.el (vc-print-root-log): Remove text properties from the default revision suggestion.
* Support showing one revision with BazaarEli Zaretskii2019-11-291-0/+1
| | | | | * lisp/vc/vc-bzr.el (vc-bzr-print-log): Support 'with-diff' invocation of "C-1 C-x v L".
* Improve documentation and UI of 'C-x v L'Eli Zaretskii2019-11-291-4/+5
| | | | | | | | | | | * lisp/vc/vc.el (vc-print-root-log): Improve the wording of the doc string and of the prompt for the root directory. * etc/NEWS: Improve and expand the wording of the changes in 'C-x v L'. * doc/emacs/maintaining.texi (VC Change Log): Improve and clarify wording of the 'C-x v L' description.
* 'C-1 C-x v L' asks for revision and shows its log entry with diff (bug#38044)Juri Linkov2019-11-282-15/+37
| | | | | | | | | | | | | | | | | * doc/emacs/maintaining.texi (VC Change Log): Explain the numeric prefix arg of 'C-x v L' (vc-print-root-log). * lisp/vc/vc-git.el (vc-git-print-log): Add command line option "-p" when vc-log-view-type is 'with-diff'. (vc-git-log-view-mode): Use long style when vc-log-view-type is 'with-diff'. * lisp/vc/vc.el (vc-print-log-internal): Add optional arg 'type'. (vc-log-internal-common): Use 'region-history-mode' when type is 'with-diff' and backend supports 'region-history-mode'. (vc-print-root-log): Add optional arg 'revision'. In interactive spec read a revision when current-prefix-arg is 1. Use current-prefix-arg "as is" when it is a number. Show revision in long style with diff when limit is 1 and revision is non-nil.
* Make some anonymous faces extend to EOLEli Zaretskii2019-11-271-1/+1
| | | | | | | | * lisp/vc/log-edit.el (log-edit-font-lock-keywords): * lisp/mpc.el (mpc-separator): * lisp/help.el (describe-key): * lisp/help-fns.el (describe-symbol): Make the anonymous faces extend to EOL.
* Call vc-setup-buffer in vc-hg-log-incoming and vc-hg-log-outgoingAndrii Kolomoiets2019-11-271-0/+2
| | | | | * lisp/vc/vc-hg.el (vc-hg-log-incoming, vc-hg-log-outgoing): Call vc-setup-buffer.
* Support 'vc-region-history' for MercurialEli Zaretskii2019-11-212-3/+52
| | | | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-region-history) (vc-hg-region-history-font-lock, vc-hg-region-history-mode): New functions. (vc-hg-region-history-mode-map) (vc-hg--log-view-long-font-lock-keywords) (vc-hg-region-history-font-lock-keywords): New variables. * lisp/vc/vc-git.el (vc-git-region-history): Update commentary. * doc/emacs/maintaining.texi (VC Change Log): Add 'vc-region-history' to the table at beginning of node. Update the VCSes that support 'vc-region-history'. * etc/NEWS: Mention the new feature of vc-hg.el.
* * lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)Juri Linkov2019-11-181-0/+2
| | | | | | | * lisp/vc/ediff-util.el (ediff-toggle-read-only, ediff-quit): Set this-command to the same command after using y-or-n-p that doesn't guarantee to keep this-command unchanged to check it later for some contrived logic.
* Avoid using subr-x functionLars Ingebrigtsen2019-11-151-1/+2
| | | | | * lisp/vc/vc-hg.el (vc-hg-retrieve-tag): Avoid using subr-x function (bug#38216).
* lisp/vc/vc-hg.el: Don't pass empty string to hg updateAndrii Kolomoiets2019-11-151-1/+1
| | | | | * lisp/vc/vc-hg.el (vc-hg-retrieve-tag): Don't pass empty name to `hg update` (bug#38216).
* (vc-default-update-on-retrieve-tag): Accept backend argumentAndrii Kolomoiets2019-11-141-1/+1
| | | | | | * lisp/vc/vc.el (vc-default-update-on-retrieve-tag): Accept backend argument (bug#38156). This fixes a bug introduced in the previous patch.
* VC: ability to skip update buffers promptAndrii Kolomoiets2019-11-144-7/+23
| | | | | | | | | | | * lisp/vc/vc.el (vc-default-update-on-retrieve-tag): New function. (vc-retrieve-tag): Call `update-on-retrieve-tag' backend function to determine if prompt for update buffers is needed; Include tag name into the "Retrieving tag" message. * lisp/vc/vc-git.el (vc-git-update-on-retrieve-tag): * lisp/vc/vc-hg.el (vc-hg-update-on-retrieve-tag): * lisp/vc/vc-svn.el (vc-svn-udate-on-retrieve-tag): New functions. Buffers update prompt on `vc-retrieve-tag' is omitted (bug#38156).
* Fix some quoting glitches in doc stringsPaul Eggert2019-11-113-6/+6
|
* * lisp/dired-aux.el (dired-vc-rename-file): New defcustom.Juri Linkov2019-11-071-1/+2
| | | | | | | | | | (dired-rename-file): Call vc-rename-file when dired-vc-rename-file is non-nil. * lisp/vc/vc.el (vc-rename-file): Allow renaming added files. Call vc-file-clearprops on new file too for the case when old and new files were renamed to each other back and forth. https://lists.gnu.org/archive/html/emacs-devel/2019-11/msg00069.html
* Rework vc stash bindingsRobert Pluim2019-10-311-17/+40
| | | | | | | | | | | | | | | | | | | | | | | This adds create/snapshot bindings to the stash button even when there are no stashes, and extends the stash menu bindings. * etc/NEWS: Announce the bindings. * lisp/vc/vc-git.el (vc-git-stash-shared-map): New keymap. Holds shared bindings between stash button and stash list. (vc-git-stash-map): Inherit from vc-git-stash-shared-map. (vc-git-stash-button-map): New keymap. Holds button bindings, inherit from vc-git-stash-shared-map. (vc-git-stash-shared-help, vc-git-stash-list-help): New defconsts. Abstract out list/button help texts. (vc-git--make-button-text): Set keymap property to vc-git-stash-button-map. (vc-git-make-stash-button): Use vc-git-stash-shared-help. (vc-git-stash-menu-map): Add items for vc-git-stash and vc-git-stash-snapshot. (vc-git-dir-extra-headers): Use vc-git-stash-list-help and vc-git-stash-shared-help. Add vc-git-stash and vc-git-stash-snapshot bindings to text shown when there are no stashes.
* Bind vc-git-stash to a keyLars Ingebrigtsen2019-10-301-1/+2
| | | | | | | | | * lisp/vc/vc-git.el (vc-git-stash-map): Give `vc-git-stash' a keystroke, because it's a useful command. When there are no stashes, there's no way to use that keystroke (since it's only bound on the stash lines), so perhaps that should also be fixed somehow.
* Remove obsolete doc references to XEmacs (Bug#37899)Stefan Kangas2019-10-281-2/+1
| | | | | | | | | | | | | | | | | * doc/misc/edt.texi (Changes, Goals): * doc/misc/emacs-mime.texi (Charset Translation): * doc/misc/gnus-faq.texi (FAQ 4-15): * doc/misc/pcl-cvs.texi (Bugs): * doc/misc/srecode.texi (SRecode Minor Mode): * lisp/cedet/srecode/insert.el (srecode-insert-ask-variable-method): * lisp/follow.el: * lisp/leim/quail/ipa.el (ipa-x-sampa, ipa-kirshenbaum): * lisp/net/newsticker.el: * lisp/obsolete/iswitchb.el: * lisp/progmodes/hideshow.el: * lisp/savehist.el (savehist-file): * lisp/vc/ediff.el: Remove obsolete references to XEmacs in doc strings and comments.
* Improve the documentation of 'vc-tor'Eli Zaretskii2019-10-261-1/+4
| | | | | | | * lisp/vc/vc-dispatcher.el (vc-tor): Add :version. Enhance the doc string. * etc/NEWS: Announce the new option.
* New defcustom 'vc-tor'Richard Stallman2019-10-261-1/+7
| | | | | * lisp/vc/vc-dispatcher.el (vc-tor): New user option. (vc-do-command): If vc-tor is non-nil, use 'torsocks'.
* Show stash counts in button in vc-dirRobert Pluim2019-10-221-16/+37
| | | | | | | | | | | | Based on suggestions from Mattias Engdegård. * lisp/vc/vc-git.el (vc-git--make-button-text): New function to generate text for stash button. (vc-git-make-stash-button): Show stash counts. Delete and recreate button when toggling. (vc-git-dir-extra-headers): Pass counts to vc-git-make-stash-button. Treat stash count <= vc-git-show-stash as equivalent to showing entire list.
* * lisp/vc/vc-annotate.el (vc-annotate-lines): Use set-face-extend (bug#37774)Juri Linkov2019-10-221-0/+1
|
* Add button to vc-dir to toggle visibility of stash listRobert Pluim2019-10-211-18/+84
| | | | | | | | | | | | | * lisp/vc/vc-git.el: Move cl-lib require outside 'eval-when-compile'. * lisp/vc/vc-git.el (vc-git-show-stash):New user option. (vc-git-make-stash-button): Create button that allows hiding the stash list. (vc-git-dir-extra-headers): Split stash list into hideable and non-hideable parts depending on value of vc-git-show-stash. Add button to toggle visibility of hideable part. * etc/NEWS: Announce it.
View Lorry Controller Status