1124253 - hgweb blame links no longer very useful

Status: RESOLVED FIXED

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

Description

[Boris Zbarsky [:bzbarsky]]

STEPS TO REPRODUCE:

1)  Load http://hg.mozilla.org/mozilla-central/annotate/0f2b4a7a9daf/media/webrtc/signaling/test/signaling_unittests.cpp

2)  Scroll down to line 45.

3)  Click the "jib@150702" link.

EXPECTED RESULTS:

Shows the diff to this file that last modified this line.  In particular, that would be http://hg.mozilla.org/mozilla-central/diff/e93223d403fe/media/webrtc/signaling/test/signaling_unittests.cpp

ACTUAL RESULTS:

Shows the blame for the relevant revision of the file, scrolled to that line.  In particular, shows http://hg.mozilla.org/mozilla-central/annotate/e93223d403fe/media/webrtc/signaling/test/signaling_unittests.cpp#l45

This mean that now to get to the actual changes one has to scroll all the way to the top of the file and then click the "changeset 150702" link.  And if one has the temerity to want the changes to the particular file in question, you then have to dig around for it in the changeset.

The old behavior was _way_ more useful.

Comment 1

[Boris Zbarsky [:bzbarsky]]

This is wasting a huge amount of my time.  Is there anything I can do to help here?

Comment 2

[Gregory Szorc [:gps]]

$ hg clone https://hg.mozilla.org/hgcustom/version-control-tools
$ cd version-control-tools
$ hg up cdb25b943b39
$ cd ~/path/to/mozilla-central
$ hg --config web.templates=/path/to/version-control-tools/hgtemplates serve
$ open http://localhost:8000/?style=gitweb_mozilla

Comment 3

[Boris Zbarsky [:bzbarsky]]

As in you want me to run my own local hgweb from before these changes?

That assumes I have an up-to-date mozilla-central, which I often don't.

It also assumes I always want mozilla-central, which is not the case.  It means I can't just follow blame links from mxr/dxr, yes?

So I'm assuming that suggestion is meant as a very temporary workaround?

Comment 4

[Gregory Szorc [:gps]]

Yes, run your own local server until this gets fixed, which will likely be early next week since I'm at a work week. Alternatively, you can have a go at fixing this yourself. Files in version-control-tools:hgtemplates/gitweb_mozilla. The bug is somewhere in the fileannotate.tmpl and map files. Probably a one word change.

Comment 5

[Boris Zbarsky [:bzbarsky]]

Oh, hmm.  Nevermind.  That revision has the updates already?

So it looks like the old annotateline link format was:

  {url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}

which landed you on a url like:

  http://hg.mozilla.org/mozilla-central/diff/f4157e8c4107/content/base/public/nsIDocument.h

whereas the new annotateline link format is:

  {url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}

which lands you on something like:

  http://hg.mozilla.org/mozilla-central/annotate/f4157e8c4107/content/base/public/nsIDocument.h#l4

Comment 6

[Boris Zbarsky [:bzbarsky]]

Sadly, I haven't managed to test locally yet, because the steps in comment 2 give me internal server errors due to "ParseError: unknown function 'buglink'" exceptions in the hg serve.

Comment 7

[Gregory Szorc [:gps]]

cdb25b943b39 is parent from before the hgtemplates changes started landing.

Comment 8

[Gregory Szorc [:gps]]

[extensions]
buglink=/path/to/version-control-tools/hgext/pushlog-legacy/buglink.py

Comment 9

[Boris Zbarsky [:bzbarsky]]

Attachment: This restores the old annotate linking behavior, afaict

Comment 10

[Gregory Szorc [:gps]]

Comment on attachment 8553516 [details] [diff] [review]
This restores the old annotate linking behavior, afaict

Review of attachment 8553516 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM. Push this and I'll deploy it for you.

Comment 11

[Boris Zbarsky [:bzbarsky]]

http://hg.mozilla.org/hgcustom/version-control-tools/rev/f103ed0e8f00 and thanks!

Comment 12

[Gregory Szorc [:gps]]

Deployed. Thanks for fixing this!