summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-hg.el
Commit message (Collapse)AuthorAgeFilesLines
* Fix minor bugs in vc-git and vc-hg on Windows uncovered by vc-testsEli Zaretskii2023-09-011-1/+4
| | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-state-slow): Non-existing files emit a different message on MS-Windows; support that. * lisp/vc/vc-git.el (vc-git-checkin): Make sure 'default-directory' is not nil when calling 'make-nearby-temp-file' on MS-Windows. * test/lisp/vc/vc-tests.el (vc-test--version-diff): Run 'default-directory' through 'file-truename', otherwise the 'vc-test-cvs06-version-diff' test might fail on MS-Windows.
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
|
* Merge remote-tracking branch 'origin/master' into feature/package+vcPhilip Kaludercic2022-10-301-10/+26
|\
| * vc-hg-checkin-patch: Add implementation for HgDmitry Gutov2022-10-261-10/+26
| | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-checkin-patch): Add Hg-specific implementation (bug#52349), like suggested in https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01533.html. (vc-hg--extract-headers): Extract from vc-hg-checkin.
* | Immediately check out the right branch or revisionPhilip Kaludercic2022-10-231-2/+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.
* | Have 'vc-clone' return a directoryPhilip Kaludercic2022-10-181-1/+2
| | | | | | | | | | | | | | | | * 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-081-2/+14
|\|
| * Add a VC command to prepare patchesPhilip Kaludercic2022-10-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| * Add a new command vc-pull-and-pushLars Ingebrigtsen2022-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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).
| * Make point-at-eol and point-at-bol obsoleteStefan Kangas2022-08-231-1/+1
| | | | | | | | | | | | | | * lisp/subr.el (point-at-eol, point-at-bol): Make XEmacs compat aliases obsolete in favor of `pos-bol'/'line-beginning-position' or 'pos-eol'/'line-end-position'. Update callers. Ref: https://lists.gnu.org/r/emacs-devel/2022-08/msg00853.html
* | * lisp/vc/vc-hg.el (vc-hg-clone): Add 'clone' implementationPhilip Kaludercic2022-10-061-0/+2
|/
* Prefer defvar-keymap in vc/*.elStefan Kangas2022-08-101-7/+4
| | | | | | | | | | | | | | * lisp/vc/add-log.el (change-log-mode-map): * lisp/vc/ediff-mult.el (ediff-dir-diffs-buffer-map): * lisp/vc/vc-annotate.el (vc-annotate-mode-map): * lisp/vc/vc-bzr.el (vc-bzr-shelve-map): * lisp/vc/vc-dir.el (vc-dir-status-mouse-map) (vc-dir-filename-mouse-map): * lisp/vc/vc-git.el (vc-git-stash-shared-map, vc-git-stash-map) (vc-git-stash-button-map, vc-git-log-edit-mode-map): * lisp/vc/vc-hg.el (vc-hg-log-edit-mode-map) (vc-hg-extra-menu-map): * lisp/vc/vc-hooks.el (vc-prefix-map): Prefer defvar-keymap.
* Prefer ‘time-equal-p’ to ‘equal’ on timestampsPaul Eggert2022-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more robust since timestamps can have multiple forms. * lisp/auth-source.el (auth-source-netrc-parse): * lisp/bookmark.el (bookmark--watch-file-already-queried-p) (bookmark-maybe-load-default-file): * lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p): * lisp/dired.el (dired-directory-changed-p): * lisp/files.el (dir-locals-find-file): * lisp/gnus/gnus-util.el (gnus-cache-file-contents): * lisp/gnus/nneething.el (nneething-create-mapping): * lisp/gnus/nnfolder.el (nnfolder-read-folder): * lisp/gnus/nnmaildir.el (nnmaildir--update-nov) (nnmaildir--scan, nnmaildir-request-scan) (nnmaildir-request-update-info): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/gnus/spam-stat.el (spam-stat-load): * lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases): * lisp/mail/sendmail.el (sendmail-sync-aliases): * lisp/net/netrc.el (netrc-parse): * lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file): * lisp/play/cookie1.el (cookie-snarf): * lisp/vc/vc-cvs.el (vc-cvs-state-heuristic): * lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p) (vc-hg--cached-dirstate-search): * lisp/vc/vc-hooks.el (vc-after-save): Prefer ‘time-equal-p’ to ‘equal’ when comparing timestamps for equality.
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
| |
* | Make 'inhibit-changing-match-data' obsolete and adjust callersLars Ingebrigtsen2021-10-071-4/+3
|/ | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/searching.texi (Regexp Search): (POSIX Regexps): Document this. * lisp/subr.el (inhibit-changing-match-data): Make obsolete. (looking-at-p): Adjust call. * lisp/vc/vc-hg.el (vc-hg--raw-dirstate-search): (vc-hg--ignore-patterns-ignored-p): (vc-hg--cached-dirstate-search): Don't use `inhibit-changing-match-data'. * src/minibuf.c (Ftry_completion): (Fall_completions): (Ftest_completion): Adjust Fstring_match calls. * src/search.c (looking_at_1): Pass in modify_data. (Flooking_at): Add optional inhibit-modify parameter. (string_match_1): Pass in modify_data. (Fstring_match): (Fposix_looking_at, Fposix_string_match): Add optional inhibit-modify parameter.
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-7/+6
|
* ; More minor docfixes found by checkdocStefan Kangas2021-09-141-5/+5
|
* ; Minor doc fixes found by checkdocStefan Kangas2021-09-131-2/+2
|
* Use string-replace instead of replace-regexp-in-stringMattias Engdegård2021-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `string-replace` is easier to understand, less error-prone, much faster, and results in shorter Lisp and byte code. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-scan-change-log): * lisp/autoinsert.el (auto-insert-alist): * lisp/calc/calc-prog.el (calc-edit-macro-combine-alg-ent) (calc-edit-macro-combine-ext-command) (calc-edit-macro-combine-var-name): * lisp/calc/calc-units.el (math-make-unit-string): * lisp/calendar/cal-html.el (cal-html-comment): * lisp/calendar/cal-tex.el (cal-tex-comment): * lisp/calendar/icalendar.el (icalendar--convert-string-for-export) (icalendar--convert-string-for-import): * lisp/calendar/iso8601.el (iso8601--concat-regexps) (iso8601--full-time-match, iso8601--combined-match): * lisp/calendar/time-date.el (format-seconds): * lisp/calendar/todo-mode.el (todo-filter-items-filename): * lisp/cedet/cedet-files.el (cedet-directory-name-to-file-name) (cedet-file-name-to-directory-name): * lisp/comint.el (comint-watch-for-password-prompt): * lisp/dired-aux.el (dired-do-chmod): * lisp/dired-x.el (dired-man): * lisp/dired.el (dired-insert-directory, dired-goto-file-1): * lisp/emacs-lisp/comp.el (comp-c-func-name): * lisp/emacs-lisp/re-builder.el (reb-copy): * lisp/erc/erc-dcc.el (erc-dcc-unquote-filename): * lisp/erc/erc.el (erc-quit-reason-zippy, erc-part-reason-zippy) (erc-update-mode-line-buffer, erc-message-english-PART): * lisp/files.el (make-backup-file-name-1, files--transform-file-name) (read-file-modes): * lisp/fringe.el (fringe-mode): * lisp/gnus/gnus-art.el (gnus-button-handle-info-url): * lisp/gnus/gnus-group.el (gnus-group-completing-read): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-ical): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-search.el (gnus-search-query-parse-date) (gnus-search-transform-expression, gnus-search-run-search): * lisp/gnus/gnus-start.el (gnus-dribble-enter): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-mode-string-quote): * lisp/gnus/message.el (message-put-addresses-in-ecomplete) (message-parse-mailto-url, message-mailto-1): * lisp/gnus/mml-sec.el (mml-secure-epg-sign): * lisp/gnus/mml-smime.el (mml-smime-epg-verify): * lisp/gnus/mml2015.el (mml2015-epg-verify): * lisp/gnus/nnmaildir.el (nnmaildir--system-name) (nnmaildir-request-list, nnmaildir-retrieve-groups) (nnmaildir-request-group, nnmaildir-retrieve-headers): * lisp/gnus/nnrss.el (nnrss-node-text): * lisp/gnus/spam-report.el (spam-report-gmane-internal) (spam-report-user-mail-address): * lisp/ibuffer.el (name): * lisp/image-dired.el (image-dired-pngnq-thumb) (image-dired-pngcrush-thumb, image-dired-optipng-thumb) (image-dired-create-thumb-1): * lisp/info.el (Info-set-mode-line): * lisp/international/mule-cmds.el (describe-language-environment): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rfc2368.el (rfc2368-parse-mailto-url): * lisp/mail/rmail.el (rmail-insert-inbox-text) (rmail-simplified-subject-regexp): * lisp/mail/rmailout.el (rmail-output-body-to-file): * lisp/mail/undigest.el (rmail-digest-rfc1153): * lisp/man.el (Man-default-man-entry): * lisp/mouse.el (minor-mode-menu-from-indicator): * lisp/mpc.el (mpc--debug): * lisp/net/browse-url.el (browse-url-mail): * lisp/net/eww.el (eww-update-header-line-format): * lisp/net/newst-backend.el (newsticker-save-item): * lisp/net/rcirc.el (rcirc-sentinel): * lisp/net/soap-client.el (soap-decode-date-time): * lisp/nxml/rng-cmpct.el (rng-c-literal-2-re): * lisp/nxml/xmltok.el (let*): * lisp/obsolete/nnir.el (nnir-run-swish-e, nnir-run-hyrex) (nnir-run-find-grep): * lisp/play/dunnet.el (dun-doassign): * lisp/play/handwrite.el (handwrite): * lisp/proced.el (proced-format-args): * lisp/profiler.el (profiler-report-header-line-format): * lisp/progmodes/gdb-mi.el (gdb-mi-quote): * lisp/progmodes/make-mode.el (makefile-bsdmake-rule-action-regex) (makefile-make-font-lock-keywords): * lisp/progmodes/prolog.el (prolog-guess-fill-prefix): * lisp/progmodes/ruby-mode.el (ruby-toggle-string-quotes): * lisp/progmodes/sql.el (sql-remove-tabs-filter, sql-str-literal): * lisp/progmodes/which-func.el (which-func-current): * lisp/replace.el (query-replace-read-from) (occur-engine, replace-quote): * lisp/select.el (xselect--encode-string): * lisp/ses.el (ses-export-tab): * lisp/subr.el (shell-quote-argument): * lisp/term/pc-win.el (msdos-show-help): * lisp/term/w32-win.el (w32--set-selection): * lisp/term/xterm.el (gui-backend-set-selection): * lisp/textmodes/picture.el (picture-tab-search): * lisp/thumbs.el (thumbs-call-setroot-command): * lisp/tooltip.el (tooltip-show-help-non-mode): * lisp/transient.el (transient-format-key): * lisp/url/url-mailto.el (url-mailto): * lisp/vc/log-edit.el (log-edit-changelog-ours-p): * lisp/vc/vc-bzr.el (vc-bzr-status): * lisp/vc/vc-hg.el (vc-hg--glob-to-pcre): * lisp/vc/vc-svn.el (vc-svn-after-dir-status): * lisp/xdg.el (xdg-desktop-strings): * test/lisp/electric-tests.el (defun): * test/lisp/term-tests.el (term-simple-lines): * test/lisp/time-stamp-tests.el (formatz-mod-del-colons): * test/lisp/wdired-tests.el (wdired-test-bug32173-01) (wdired-test-unfinished-edit-01): * test/src/json-tests.el (json-parse-with-custom-null-and-false-objects): Use `string-replace` instead of `replace-regexp-in-string`.
* ; Remove some useless commentsStefan Kangas2021-04-161-4/+0
|
* ; Remove some redundant installation instructionsStefan Kangas2021-04-031-2/+0
|
* Delete empty "History" sectionsStefan Kangas2021-03-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | * lisp/bs.el: * lisp/calendar/timeclock.el: * lisp/cedet/semantic/bovine/grammar.el: * lisp/cedet/semantic/grammar.el: * lisp/cedet/semantic/wisent.el: * lisp/cedet/semantic/wisent/comp.el: * lisp/cedet/semantic/wisent/java-tags.el: * lisp/cedet/semantic/wisent/wisent.el: * lisp/erc/erc.el: * lisp/net/newst-treeview.el: * lisp/recentf.el: * lisp/ruler-mode.el: * lisp/textmodes/remember.el: * lisp/thumbs.el: * lisp/tree-widget.el: * lisp/vc/vc-hg.el: Delete empty "History" sections. * lisp/cedet/semantic/grammar.el (semantic-grammar-header-template): Don't add "History" section to generated file.
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-32/+23
| | | | | | | | | | | | | | | | | | | | | | Also remove some redundant `:group` arguments. * lisp/vc/vc.el (vc-ignore): Autoload. * lisp/vc/pcvs-util.el (cvs-every, cvs-union, cvs-map): Delete functions. * lisp/vc/cvs-status.el: Require `cl-lib` at runtime. (cvs-tree-tags-insert): Use `cl-mapcar` and `cl-every` instead. * lisp/vc/pcvs.el: Require `cl-lib` at runtime. (cvs-do-removal): Use `cl-every` instead. * lisp/vc/ediff-init.el: Require `ediff-util` (for `ediff-cleanup-mess` and `ediff-default-suspend-function`). * lisp/vc/pcvs-info.el (cvs-fileinfo<): Remove unused vars `subtypea` and `subtypeb`. * lisp/vc/vc-git.el: * lisp/vc/vc-bzr.el: Require `vc-dispatcher` at runtime for `vc-do-async-command`.
* Refine use of vc-dir faces; apply to all backendsProtesilaos Stavrou2021-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-dir.el (vc-default-dir-printer): Add check for the "ignored" status and make 'vc-dir-status-edited' the default face. Also extend condition for more states that qualify as "warnings". (vc-dir-ignored, vc-dir-status-ignored): Rename face for consistency. * lisp/vc/vc-git.el (vc-git-dir-printer): Use the 'vc-dir-status-edited' as the default for the Git backend. And reference the renamed face. Also stop treating the empty stash differently from other header values. * lisp/vc/vc-bzr.el (vc-bzr-dir-extra-headers): Implement new faces. * lisp/vc/vc-cvs.el (vc-cvs-dir-extra-headers): Same. * lisp/vc/vc-hg.el (vc-hg-dir-extra-headers): Same. * lisp/vc/vc-svn.el (vc-svn-dir-extra-headers): Same. This follows from the discussion in bug#46358.
* Fix vc-hg-rename-file on file names like ~/foo/barLars Ingebrigtsen2021-01-301-1/+2
| | | | | | * lisp/vc/vc-hg.el (vc-hg-rename-file): Use absolute file names, because hg doesn't like getting file names like "~/foo/bar" (bug#36932).
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright".
* Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>Dmitry Gutov2020-12-101-6/+5
| | | | | | | * lisp/vc/vc-hg.el (vc-hg-working-revision): Use 'hg log -T' instead of 'hg parent' (bug#36534). Copyright-paperwork-exempt: yes
* Prefer setq-local in vc/*.elStefan Kangas2020-12-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/add-log.el (find-change-log, change-log-mode): * lisp/vc/cvs-status.el (cvs-status-mode): * lisp/vc/diff-mode.el (diff-restrict-view, diff-find-file-name): (diff-mode, diff-setup-whitespace, diff-apply-hunk): * lisp/vc/diff.el (diff-no-select): * lisp/vc/ediff-util.el (ediff-setup): * lisp/vc/log-edit.el (log-edit, log-edit-mode): * lisp/vc/log-view.el (log-view-mode): * lisp/vc/pcvs.el (cvs-temp-buffer, cvs-make-cvs-buffer): (cvs-update-filter, cvs-mode, cvs-mode-commit) (cvs-mode-edit-log, cvs-vc-command-advice): * lisp/vc/smerge-mode.el (smerge-match-conflict): (smerge-ediff, smerge-mode): * lisp/vc/vc-annotate.el (vc-annotate-mode): (vc-annotate, vc-annotate-display): * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): * lisp/vc/vc-dir.el (vc-dir-mode): * lisp/vc/vc-dispatcher.el (vc-setup-buffer): (vc-compilation-mode, vc-start-logentry): * lisp/vc/vc-git.el (vc-git-log-view-mode): * lisp/vc/vc-hg.el (vc-hg-log-view-mode): * lisp/vc/vc-hooks.el (vc-refresh-state): * lisp/vc/vc-mtn.el (vc-mtn-log-view-mode): * lisp/vc/vc-svn.el (vc-svn-log-view-mode): * lisp/vc/vc.el (vc-register, vc-diff-internal): (vc-find-revision-save, vc-find-revision-no-save): (vc-log-internal-common, vc-region-history): Prefer setq-local.
* Clear the vc-state cache when returning nilDmitry Gutov2020-11-101-1/+4
| | | | | * lisp/vc/vc-hg.el (vc-hg-registered): Clear the vc-state cache when returning nil.
* Remove extra process call from vc-hg-registeredTom Fitzhenry2020-11-101-1/+1
| | | | | | | | | | Prefer vc-state to benefit from its caching (bug#44534) This same technique is used in vc-git.el, per commit 2018-06-28 "Remove extra process call from vc-git-find-file-hook" 93c41ce6aa64b14fc9bd7bdd0d909915a79191cd. * lisp/vc/vc-hg.el (vc-hg-registered): Use vc-state rather than vc-hg-state.
* vc-hg: use 'hg summary' to populate vc-dir headersAndrii Kolomoiets2020-08-091-17/+20
| | | | | | * lisp/vc/vc-hg.el (vc-hg-dir-extra-headers): Use 'hg summary' command. (vc-hg-dir-extra-header): Remove unused function. * etc/NEWS: Mention changes to vc-hg.el (bug#38387).
* vc-hg-create-tag: Possibility to create a branchAndrii Kolomoiets2020-08-091-3/+21
| | | | | * lisp/vc/vc-hg.el (vc-hg-create-bookmark): New user option. (vc-hg-create-tag): Use it (bug#38425).
* Add optional remote-name argument to VC repository-url commandTassilo Horn2020-06-151-2/+3
| | | | | | | | | | | * lisp/vc/vc.el: Document new remote-name argument of VC repository-url command. * lisp/vc/vc-git.el (vc-git-repository-url): Add and use new arg. * lisp/vc/vc-hg.el (vc-hg-repository-url): Add and use new arg. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): Add new arg but ignore it. * lisp/vc/vc-svn.el (vc-svn-repository-url): Add new arg but ignore it.
* Add new VC command `repository-url'Tassilo Horn2020-06-141-0/+7
| | | | | | | | * lisp/vc/vc.el: Document repository-url command. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): New defun. * lisp/vc/vc-git.el (vc-git-repository-url): New defun. * lisp/vc/vc-hg.el (vc-hg-repository-url): New defun. * lisp/vc/vc-svn.el (vc-svn-repository-url): New defun.
* Merge from origin/emacs-27Glenn Morris2020-02-131-6/+9
|\ | | | | | | | | | | | | | | | | | | | | | | 0304f53076 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory 027da652a4 Fix display of minibuffer prompt in ido.el 5a21aaff46 rx: Use longest match for all-string 'or' forms (bug#37659) 2b12c2b6f2 Make sure not to mark directories ff4ed4a0ff ; Add a TODO 3a5129a1c9 vc-hg-dir-status-files: Fix when DIR is not repository root # Conflicts: # etc/NEWS
| * ; 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).
* | Merge from origin/emacs-27Paul Eggert2020-01-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | 186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | | | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* | Use regexp type for regexps in defcustom declarationsMattias Engdegård2019-12-261-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/calendar/diary-lib.el (diary-face-attrs): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-file-match): * lisp/cedet/srecode/document.el (srecode-document-autocomment-common-nouns-abbrevs) (srecode-document-autocomment-function-alist) (srecode-document-autocomment-return-first-alist) (srecode-document-autocomment-return-last-alist) (srecode-document-autocomment-param-alist) (srecode-document-autocomment-param-type-alist): * lisp/desktop.el (desktop-clear-preserve-buffers): * lisp/elide-head.el (elide-head-headers-to-hide): * lisp/erc/erc-backend.el (erc-encoding-coding-alist): * lisp/erc/erc-ezbounce.el (erc-ezb-regexp): * lisp/files.el (auto-save-file-name-transforms): * lisp/gnus/deuglify.el (gnus-outlook-deuglify-attrib-cut-regexp) (gnus-outlook-deuglify-attrib-verb-regexp) (gnus-outlook-deuglify-attrib-end-regexp): * lisp/gnus/gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files): * lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header): * lisp/htmlfontify.el (hfy-src-doc-link-unstyle): * lisp/info-look.el (info-lookup-file-name-alist): * lisp/international/rfc1843.el (rfc1843-newsgroups-regexp): * lisp/mail/feedmail.el (feedmail-queue-slug-suspect-regexp): * lisp/mail/rmail-spam-filter.el (rsf-white-list, rsf-definitions-alist): * lisp/man.el (Man-name-local-regexp): * lisp/net/ange-ftp.el (ange-ftp-dumb-unix-host-regexp): * lisp/net/newst-backend.el (newsticker-auto-mark-filter-list): * lisp/net/rcirc.el (rcirc-authinfo, rcirc-coding-system-alist): * lisp/net/tramp-adb.el (tramp-adb-prompt): * lisp/org/org-agenda.el (org-agenda-hide-tags-regexp) (org-agenda-category-icon-alist): * lisp/org/org-protocol.el (org-protocol-data-separator): * lisp/org/org-table.el (org-table-number-regexp): * lisp/org/ox-latex.el (org-latex-known-warnings): * lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): * lisp/progmodes/hideif.el (hide-ifdef-header-regexp): * lisp/progmodes/idlw-help.el (idlwave-help-doclib-name) (idlwave-help-doclib-keyword): * lisp/progmodes/idlwave.el (idlwave-no-change-comment): * lisp/progmodes/python.el (python-shell-prompt-input-regexps) (python-shell-prompt-output-regexps, python-shell-prompt-regexp) (python-shell-prompt-block-regexp, python-shell-prompt-output-regexp) (python-shell-prompt-pdb-regexp, python-shell-compilation-regexp-alist) (python-pdbtrack-stacktrace-info-regexp): * lisp/progmodes/sql.el (sql-send-terminator, sql-ansi-statement-starters): * lisp/speedbar.el (speedbar-directory-unshown-regexp) (speedbar-file-unshown-regexp): * lisp/textmodes/flyspell.el (flyspell-mark-duplications-exceptions) (flyspell-tex-command-regexp): * lisp/textmodes/paragraphs.el (sentence-end-base): * lisp/textmodes/tildify.el (tildify-pattern, tildify-space-pattern): * lisp/vc/ediff-init.el (ediff-metachars): * lisp/vc/vc-git.el (vc-git-root-log-format): * lisp/vc/vc-hg.el (vc-hg-root-log-format): * lisp/whitespace.el (whitespace-indentation-regexp) (whitespace-space-after-tab-regexp): * lisp/woman.el (woman-manpath-man-regexp) (woman-imenu-generic-expression): Use 'regexp' instead of 'string' as type for values that are regexps in defcustom declarations.
* 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
* 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".
* 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-211-0/+49
| | | | | | | | | | | | | | | | * 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.
* 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: ability to skip update buffers promptAndrii Kolomoiets2019-11-141-0/+2
| | | | | | | | | | | * 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).
* Add ui.report_untrusted=0 to vc-hg log commandsAndrii Kolomoiets2019-10-171-2/+4
| | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-state-slow, vc-hg-merge-branch) (vc-hg-command): Add "--config" "ui.report_untrusted=0" to the log commands to avoid "Hg-not trusting file " messages in the mode line (bug#31497). Copyright-paperwork-exempt: yes
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 16:09:42 +0000