1504794 - Using fastannotate from core Mercurial instead of hg-experimental

Status: RESOLVED FIXED

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

Description

[Gregory Szorc [:gps]]

We currently have the fastannotate extension installed from Facebook's hg-experimental repository on hgweb. We also have the extension configured on a repo or two under hg.mozilla.org/experimental/.

Mercurial 4.8 contains fastannotate built-in.

We should switch production to the extension in Mercurial itself.

We should be able to remove a bunch of Ansible required to manage the Facebook extension. Basically reverting the following:

https://hg.mozilla.org/hgcustom/version-control-tools/rev/738b6aaf23ff
https://hg.mozilla.org/hgcustom/version-control-tools/rev/9b89fa369c5b
https://hg.mozilla.org/hgcustom/version-control-tools/rev/376c9195bf11

Comment 1

[Connor Sheehan [:sheehan]]

Attachment: hgweb: use fastannotate from core Mercurial (Bug 1504794) r?gps

`fastannotate` is now shipped with core Mercurial. We no longer
need to pull down and build the hg-experimental repo as part
of our deploy process. This commit purges hg-experimental from
vct (with the exception of a few extensions recommended in the
docs).

We also flip the `server = True` flag to serve the annotate cache
over the wire protocol.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/2725b127690e
hgweb: use fastannotate from core Mercurial r=gps

Comment 3

[Connor Sheehan [:sheehan]]

So apparently fastannotate's hgweb feature is actually broken in core. We will need to do some extra work to monkeypatch a fix in. Greg will be handling that work.

Comment 4

[Gregory Szorc [:gps]]

Attachment: hgmo: hack fastannotate to work with 4.8 (bug 1504794); r?sheehan

fastannotate's hgweb monkeypatch is broken in Mercurial 4.8. This
commit replaces the fastannotate hgweb monkeypatch with our own
version that works.

Comment 5

[Gregory Szorc [:gps]]

Attachment: hgserver: add test for fastannotate (bug 1504794); r?sheehan

fastannotate has broken before. Let's add test coverage to ensure
it continues to work.

We already have a helper script in the test environment to set hgrc
options. However, it doesn't work with %include, which is a special
directive. Rather than complicate that script with %include
functionality, I wrote a simple, non-generic script to accomplish
what we need.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/1a79e8a661af
hgmo: hack fastannotate to work with 4.8 ; r=sheehan
https://hg.mozilla.org/hgcustom/version-control-tools/rev/5e70155571ce
hgserver: add test for fastannotate ; r=sheehan

Comment 7

[Gregory Szorc [:gps]]

Things are still broken. Probably a race between various extensions loading.

Let me try another approach.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c007048836b3
hgmo: attempt alternate monkeypatching of fastannotate

Comment 9

[Gregory Szorc [:gps]]

This seems to be working now.