1051804 - Change user to emailuser in hg annotate web interface

Status: VERIFIED FIXED

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

Description

[Onno Ekker [:nONoNonO UTC+1]]

The current hgweb interface shows my contributions as o. My username is [e-mail], which gets abbreviated to o. If you display emailuser instead of user, o.e.ekker would be shown.
See also http://bz.selenic.com/show_bug.cgi?id=2276 for more info.
An example of current annotate can be seen here:
http://hg.mozilla.org/releases/l10n/mozilla-aurora/nl/annotate/087b0af1cc16/chat/conversations.properties#l42

Comment 1

[Ed Morley [:emorley]]

Attachment: Use |emailuser| rather than |user| for the annotate author

Unfortunately it would seem that the 'emailuser' filter requires Hg v2.2 or higher:
http://www.selenic.com/hg/rev/e5788269741a
Also search for "templates/filters: extracting the user portion of an email address (BC)" on http://mercurial.selenic.com/wiki/WhatsNew

As far as I can tell we're on 2.0.2 on hg.mozilla.org at present (bug 623505), and bug 945383 is where further upgrade discussions have taken place.

Comment 2

[Ed Morley [:emorley]]

Bug 945383 comment 4 says we're running 2.5.4, so this should work fine :-)

Comment 3

[Ed Morley [:emorley]]

Comment on attachment 8471469 [details] [diff] [review]
Use |emailuser| rather than |user| for the annotate author

For legacy reasons, the 'user' filter incorrectly turns email addresses of form
'[e-mail]' into 'a'. Using 'emailuser' instead gives the entire
part before the @, ie 'a.b.surname' - and so this patch means that on the hgweb
annotate pages the author username shown for each line is less ambiguous.

Requires Hg v2.2 or higher; hg.m.o is running 2.5.4.

See also: http://bz.selenic.com/show_bug.cgi?id=2276

Comment 4

[Ed Morley [:emorley]]

Comment on attachment 8471469 [details] [diff] [review]
Use |emailuser| rather than |user| for the annotate author

Thank you :-)

https://hg.mozilla.org/hgcustom/hg_templates/rev/781a6d82af8c

Comment 5

[Ed Morley [:emorley]]

In production; seems to work :-)

Comment 6

[Onno Ekker [:nONoNonO UTC+1]]

Thank you for this quick change! I'm sure glad you don;t have change advisory boards and releases and thing like that for changes like this

Comment 7

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/1b1c2f8de55c