Trac #15123 is broken

33 views
Skip to first unread message

Jeroen Demeyer

unread,
Dec 19, 2013, 6:38:53 AM12/19/13
to sage...@googlegroups.com
Opening http://trac.sagemath.org/ticket/15123 gives

Trac detected an internal error:

CalledProcessError: Command '['git',
u'--git-dir=/srv/git/repositories/sage.git', 'merge-base',
'3472a854df051b57d1cb7e4934913f17f1fef820',
'72c453830846583dbfdf2cae224df776ef38ea26']' returned non-zero exit status 1

Volker Braun

unread,
Dec 19, 2013, 7:08:26 AM12/19/13
to sage...@googlegroups.com
That branch is not based on anything in the Sage history, it is a separate root. I think Andrew's plugin doesn't take care of that case:

$ git checkout 72c453830846583dbfdf2cae224df776ef38ea26
HEAD is now at 72c4538... add more autotools executables
$ git ls-files
build/pkgs/autotools/Makefile.build
build/pkgs/autotools/SPKG.txt
build/pkgs/autotools/autofoo
build/pkgs/autotools/checksums.ini
build/pkgs/autotools/install-info.exe.manifest
build/pkgs/autotools/latest_version
build/pkgs/autotools/package-version.txt
build/pkgs/autotools/patches/m4-no-gets.patch
build/pkgs/autotools/spkg-install
build/pkgs/autotools/spkg-write-makefile
build/pkgs/autotools/version-list
$ git log --oneline
72c4538 add more autotools executables
7cc6067 autotools: spkg (#15123)
b1f08de Trac #13557: update the autotools spkg, add Texinfo
7332219 Trac #13357: initial version

R. Andrew Ohana

unread,
Dec 19, 2013, 4:12:34 PM12/19/13
to sage...@googlegroups.com
Ok, this should now be fixed (although loading the ticket takes awhile for some reason).


--
You received this message because you are subscribed to the Google Groups "sage-git" group.
To unsubscribe from this group and stop receiving emails from it, send an email to sage-git+u...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.



--
Andrew

Volker Braun

unread,
Dec 19, 2013, 4:22:04 PM12/19/13
to sage...@googlegroups.com
I noticed that all tickets with changeset: links (to trac's internal changeset viewer) are dog slow. Fortunately you replaced that with links to the cgit repo viewer in the post commit hook, so it only affects older tickets. But its one of the reminders that the trac git repo plugin isn't really up to the task.

R. Andrew Ohana

unread,
Dec 19, 2013, 4:26:15 PM12/19/13
to sage...@googlegroups.com
On Thu, Dec 19, 2013 at 1:22 PM, Volker Braun <vbrau...@gmail.com> wrote:
I noticed that all tickets with changeset: links (to trac's internal changeset viewer) are dog slow. Fortunately you replaced that with links to the cgit repo viewer in the post commit hook, so it only affects older tickets. But its one of the reminders that the trac git repo plugin isn't really up to the task.

Yeah, I hope to replace all the usage of  trac git repo plugin with cgit eventually -- right now I'm waiting on a little more fleshed out merge support in pygit2 (which shouldn't be too long, seeing as they just started wrapping libgit2's merge functionality a few weeks ago).

--
Andrew
Reply all
Reply to author
Forward
0 new messages