479420 - make pushlog compatible with hg 1.1

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[(not currently active) Ted Mielczarek]

djc did some work to make this happen, but I guess it wasn't quite sufficient. In bug 479407, hg got updated from 1.0.1 to 1.1.2, and the pushlog broke badly. We should fix the pushlog code to work with this version.

Comment 1

[Dirkjan Ochtman (:djc)]

Well, I mostly brought the pushlog code more in line with hg proper, which alleviates compat problems, but certainly doesn't eliminate them. We should do some proper testing. I think there are a bunch of template changes required, see also http://www.selenic.com/mercurial/wiki/index.cgi/API_Changes.

Comment 2

[(not currently active) Ted Mielczarek]

As I said on IRC, I'm open to branching or creating a new template dir in the templates repo or whatever makes this easiest.

Comment 3

[Axel Hecht [:Pike]]

My local setup breaks with 

RuntimeError: No hgweb templates found in ['/Users/tester/ENV/hg1.1/lib/python2.5/site-packages/mercurial-1.1-py2.5-macosx-10.5-i386.egg/mercurial/templates']

with an webdir-conf of

[web]
port = 8000
templates = /Users/tester/stuff/hg_templates
style = gitweb_mozilla

[collections]
repos = repos

Not that that works without repeating the web piece in the individual .hg/hgrcs of the repos served.

Is the setup of hg.m.o documented somewhere so that I could try to at least reproduce the error we're seeing in bug 479407?

Comment 4

[Axel Hecht [:Pike]]

Ignore that, I had webdir issues.

Re this, listfilediffs moved to mercurial.hgweb.webutil, and now takes the maximum files as additional param, which is in web.maxfiles.

Comment 5

[(not currently active) Ted Mielczarek]

I pushed a fix for the listfilediffs bit:
http://hg.mozilla.org/users/bsmedberg_mozilla.com/hgpoller/rev/dec4385b03f6

I don't know that there's anything else to do here, everything looks fine with my local 1.1 install. I guess I'll have to get 1.2 eventually and try that.

Comment 6

[Dirkjan Ochtman (:djc)]

There are template changes, I think. Have you checked all the different template renderings?

Comment 7

[(not currently active) Ted Mielczarek]

Not all of them, but I fixed the annotate one when I pushed Sid's patch a while ago, and nothing else looked very serious.

Comment 8

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/06e1466d7a38