bug#55427: emacs-libgit tests are broken

bug#55427: emacs-libgit tests are broken

[Liliana Marie Prikler]

With the update to Emacs 28, emacs-libgit (a requirement for emacs-
magit) fails to build with the following test error:

Test project /tmp/guix-build-emacs-libgit-20200515-1.0ef8b13.drv-
0/build
      Start  1: libegit2_annotated-commit
 1/29 Test  #1: libegit2_annotated-commit ........   Passed    0.38 sec
      Start  2: libegit2_blame
 2/29 Test  #2: libegit2_blame ...................   Passed    0.39 sec
      Start  3: libegit2_blob
 3/29 Test  #3: libegit2_blob ....................***Failed    0.43 sec
Running 4 tests (2022-05-15 07:25:56+0000, selector ‘t’)
Test blob-binary backtrace:
  signal(wrong-type-argument (utf-8-string-p "\177ELF\2\1\1\0\0\0\0\0\
  apply(signal (wrong-type-argument (utf-8-string-p "\177ELF\2\1\1\0\0
  (setq value-42 (apply fn-40 args-41))
  (unwind-protect (setq value-42 (apply fn-40 args-41)) (setq form-des
  (if (unwind-protect (setq value-42 (apply fn-40 args-41)) (setq form
  (let (form-description-44) (if (unwind-protect (setq value-42 (apply
  (let ((value-42 'ert-form-evaluation-aborted-43)) (let (form-descrip
  (let* ((fn-40 #'string=) (args-41 (condition-case err (let ((signal-
  (let* ((repo (libgit-repository-open path)) (blob (libgit-revparse-s
  (let ((default-directory path)) (init) (commit-change "filename" str
  (progn (make-directory path 'parents) (let ((default-directory path)
  (unwind-protect (progn (make-directory path 'parents) (let ((default
  (let ((path "/tmp/guix-build-emacs-libgit-20200515-1.0ef8b13.dr...")
  (let* ((str (unibyte-string 127 69 76 70 2 1 1 0 0 0 0 0 0 0 0 0 3 0
  (let ((lexical-binding nil)) (let* ((str (unibyte-string 127 69 76 7
  (lambda nil (let ((lexical-binding nil)) (let* ((str (unibyte-string
  ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
  ert-run-test(#s(ert-test :name blob-binary :documentation nil :body 
  ert-run-or-rerun-test(#s(ert--stats :selector t :tests [#s(ert-test 
  ert-run-tests(t #f(compiled-function (event-type &rest event-args) #
  ert-run-tests-batch(nil)
  ert-run-tests-batch-and-exit()
  command-line-1(("-L" "/tmp/guix-build-emacs-libgit-20200515-1.0ef8b1
  command-line()
  normal-top-level()
Test blob-binary condition:
    (wrong-type-argument utf-8-string-p
"\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\7\0\0\0\0\0\0@\0\0\
0\0\0\0\0\270\33\0\0\0\0\0\0\0\0\0\0@\08\0\11\0@\0\35\0\34\0\6\0\0\0\5\
0\0\0@\0\0\0\0\0\0\0")
   FAILED  1/4  blob-binary (0.041795 sec)
   passed  2/4  blob-create-fromdisk (0.023014 sec)
   passed  3/4  blob-create-fromstring (0.022546 sec)
   passed  4/4  blob-text (0.044085 sec)

Ran 4 tests, 3 results as expected, 1 unexpected (2022-05-15
07:25:56+0000, 0.301178 sec)

1 unexpected results:
   FAILED  blob-binary
[...]

I have no idea what causes it or where utf-8-string-p even comes from,
but the implementation of string= appears to have changed.  When
running the build locally another test also appears flaky due to weird
time stamp conversions.

Cheers

bug#55427: emacs-libgit tests are broken

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

Issue submitted to upstream with my guess and explanation.

https://github.com/magit/libegit2/issues/121

This issue is not trivial and there's no way to workaround it IMO. 
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

bug#55427: emacs-libgit tests are broken

[Taiju HIGASHI]

Hi,

I was also watching for this issue.
It seems that the libegit2 repository has just reported this issue.

https://github.com/magit/libegit2/issues/121

- taiju

bug#55427: emacs-libgit tests are broken

[Taiju HIGASHI]

Sorry, the timing of my post was wrong.

To Zihao:
Thanks for reporting the issue.

bug#55427: emacs-libgit tests are broken

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 578 bytes --]


Due to the inactive status of upstream. I'm planning to remove the
emacs-libgit input of emacs-magit.

magit will still work with the git executable if there's no
emacs-libgit.

Any thoughts?


Zhu Zihao <all_but_last@163.com> writes:

> [[PGP Signed Part:Undecided]]
> Issue submitted to upstream with my guess and explanation.
>
> https://github.com/magit/libegit2/issues/121
>
> This issue is not trivial and there's no way to workaround it IMO. 


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

bug#55427: emacs-libgit tests are broken

[Kyle Meyer]

Zhu Zihao writes:

> Due to the inactive status of upstream. I'm planning to remove the
> emacs-libgit input of emacs-magit.
>
> magit will still work with the git executable if there's no
> emacs-libgit.
>
> Any thoughts?

Good idea.  There's no real downside to disabling libgit2 support
because magit-libgit.el does very little at this point.

bug#55427: emacs-libgit tests are broken

[Liliana Marie Prikler]

Am Dienstag, dem 17.05.2022 um 23:14 +0800 schrieb Zhu Zihao:
> Due to the inactive status of upstream. I'm planning to remove the
> emacs-libgit input of emacs-magit.
I don't think we need measures quite as drastic as this.  A hotfix for
emacs-libgit was pushed to master, which causes builds to succeed again
(see e.g. [1]).  Since we're talking about free software here, it would
be more constructive to work on a proper patch – if upstream won't take
it, one can always fork it.

> magit will still work with the git executable if there's no
> emacs-libgit.
> 
> Any thoughts?
I don't see any benefits in this approach, do you?

[1] http://ci.guix.gnu.org/build/859957/details

bug#55427: emacs-libgit tests are broken

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

Zhu Zihao schreef op di 17-05-2022 om 23:14 [+0800]:
> magit will still work with the git executable if there's no
> emacs-libgit.
> 
> Any thoughts?

Due to issues with TRAMP, magit currently cannot always find the git
executable, while AFAICT there are no problems with emacs-libgit.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#55427: emacs-libgit tests are broken

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]


magit doesn't use libgit for remote directory.

Maybe there're other reasons that make your magit work on remote file :P. 

https://github.com/magit/magit/blob/master/lisp/magit-git.el#L93

Maxime Devos <maximedevos@telenet.be> writes:

> [[PGP Signed Part:Undecided]]
> Zhu Zihao schreef op di 17-05-2022 om 23:14 [+0800]:
>> magit will still work with the git executable if there's no
>> emacs-libgit.
>> 
>> Any thoughts?
>
> Due to issues with TRAMP, magit currently cannot always find the git
> executable, while AFAICT there are no problems with emacs-libgit.
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

bug#55427: emacs-libgit tests are broken

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 968 bytes --]


Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> writes:

>> magit will still work with the git executable if there's no
>> emacs-libgit.
>> 
>> Any thoughts?
> I don't see any benefits in this approach, do you?
>
> [1] http://ci.guix.gnu.org/build/859957/details

I don't see any benefits on libgit implementation.
The only method supported by libgit backend is `magit-bare-repo-p`[1],
magit use git executable to do 99.9% works.

The libgit backend should be a separated package. There's
https://github.com/magit/magit/blob/master/lisp/magit-libgit-pkg.el for
it. Its quaility is poor because it's currently in POC status and the
development status has been put on hold indefinitely.[2]

[1] https://github.com/magit/magit/blob/master/lisp/magit-libgit.el#L79

[2] https://github.com/magit/magit/issues/2959#issuecomment-1112185169
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

bug#55427: emacs-libgit tests are broken

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

Zhu Zihao schreef op wo 18-05-2022 om 21:13 [+0800]:
> magit doesn't use libgit for remote directory.
>
> Maybe there're other reasons that make your magit work on remote file
> :P. 
> 
> https://github.com/magit/magit/blob/master/lisp/magit-git.el#L93

My concern is about not breaking the local use case.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#55427: emacs-libgit tests are broken

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Maxime Devos schreef op wo 18-05-2022 om 15:24 [+0200]:
> Zhu Zihao schreef op wo 18-05-2022 om 21:13 [+0800]:
> > magit doesn't use libgit for remote directory.
> > 
> > Maybe there're other reasons that make your magit work on remote
> file
> > :P. 
> > 
> > https://github.com/magit/magit/blob/master/lisp/magit-git.el#L93
> 
> My concern is about not breaking the local use case.

Maybe this can be fixed by patching "magit-git-executable" in Guix
with an absolute path -- that procedure is only used on the local host,
so that shouldn't cause any problems with TRAMP.  Will send a mail to
30434.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#55427: emacs-libgit tests are broken

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]



Maxime Devos <maximedevos@telenet.be> writes:

>> My concern is about not breaking the local use case.

As I said here: https://issues.guix.gnu.org/55427#15

Magit use git executable for 99.9% work. Guix user should install git
(or we patch the git absolute path for it) for almost all functionality.

libgit doesn't save you from missing git executable. 

-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

bug#55427: emacs-libgit tests are broken

[Kyle Meyer]

Maxime Devos writes:

> Maybe this can be fixed by patching "magit-git-executable" in Guix
> with an absolute path -- that procedure is only used on the local host,
> so that shouldn't cause any problems with TRAMP.  Will send a mail to
> 30434.

Right, using an absolute path for magit-git-executable is _now_ fine.
Magit started using separate executables for the local and remote
operations in 1423c54d (magit-remote-git-executable: New option,
2021-07-20), part of the 3.2.0 release.  bug#30434 was active back in
2018.