Manphiz <
[email protected]> writes:
I'm not a silversearch-ag user, but your suggestion makes sense to me.
d
Thanks David! I've prepared a merge request[1] on emacs-wgrep to
implement this idea. Would be great to have your reviews and comments.
If this is an acceptable direction to go forward I will do similar work
on other affect packages. Thanks!
[1] https://salsa.debian.org/emacsen-team/emacs-wgrep/-/merge_requests/1
To be fair, the following issue wasn't introduced by this MR, but was
this MR tested? I got:
…
Ignoring upstream Makefile and building/installing with dh-elpa.
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
dh_elpa_test
emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -L . -l wgrep-subtest.el -l
wgrep-test.el --eval \(ert-run-tests-batch-and-exit\)
Error: error ("Test ‘wgrep-normal’ redefined")
mapbacktrace(#f(compiled-function (evald func args flags) #<bytecode 0x1381f8c5ebae87c2>))
debug-early-backtrace()
debug-early(error (error "Test ‘wgrep-normal’ redefined"))
error("Test `%s' redefined" wgrep-normal)
ert-set-test(wgrep-normal #s(ert-test :name wgrep-normal :documentation nil :body (lambda nil (let ((wgrep-change-readonly-file nil) (wgrep-auto-save-buffer nil)) (progn (wgrep-test-fixture "HOGE\nFOO\nBAZ\n" #'(lambda (file) (wgrep-test--grep (concat "
grep -nH -e FOO -C 1 " file)) (wgrep-change-to-wgrep-mode) (goto-char (point-min)) (let* ((fn-122 #'re-search-forward) (args-123 (condition-case err (let ((signal-hook-function #'ert--should-signal-hook)) (list "^grep" nil t)) (error (progn (setq fn-122 #
'signal) (list (car err) (cdr err))))))) (let ((value-124 'ert-form-evaluation-aborted-125)) (let (form-description-126) (if (unwind-protect (setq value-124 (apply fn-122 args-123)) (setq form-description-126 (nconc (list '(should (re-search-forward "^
grep" nil t))) (list :form (cons fn-122 args-123)) (if (eql value-124 'ert-form-evaluation-aborted-125) nil (list :value value-124)) (if (eql value-124 'ert-form-evaluation-aborted-125) nil (let* ((-explainer- (and t (ert--get-explainer 're-search-
forward)))) (if -explainer- (list :explanation (apply -explainer- args-123)) nil))))) (ert--signal-should-execution form-description-126)) nil (ert-fail form-description-126))) value-124)) (let* ((fn-127 #'delete-char) (args-128 (condition-case err (let (
(signal-hook-function #'ert--should-signal-hook)) (list 1)) (error (progn (setq fn-127 #'signal) (list (car err) (cdr err))))))) (let ((value-129 'ert-form-evaluation-aborted-130)) (let (form-description-131) (let ((errorp132 nil) (form-description-fn-
133 #'(lambda nil form-description-131))) (condition-case -condition- (unwind-protect (setq value-129 (apply fn-127 args-128)) (setq form-description-131 (nconc (list '(should-error (delete-char 1) :type 'text-read-only)) (list :form (cons fn-127 args-
128)) (if (eql value-129 'ert-form-evaluation-aborted-130) nil (list :value value-129)) (if (eql value-129 'ert-form-evaluation-aborted-130) nil (let* ((-explainer- (and t (ert--get-explainer 'delete-char)))) (if -explainer- (list :explanation (apply -
explainer- args-128)) nil))))) (ert--signal-should-execution form-description-131)) (error (setq errorp132 t) (ert--should-error-handle-error form-description-fn-133 -condition- 'text-read-only nil) (setq value-129 -condition-))) (if errorp132 nil (ert-
fail (append (funcall form-description-fn-133) (list :fail-reason "did not signal an error")))))) value-129)) (let* ((fn-134 #'re-search-forward) (args-135 (condition-case err (let ((signal-hook-function #'ert--should-signal-hook)) (list "HOGE" nil t)) (
error (progn (setq fn-134 #'signal) (list (car err) (cdr err))))))) (let ((value-136 'ert-form-evaluation-aborted-137)) (let (form-description-138) (if (unwind-protect (setq value-136 (apply fn-134 args-135)) (setq form-description-138 (nconc (list '(
should (re-search-forward "HOGE" nil t))) (list :form (cons fn-134 args-135)) (if (eql value-136 'ert-form-evaluation-aborted-137) nil (list :value value-136)) (if (eql value-136 'ert-form-evaluation-aborted-137) nil (let* ((-explainer- (and t (ert--get-
explainer 're-search-forward)))) (if -explainer- (list :explanation (apply -explainer- args-135)) nil))))) (ert--signal-should-execution form-description-138)) nil (ert-fail form-description-138))) value-136)) (wgrep-mark-deletion) (let* ((fn-139 #'re-
search-forward) (args-140 (condition-case err (let ((signal-hook-function #'ert--should-signal-hook)) (list "FOO" nil t)) (error (progn (setq fn-139 #'signal) (list (car err) (cdr err))))))) (let ((value-141 'ert-form-evaluation-aborted-142)) (let (form-
description-143) (if (unwind-protect (setq value-141 (apply fn-139 args-140)) (setq form-description-143 (nconc (list '(should (re-search-forward "FOO" nil t))) (list :form (cons fn-139 args-140)) (if (eql value-141 'ert-form-evaluation-aborted-142) nil (
list :value value-141)Test ‘wgrep-normal’ redefined
) (if (eql value-141 'ert-form-evaluation-aborted-142) nil (let* ((-explainer- (and t (ert--get-explainer 're-search-forward)))) (if -explainer- (list :explanation (apply -explainer- args-140)) nil))))) (ert--signal-should-execution form-description-143))
nil (ert-fail form-description-143))) value-141)) (replace-match "FOO2") (goto-char (point-max)) (let* ((fn-144 #'delete-char) (args-145 (condition-case err (let ((signal-hook-function #'ert--should-signal-hook)) (list -1)) (error (progn (setq fn-144 #'
signal) (list (car err) (cdr err))))))) (let ((value-146 'ert-form-evaluation-aborted-147)) (let (form-description-148) (let ((errorp149 nil) (form-description-fn-150 #'(lambda nil form-description-148))) (condition-case -condition- (unwind-protect (setq
value-146 (apply fn-144 args-145)) (setq form-description-148 (nconc (list '(should-error (delete-char -1) :type 'text-read-only)) (list :form (cons fn-144 args-145)) (if (eql value-146 'ert-form-evaluation-aborted-147) nil (list :value value-146)) (if (
eql value-146 'ert-form-evaluation-aborted-147) nil (let* ((-explainer- (and t (ert--get-explainer 'delete-char)))) (if -explainer- (list :explanation (apply -explainer- args-145)) nil))))) (ert--signal-should-execution form-description-148)) (error (
setq errorp149 t) (ert--should-error-handle-error form-description-fn-150 -condition- 'text-read-only nil) (setq value-146 -condition-))) (if errorp149 nil (ert-fail (append (funcall form-description-fn-150) (list :fail-reason "did not signal an error")))
))) value-146)) (wgrep-finish-edit) (wgrep-save-all-buffers) (let* ((fn-151 #'equal) (args-152 (condition-case err (let ((signal-hook-function #'ert--should-signal-hook)) (list "FOO2\nBAZ\n" (wgrep-test--get-contents file))) (error (progn (setq fn-151 #'
signal) (list (car err) (cdr err))))))) (let ((value-153 'ert-form-evaluation-aborted-154)) (let (form-description-155) (if (unwind-protect (setq value-153 (apply fn-151 args-152)) (setq form-description-155 (nconc (list '(should (equal "FOO2\nBAZ\n" (
wgrep-test--get-contents file)))) (list :form (cons fn-151 args-152)) (if (eql value-153 'ert-form-evaluation-aborted-154) nil (list :value value-153)) (if (eql value-153 'ert-form-evaluation-aborted-154) nil (let* ((-explainer- (and t (ert--get-
explainer 'equal)))) (if -explainer- (list :explanation (apply -explainer- args-152)) nil))))) (ert--signal-should-execution form-description-155)) nil (ert-fail form-description-155))) value-153))))))) :most-recent-result nil :expected-result-type :
passed :tags (wgrep) :file-name "/<<PKGBUILDDIR>>/wgrep-test.el"))
load-with-code-conversion("/<<PKGBUILDDIR>>/wgrep-test.el" "/<<PKGBUILDDIR>>/wgrep-test.el" nil t)
command-line-1(("-l" "package" "--eval" "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" "--eval" "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" "-f" "package-initialize" "-L" "." "-l" "wgrep-
subtest.el" "-l" "wgrep-test.el" "--eval" "(ert-run-tests-batch-and-exit)"))
command-line()
normal-top-level()
dh_elpa_test: error: emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -L . -l wgrep-
subtest.el -l wgrep-test.el --eval \(ert-run-tests-batch-and-exit\) returned exit code 255
make: *** [debian/rules:4: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
I think that's unrelated to silversearcher-ag though ;)
Meanwhile (non Emacs), if you want to fix all packages in the archive
that depend on silversearcher-ag, in one shot:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999962#18
BTW, are you subscribed to this mailing list? In Debian we
conventionally don't CC people on mailing lists, even though we do CC
people on bugs.
Regards,
Nicholas
--=-=-Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCgAuFiEE4qYmHjkArtfNxmcIWogwR199EGEFAmT2QjYQHHN0ZW5AZGVi aWFuLm9yZwAKCRBaiDBHX30QYUsLEACZYrAxwCuLaOXkdxuyZgE2Mi7dgNVcPqYt 0R+BTA+AyTG9l65Y+LstB8LTm53i5fnC61wIQ8VVYpFe0Z1visvVCsoHJYbgcTFl d5OF0GeXH1a+PLkDVPJFeDUtIZqn4pYlcsAX9Zw5x8+nw5iC5iL2eYDOABPrlzgc 95QnqT1JdbZ6foSXCSrsW/GrSELOTpleBfG/dyPVcMfuT8tVewZrNPEl9NfNJflv nPMbLpT3EjSB2f4F8DcatjVo0S2XKqncDOiWikrX+08KejChgItinNkwM96TDNzg UgvDCZeUQciB5424VqZpP6SbpvuNlBayfEZPljCtcwMandbmqf7IS5AYySD29t59 EQKG1ppUR4JtsrNl9o8F5NnSAQW2XhmtvTZkpVHiVyx/k50LzEynsFV+mQdzVDpd sacGJQtTq6Yuha/VcsbXZu9EJn2Mb1vfFsvyMkV7KR/Hs8QYaX+2xnMxpZXF+DHS pWRNTiAds+u3XATIi0+T038JDeWvI3W2yKVaHF32VAbvnhJ8fDd54KrNv81+HQOh 1OQx18ah9HbeazntOCKx2h8d3kz0AMklMJ/vAoqOQP6/ybu6oKdiOxprSkMfFucG 8xvyZS8SlUiPLI3KU6VAazPFCCmDtCvJQr8C4nfoqsIAgwjHHG7X4aVF2k47BlEc sxqvX8xlWA==lRYw
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)