aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp/vc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* test subdirectory: Use new error-APIStefan Monnier105 min.2-3/+2
| | | | | | | | | | | | | | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--run-maybe-unsupported-function): Remove dummy branch in `condition-case`. * test/lisp/arc-mode-tests.el (define-arc-mode-test-on-type): Use `error-slot-value`. * test/src/process-tests.el (process-tests--ignore-EMFILE): * test/src/filelock-tests.el (filelock-tests-unlock-spoiled) (filelock-tests-kill-buffer-spoiled): * test/lisp/vc/vc-git-tests.el (vc-git-test--run): * test/lisp/proced-tests.el (proced--assert-process-valid-cpu-refinement): * test/lisp/emacs-lisp/pp-tests.el (pp-tests--sanity): * test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-with-normal-env) (edebug-tests-post-command): * test/lisp/autorevert-tests.el (auto-revert--deftest-remote): * test/infra/android/test-controller.el (ats-connect):
* Revert "Repair serious breakage in the batch tests."Michael Albinus6 days1-2/+0
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit feac53141577161c32a7a6dfe75399a5ae98a7c1. This patch has deactivated 253 test cases without a sufficient reasoning. Instead it speaks about a shotgun in its commite message. The patch is reverted because - It hasn't been discussed on emacs-devel. It should have, because it is a serious change in our infrastructure (new official tag :nobatch). Any documentation of this change, for example in test/README, is missing. - The proper way to deactivate such tests would have been (skip-when noninteractive) Even better to skip for the respective reasons. - There is no fault report. There is no information about how these tests have failed. Since it hasn't been a problem so far for us, nobody will work on a fix forever.
* Repair serious breakage in the batch tests.Eric S. Raymond13 days1-0/+2
| | | | | | | | | | | | | | There were a bunch of tests that were breaking make check and should never be run in batch mode, because they do things like assuming there is a controlling tty or assuming we can access network services when we can't (e/g. in a CI/CD environment). I have shotgunned this problem by tagging all the failing tests with :nobatch and then changing the default and expensive selectors so make check won't barf all over its shoes. As many of these :nobatch should be individually removed as possible, after upgrading the test harness to mock the environmental stuff they need. Investigate these failures with "make check-nobatch".
* Fix VC Git error when patch matches staged changesPaul Nelson2026-02-231-0/+13
| | | | | | | | * lisp/vc/vc-git.el (vc-git--checkin): Check that patch-string is not empty before applying it. This prevents an error when the patch exactly matches the index (bug#80228). * test/lisp/vc/vc-git-tests.el (vc-git-test-checkin-patch-staged-diff): New test.
* ; * test/lisp/vc/ediff-mult-tests.el: use ert-with-temp-directoryMattias Engdegård2026-02-051-24/+20
| | | | Suggested by Pip Cet.
* ediff-mult-tests.el: remove temporary directory after testMattias Engdegård2026-02-041-18/+21
| | | | * test/lisp/vc/ediff-mult-tests.el (ediff-test-bug3348): Clean up.
* Make vc-git-tests work with git < 2.46Mattias Engdegård2026-02-041-1/+1
| | | | | | * test/lisp/vc/vc-git-tests.el (vc-git-test-branch-remotes): The 'unset' subcommand to 'git config' was introduced in git 2.46; use the '--unset' option instead.
* Factor out vc-git--branch-remotesSean Whitton2026-01-301-0/+35
| | | | | | | * lisp/vc/vc-git.el (vc-git--branch-remotes): New function. (vc-git-trunk-or-topic-p): Use it. * test/lisp/vc/vc-git-tests.el (vc-git-test-branch-remotes): New test.
* Automatically detect the VC outgoing base (bug#80006)Sean Whitton2026-01-171-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git--current-branch): Rename to ... (vc-git-working-branch): ... this. All uses changed. (vc-git-trunk-or-topic-p, vc-git-topic-outgoing-base): * lisp/vc/vc-hg.el (vc-hg--working-branch, vc-hg-working-branch) (vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base): * lisp/vc/vc-hooks.el (vc--safe-branch-regexps-p): * lisp/vc/vc.el (vc-default-working-branch) (vc-default-trunk-or-topic-p, vc--match-branch-name-regexps) (vc--outgoing-base, vc--outgoing-base-mergebase) (vc--maybe-read-outgoing-base): New functions. (vc-diff-outgoing-base): Call vc--outgoing-base-mergebase. (vc-root-diff-outgoing-base, vc-diff-outgoing-base): Use vc--maybe-read-outgoing-base in interactive specification. (working-branch, trunk-or-topic-p, topic-outgoing-base): New specifications for backend functions. (vc-trunk-branch-regexps, vc-topic-branch-regexps): New variables. * .dir-locals.el: Commented entries for the new variables. * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-match-branch-name-regexps): New test. * doc/emacs/vc1-xtra.texi (Outstanding Changes): Document the new functionality.
* ; * test/lisp/vc/vc-tests/vc-tests.el: Fix authorship metadata.Sean Whitton2026-01-141-1/+1
|
* ; Add 2026 to copyright years.Sean Whitton2026-01-0113-13/+13
|
* December 2025 spelling fixesPaul Eggert2025-12-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the fixes are to continue to use American rather than British spelling. * doc/misc/modus-themes.org (my-modus-themes-engraved-faces): Fix misspelled ‘:foreground’s. * etc/themes/modus-themes.el (modus-themes-faces): Fix misspelled ‘modus-themes-bold’. * lisp/emacs-lisp/rx.el (rx--normalize-char-pattern): Rename from rx--normalise-char-pattern. (rx--optimize-or-args): Rename from rx--optimise-or-args. * lisp/frame.el (frame--special-parameters): Fix misspelled "right-divider-width". * lisp/net/tramp.el (tramp-fingerprint-prompt-regexp): Use American spelling “centered”, to match current libfprintf. * lisp/org/org-fold-core.el (org-fold-core--optimize-for-huge-buffers): Rename from org-fold-core--optimise-for-huge-buffers. (org-fold-core-update-optimization): Rename from org-fold-core-update-optimisation, leaving an alias behind. (org-fold-core-remove-optimization): Rename from org-fold-core-remove-optimisation, leaving an alias behind. * lisp/org/org.el (org-advertized-archive-subtree): This alias is now obsolete. * lisp/play/zone.el (zone-ignored-buffers): Fix misspelling of ‘zone--buffer-encrypted-p’. * lisp/progmodes/csharp-mode.el (csharp-ts-mode-faces): Fix misspelling of ‘csharp’ group. * lisp/vc/vc.el (vc-clonable-backends-custom-type): Rename from vc-cloneable-backends-custom-type, leaving an alias behind. * test/lisp/emacs-lisp/bytecomp-tests.el: (bytecomp-tests--warn-arity-non-compiled-callee): Rename from bytecomp-tests--warn-arity-noncompiled-callee. (bytecomp-test-defface-spec): Reword a deliberate misspelling of “default” that is so common I don’t want it to pollute the spelling dictionary. * test/lisp/emacs-lisp/package-vc-tests.el: (package-vc-tests-preserve-artifacts): Rename from package-vc-tests-preserve-artifacts. * test/lisp/eshell/em-prompt-tests.el: (em-prompt-test/forward-backward-paragraph-1): Reword a deliberate misspelling of “goodbye” that is so common I don’t want it to pollute the spelling dictionary.
* Update email in vc-tests and vc-git-testsPrzemysław Kryger2025-12-092-2/+2
| | | | | | | | * test/lisp/vc/vc-git-tests.el (vc-git-test--with-repo): Use example.com, domain following RFC 2606. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-author-identity): Use example.com, domain following RFC 2606.
* ; vc-test-exec-after-3: Delete unused FAILS local value.Sean Whitton2025-12-071-1/+0
|
* Check for successful exit when parsing output with vc-exec-afterSean Whitton2025-12-071-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using vc-exec-after to parse program output, check that the program didn't die to a signal or exit with an error exit code before attempting the parse. Continue to use plain vc-run-delayed where we aren't parsing output, because in these cases it doesn't matter to CODE if the output is incomplete. * lisp/vc/vc-dispatcher.el (vc-exec-after): <process-status>: Treat PROC dying to a signal the same as PROC exiting non-zero. (vc-exec-after): <accept-process-output>: Restore making a nonblocking call, for the case of vc-exec-after called from a process sentinel. diff-hl *does* require this. (vc-exec-after): <OKSTATUS>: New parameter, replacing SUCCESS, which never worked as documented. * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-exec-after-3): Test it. (vc-run-delayed-success): New macro. * lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): * lisp/vc/vc-hg.el (vc-hg-dir-status-files): * lisp/vc/vc.el (vc-pull-and-push): Use it. * lisp/obsolete/vc-arch.el (vc-exec-after): * lisp/obsolete/vc-mtn.el (vc-exec-after): * lisp/vc/vc-bzr.el (vc-exec-after): * lisp/vc/vc-cvs.el (vc-exec-after): * lisp/vc/vc-git.el (vc-exec-after): * lisp/vc/vc-hg.el (vc-exec-after): * lisp/vc/vc-svn.el (vc-exec-after): Update declarations.
* Handle copying additions & removals between working treesSean Whitton2025-11-291-1/+116
| | | | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-file-kill): New optional DELETE parameter. (diff-kill-creations-deletions): * lisp/vc/vc.el (vc--fileset-by-state): New functions. (diff-kill-creations-deletions, diff-filename-drop-dir) (diff-hunk-file-names, diff-file-next, diff-hunk-header-re) (vc-dir-resynch-file): Declare. (vc--apply-to-other-working-tree): Handle copying and moving files in the added, removed, missing and unregistered states. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--apply-to-other-working-tree): New test.
* ; * test/lisp/vc/vc-tests/vc-test-misc.el: Fix compiler warnings.Sean Whitton2025-11-201-6/+8
|
* vc-do-command: Support discarding standard errorSean Whitton2025-11-101-0/+60
| | | | | | | | | | | | | * lisp/vc/vc-dispatcher.el (vc-do-command): Support discarding standard error. * lisp/vc/vc-hg.el (vc-hg-dir-status-files): Discard standard error of 'hg status' to avoid parsing mistakes. (vc-hg-command): Update docstring given new meaning of first argument to vc-do-command. * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-do-command-1) (vc-test-do-command-2, vc-test-do-command-3) (vc-test-do-command-4, vc-test-do-command-5) (vc-test-do-command-6, vc-test-do-command-7): New tests.
* Adapt vc-test-misc to MS-WindowsEli Zaretskii2025-11-081-6/+18
| | | | | | | | | * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-exec-after-1) (vc-test-exec-after-2, vc-test-exec-after-3) (vc-test-exec-after-4, vc-test-exec-after-5): Fix shell commands for MS-Windows: use "&" instead of ";" and don't use fractional times for 'sleep', as some Windows ports of 'sleep' don't support that.
* New tests for vc-exec-afterSean Whitton2025-11-071-0/+88
| | | | | | | | * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test--exec-after-wait): New macro. (vc-test-exec-after-1, vc-test-exec-after-2) (vc-test-exec-after-3, vc-test-exec-after-4) (vc-test-exec-after-5): New tests.
* ; * test/lisp/vc/vc-tests/vc-tests.el: use write-region, againMattias Engdegård2025-10-201-1/+1
|
* vc-test--with-temp-change: Use write-regionSean Whitton2025-10-201-1/+1
| | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-temp-change): Use write-region (bug#79657).
* vc-rename-file: Make it work regardless of default-directorySean Whitton2025-10-191-1/+9
| | | | | | | | * lisp/vc/vc.el (vc-rename-file): Make it work regardless of default-directory; now the only influence of default-directory should be resolving OLD and NEW if they are relative file names. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--rename-file): Test the influence of default-directory on vc-rename-file.
* VC: Use symbolic names for the working revisionSean Whitton2025-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-diff): When OLDVERS is ".", behave the same as if OLDVERS was the actual working revision. (vc-hg-previous-revision): Return ".~1" for input ".", ".~3" for input ".^^" et cetera. Also, when passed non-symbolic revisions, use "REV~1" instead of "REV^" for MS-Windows compatibility. (vc-hg-working-revision-symbol): * lisp/vc/vc-git.el (vc-git-working-revision-symbol): * lisp/vc/vc-hooks.el (vc-symbolic-working-revision): New functions. (vc-default-mode-line-string): * lisp/vc/ediff-vers.el (ediff-vc-merge-internal): * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): * lisp/vc/vc.el (vc-diff-build-argument-list-internal) (vc-diff-outgoing, vc-revision-other-window, vc-default-revert): Call vc-symbolic-working-revision. (vc-buffer-revision): Specify that this should always be a revision number/hash, not a symbolic name. * lisp/vc/vc-git.el (vc-git-previous-revision): Return "HEAD~1" for input "HEAD", "HEAD~3" for input "HEAD^^" et cetera.
* vc-add-working-tree: Finish by starting DiredSean Whitton2025-10-011-9/+5
| | | | | | | | | | There won't be any uncommitted changes in the new working tree yet, so vc-dir is unlikely to be useful. * lisp/vc/vc.el (vc-add-working-tree): Finish by calling 'dired' not 'vc-dir'. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): Delete stubbing out 'vc-dir'.
* vc-test--checkin-patch: Use atomic change groupsSean Whitton2025-09-301-19/+20
| | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-temp-change): New macro. (vc-test--checkin-patch): Use it.
* vc-test--checkin-patch: Restore alternative revert code pathSean Whitton2025-09-271-1/+9
| | | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): For the last stage of the test, restore alternative code path for Git, though this time limited to when running the test on MS-Windows. Cf. subthread starting from <https://lists.gnu.org/archive/html/emacs-devel/2025-09/msg00785.html>.
* vc-test--checkin-patch: Use {author} not {user}Sean Whitton2025-09-261-1/+1
| | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): Use Mercurial template '{author}' not '{user}' for compatibility.
* vc-git--checkin: Apply PATCH-STRING to working treeSean Whitton2025-09-241-9/+1
| | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git--with-apply-temp-to-staging): Rename ... (vc-git--with-apply-temp): ... to this. New ARGS parameter. All uses changes. (vc-git--checkin): In POST function, apply PATCH-STRING to the working tree with 'git apply --3way --ours'. * lisp/vc/vc-hg.el (vc-hg--checkin): Document what the call to 'hg update' is for. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): Delete completed FIXME and workaround.
* VC checkin-patch: Support extracting commit metadata from patchesSean Whitton2025-09-211-1/+128
| | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git--mailinfo): New function. (vc-git-checkin-patch): Use it to extract authorship, date and log message information from patches. (vc-git--call): New INFILE argument. All uses changed. * lisp/vc/vc-hg.el (vc-hg--checkin): When COMMENT is nil, take authorship, date and log message information from the patch. * lisp/vc/vc.el (checkin-patch): Specify to use authorship, date and comment information in PATCH-STRING (bug#79408). (prepare-patch): Specify that patch should include authorship identity, date and log message information for REV if supported. (diff-bounds-of-hunk): Declare. (vc-default-checkin-patch): Warn if it looks like we will ignore patch authorship information. * test/lisp/vc/vc-tests/vc-tests.el (vc-hg-command) (vc-git--out-str): Declare. (vc-test--checkin-patch): New function. (vc-test-git08-checkin-patch, vc-test-hg08-checkin-patch): New tests.
* Rename arg REMOTE-LOCATION -> UPSTREAM-LOCATIONSean Whitton2025-09-011-2/+2
| | | | | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-log-incoming) (vc-bzr-incoming-revision, vc-bzr-log-outgoing): * lisp/vc/vc-git.el (vc-git-incoming-revision): * lisp/vc/vc-hg.el (vc-hg-incoming-revision): * lisp/vc/vc.el (vc-root-diff-incoming, vc-diff-incoming) (vc-root-diff-outgoing, vc-diff-outgoing) (vc-root-diff-outgoing-base, vc-diff-outgoing-base) (vc-incoming-outgoing-internal, vc-remote-location-history) (vc--incoming-revision, vc-log-incoming, vc-default-log-incoming) (vc-log-outgoing, vc-default-log-outgoing): Rename arguments REMOTE-LOCATION -> UPSTREAM-LOCATION. Adjust strings. (vc--maybe-read-remote-location): Rename ... (vc--maybe-read-upstream-location): ... to this.
* vc-test--with-author-identity: Handle MercurialSean Whitton2025-08-161-3/+9
| | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-hg-global-switches): Declare. (vc-test--with-author-identity): Handle Mercurial.
* vc-test--other-working-trees: Export env vars so Git finds an authorSean Whitton2025-08-121-158/+164
| | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--with-author-identity): New macro, factored out of vc-test--version-diff. (vc-test--version-diff, vc-test--other-working-trees): Use it.
* vc-test--other-working-trees: Fix a skip conditionSean Whitton2025-08-121-16/+16
| | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): For Git, don't try moving the first working tree unless we have Git>=2.29.
* vc-test-git07-other-working-trees: Widen scope of skip on Git<=2.17Sean Whitton2025-08-121-27/+28
| | | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): Delete condition to skip 'move-working-tree' tests on Git<=2.17. (vc-test-git07-other-working-trees): Skip this whole test on Git<=2.17 (discussion in bug#79024).
* Fix some 'git worktree' compatibility issuesSean Whitton2025-08-101-26/+31
| | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-delete-working-tree): Reimplement to avoid requiring 'git worktree remove'. (vc-git-move-working-tree): Use 'git worktree move' if 'git worktree repair' is not available. Give a more informative error message if we don't even have that. * test/lisp/vc/vc-tests/vc-tests.el (vc-git--program-version): Declare. (vc-test--other-working-trees): Skip vc-move-working-tree tests with Git old enough to lack 'git worktree move'.
* Fix vc-git worktrees and vc-tests for directories with symlinksMattias Engdegård2025-08-041-6/+9
| | | | | | | * lisp/vc/vc-git.el (vc-git-known-other-working-trees): * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): Tolerate directories with symlinks in them, such as the standard temporary dirs on MacOS. 'git worktree list' outputs expanded names.
* vc-test--other-working-trees: Stub out 'vc-dir'Sean Whitton2025-07-271-5/+9
| | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): Stub out 'vc-dir' when adding the second working tree.
* vc-tests: Fix two problems with other working tree testsSean Whitton2025-07-271-4/+12
| | | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (project, cl-lib): Require. (vc-test--other-working-trees): Bind project-list-file to a writeable file name. (vc-test-hg07-other-working-trees): Use vc-hg-global-switches to enable the share extension.
* ; vc-test--other-working-trees: Fix unused variable warning.Sean Whitton2025-07-261-1/+1
|
* VC: New support for other working treesSean Whitton2025-07-251-1/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git--read-start-point): New function, factored out of vc-git-create-tag. (vc-git-create-tag): Use it. (vc-git--worktrees, vc-git-known-other-working-trees) (vc-git-add-working-tree, vc-git-delete-working-tree) (vc-git-move-working-tree): * lisp/vc/vc-hg.el (vc-hg-known-other-working-trees) (vc-hg-add-working-tree, vc-hg--shared-p) (vc-hg-delete-working-tree, vc-hg-move-working-tree): New functions. * lisp/vc/vc.el: Define API for known-other-working-tree, add-working-tree, delete-working-tree and move-working-tree backend functions. (vc-dir-status-files): New function. (project-current-directory-override): Declare. (dired-rename-subdir): Autoload. (vc-add-working-tree, vc-switch-working-tree) (vc-delete-working-tree, vc-move-working-tree): New commands. * lisp/vc/vc-hooks.el (vc-prefix-map): Bind them under C-x v. * doc/emacs/vc1-xtra.texi (Other Working Trees): New node. * etc/NEWS: Announce the new commands. * test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees): New function. (vc-test-git07-other-working-trees) (vc-test-hg07-other-working-trees): New tests. * lisp/ldefs-boot.el: Regenerate.
* vc-test--version-diff: Bind vc-async-checkinSean Whitton2025-07-251-1/+2
| | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test--version-diff): Bind vc-async-checkin to disable async checkins during test.
* ; * test/lisp/vc/vc-tests/vc-tests.el (vc-test--version-diff): Fix for Bzr.Eli Zaretskii2025-07-151-0/+2
|
* VC: Deprecate log-incoming and log-outgoing backend functionsSean Whitton2025-06-061-2/+2
| | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-incoming-revision): Inline vc-git--fetch-incoming. (vc-git--fetch-incoming, vc-git-log-incoming) (vc-git-log-outgoing): Delete. * lisp/vc/vc-hg.el (vc-hg-mergebase): * lisp/vc/vc.el (vc-default-log-incoming) (vc-default-log-outgoing): New functions. * lisp/vc/vc.el: * etc/NEWS: Document the deprecation.
* ; Fix VC testsEli Zaretskii2025-05-092-1/+6
| | | | | | | | | * test/lisp/vc/vc-tests/vc-tests.el (vc-test-hg06-version-diff): Skip on MS-Windows in batch mode. * test/lisp/vc/vc-git-tests.el (vc-git-test--start-branch): More portable command for showing the current branch ("--show-current" is only available since Git 2.22).
* Create new test/lisp/vc/vc-tests/ for vc.el testsSean Whitton2025-05-092-3/+3
| | | | | | | * test/lisp/vc/vc-tests.el: Move ... * test/lisp/vc/vc-tests/vc-tests.el: ... to here. * test/lisp/vc/vc-misc-tests.el: Move ... * test/lisp/vc/vc-tests/vc-test-misc.el: ... to here.
* Improve syncing VC buffers before generating diffsSean Whitton2025-04-271-0/+67
| | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-maybe-buffer-sync): Delete. Correct handling of indirect buffers is now implicitly achieved by vc-buffer-sync-fileset. (vc-buffer-sync-fileset): Make NOT-ESSENTIAL argument optional, new MISSING-IN-DIRS optional argument. Rewrite to handle directories named in the fileset, not only files. (vc-ediff): Replace call to vc-maybe-buffer-sync with a call to vc-buffer-sync-fileset. (vc-root-diff): Similarly replace call to vc-maybe-buffer-sync. This means the user is prompted to save additional buffers, that they likely want to save before generating the diffs. * test/lisp/vc/vc-misc-tests.el: New file.
* Fix emerge.el for remote filesMichael Albinus2025-04-201-0/+81
| | | | | | | | * lisp/vc/emerge.el (emerge-make-diff-list) (emerge-make-diff3-list): Set proper `default-directory' in order to support remote files. (Bug#6850, Bug#74352) * test/lisp/vc/emerge-tests.el: New file.
* ; Fix failing diff-mode testsStefan Kangas2025-04-192-85/+85
| | | | | | | | | | | * test/lisp/vc/diff-mode-resources/git.patch: Delete file, moving its contents to... * test/lisp/vc/diff-mode-tests.el (diff-mode-tests--git-patch): ...this new variable. Git merges kept deleting a trailing whitespace in the patch signature, so let's do this instead. (diff-mode-test-git-patch) (diff-mode-test-git-patch/before-first-hunk) (diff-mode-test-git-patch/signature): Use above new variable.
* Merge from savannah/emacs-30Yuan Fu2025-04-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 01d4eb3dd42 ; Improve doc string of 'insert-char' 93ad8407ed8 * admin/notes/emba: Fix docker build instruction. b901290ae7f * doc/lispref/text.texi (Margins): Grammar fix. 16855c89dde Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/... 8792d3431b1 Backport: Fix tree-sitter tests on Emba # Conflicts: # test/infra/Dockerfile.emba
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-10 16:32:56 +0000