774649 - hgweb's 'base' link on the file revisions page should link to revision history of the old file, not annotated view

Status: RESOLVED FIXED

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

Description

[Ed Morley [:emorley]]

This affects me quite a bit when using hgweb to find the bug where a test was originally created (for the purpose of filing new intermittent oranges).

Example:
1) Visit http://hg.mozilla.org/mozilla-central/filelog/ba8463beab13/browser/components/sessionstore/test/browser_588426.js
2) Click 'base' in the time/date column, bottom row

Expected:
Taken to http://hg.mozilla.org/mozilla-central/log/1a9f0823fdba/browser/components/sessionstore/test/browser/browser_588426.js

Actual:
Taken to http://hg.mozilla.org/mozilla-central/file/c16f59db6140/browser/components/sessionstore/test/browser/browser_588426.js and have to navigate to 'revisions' from the top menu.

Not sure if the 'base' functionality was something added in Mozilla's customisations to hgweb or whether this should be reported upstream.

Comment 1

[(not currently active) Ted Mielczarek]

This is stock hg behavior, but we also use a forked set of templates, so we may be able to fix it locally.

The templates in question are:
http://hg.mozilla.org/hgcustom/hg_templates/file/672340227bea/gitweb_mozilla/filelog.tmpl#l29

which uses filelogentry for each changeset:
http://hg.mozilla.org/hgcustom/hg_templates/file/672340227bea/gitweb_mozilla/map#l70

which uses filelogrename for that base link:
http://hg.mozilla.org/hgcustom/hg_templates/file/672340227bea/gitweb_mozilla/map#l47

Comment 2

[Ed Morley [:emorley]]

Attachment: Patch v1

s/file/log/ in the target of the 'base' link.

I will also try filing this upstream once I'm back after this weekend.

Comment 3

[Ed Morley [:emorley]]

And thank you for the pointers in comment 1 :-)

Comment 4

[(not currently active) Ted Mielczarek]

You'll have to file an IT bug to get the templates updated on hg.mo, of course.

Comment 5

[Ed Morley [:emorley]]

Thank you :-)

I've just done some very rough testing with the changes made in this patch (by saving the page at the URL in comment 1 locally and making the same changes to the document/stylesheet).

tl;dr using the latest nightly, this reduces explicit memory usage from 1,132 MB to 784 MB for that page - and on my Core i7+8GB RAM+SSD, reduce page load time by ~10%. So pretty happy with the result :-)

Before:
1,131.69 MB (100.0%) -- explicit
├────945.83 MB (83.58%) -- window-objects
│    ├──939.69 MB (83.03%) -- top(file:///C:/Users/Ed/Desktop/hgweb%20optimisation/before/74b2b46fca7d.htm, id=8)/active/window(file:///C:/Users/Ed/Desktop/hgweb%20optimisation/before/74b2b46fca7d.htm)
│    │  ├──491.11 MB (43.40%) -- dom
│    │  │  ├──344.00 MB (30.40%) ── element-nodes
│    │  │  ├───86.82 MB (07.67%) ── text-nodes
│    │  │  ├───60.29 MB (05.33%) ── other [2]
│    │  │  └────0.00 MB (00.00%) ── comment-nodes
│    │  ├──448.31 MB (39.61%) -- layout
│    │  │  ├──224.92 MB (19.87%) ── style-contexts
│    │  │  ├──163.93 MB (14.49%) -- frames
│    │  │  │  ├───81.70 MB (07.22%) ── nsTextFrame
│    │  │  │  ├───81.59 MB (07.21%) ── nsInlineFrame
│    │  │  │  └────0.64 MB (00.06%) ++ (4 tiny)
│    │  │  ├───24.60 MB (02.17%) ── line-boxes
│    │  │  ├───17.45 MB (01.54%) ── pres-shell
│    │  │  ├───17.04 MB (01.51%) ── rule-nodes
│    │  │  └────0.37 MB (00.03%) ++ (3 tiny)
│    │  └────0.28 MB (00.02%) ++ (2 tiny)
│    └────6.14 MB (00.54%) ++ (5 tiny)
├────126.40 MB (11.17%) ── heap-unclassified
├─────32.17 MB (02.84%) ── history-links-hashtable
├─────19.01 MB (01.68%) -- js-non-window
│     ├──15.28 MB (01.35%) -- compartments
│     │  ├──14.06 MB (01.24%) ++ non-window-global
│     │  └───1.22 MB (00.11%) ++ no-global/compartment(atoms)
│     └───3.73 MB (00.33%) ++ (2 tiny)
└──────8.29 MB (00.73%) ++ (10 tiny)

After:
783.61 MB (100.0%) -- explicit
├──645.03 MB (82.31%) -- window-objects
│  ├──638.87 MB (81.53%) -- top(file:///C:/Users/Ed/Desktop/hgweb%20optimisation/after/74b2b46fca7d.htm, id=8)/active/window(file:///C:/Users/Ed/Desktop/hgweb%20optimisation/after/74b2b46fca7d.htm)
│  │  ├──455.05 MB (58.07%) -- dom
│  │  │  ├──307.94 MB (39.30%) ── element-nodes
│  │  │  ├───86.82 MB (11.08%) ── text-nodes
│  │  │  ├───60.29 MB (07.69%) ── other [2]
│  │  │  └────0.00 MB (00.00%) ── comment-nodes
│  │  ├──183.54 MB (23.42%) -- layout
│  │  │  ├──157.28 MB (20.07%) -- frames
│  │  │  │  ├───81.70 MB (10.43%) ── nsTextFrame
│  │  │  │  ├───74.95 MB (09.56%) ── nsInlineFrame
│  │  │  │  └────0.64 MB (00.08%) ++ (4 tiny)
│  │  │  ├───24.60 MB (03.14%) ── line-boxes
│  │  │  └────1.65 MB (00.21%) ++ (6 tiny)
│  │  └────0.28 MB (00.04%) ++ (2 tiny)
│  └────6.16 MB (00.79%) ++ (5 tiny)
├───70.62 MB (09.01%) ── heap-unclassified
├───32.17 MB (04.10%) ── history-links-hashtable
├───19.99 MB (02.55%) -- js-non-window
│   ├──15.25 MB (01.95%) -- compartments
│   │  ├──14.02 MB (01.79%) ++ non-window-global
│   │  └───1.22 MB (00.16%) ++ no-global/compartment(atoms)
│   └───4.74 MB (00.60%) ++ (2 tiny)
└───15.82 MB (02.02%) ++ (10 tiny)

Comment 6

[Ed Morley [:emorley]]

Oops, comment 5 was meant for bug 766952.

Comment 7

[Ed Morley [:emorley]]

http://hg.mozilla.org/hgcustom/hg_templates/rev/b24811f15a92

Comment 8

[Ed Morley [:emorley]]

Looks good in production :-)

Comment 9

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/5953d3f64203