Closed Bug 1504794 Opened 6 years ago Closed 6 years ago

Using fastannotate from core Mercurial instead of hg-experimental

Categories

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

enhancement
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: gps, Assigned: gps)

References

Details

Attachments

(3 files)

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
Assignee: nobody → sheehan
Status: NEW → ASSIGNED
`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.
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/2725b127690e
hgweb: use fastannotate from core Mercurial r=gps
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
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.
Assignee: sheehan → gps
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
fastannotate's hgweb monkeypatch is broken in Mercurial 4.8. This
commit replaces the fastannotate hgweb monkeypatch with our own
version that works.
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.
Pushed by gszorc@mozilla.com:
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
Status: REOPENED → RESOLVED
Closed: 6 years ago6 years ago
Resolution: --- → FIXED
Things are still broken. Probably a race between various extensions loading.

Let me try another approach.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c007048836b3
hgmo: attempt alternate monkeypatching of fastannotate
Status: REOPENED → RESOLVED
Closed: 6 years ago6 years ago
Resolution: --- → FIXED
This seems to be working now.
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: