Closed Bug 1683562 Opened 4 years ago Closed 4 years ago

"full diff" link in blame popup goes to wrong commit

Categories

(Webtools :: Searchfox, defect)

Product:
Webtools
Component:
Searchfox
Type:
defect

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: botond, Assigned: kats)

References

Details

STR

  1. Go to https://searchfox.org/mozilla-central/rev/66547980e8e8ca583473c74f207cae5bac1ed541/widget/cocoa/nsChildView.mm#2783
  2. Hover over the sidebar at line 2783 to trigger the blame popup
  3. Observe that the bug referenced in the blame popup is "Bug 1619187. Handle content prevent defaulting pinch gestures. r=kats"
  4. Click on "full diff" in the popup

Expected results

You are taken to the hg.m.o link for that commit: https://hg.mozilla.org/mozilla-central/rev/4d624406bd3c295fdb57813ec5e52c94e79c2e90

Actual results

You are taken to the hg.m.o link for a different commit: https://hg.mozilla.org/mozilla-central/rev/aaf93463fe1afc498b6f03b5396b6533f953bd00

Only "full diff" has this problem, "annotated diff" works correctly. Also, only this line is affected, not nearby lines belonging to the same commit.

Looks like the blame repo has an incorrect hg revision:

gecko-blame$ git log --grep=f9e267a4a759d3969f04a917967643825dd4f32c
commit 053ce32408da476480c0597f22f374fd1305cbe5
Author: Timothy Nikkel <tnikkel@gmail.com>
Date:   Fri May 1 23:21:08 2020 +0000

    git f9e267a4a759d3969f04a917967643825dd4f32c
    hg aaf93463fe1afc498b6f03b5396b6533f953bd00

whereas if we use cinnabar to do the lookup, we get the right answer:

gecko-dev$ git cinnabar git2hg f9e267a4a759d3969f04a917967643825dd4f32c
70d9a096070be5920d3560cfd9cdfd43dca179a3

I'm not sure why the blame repo has the wrong information. Around May 1st (when this patch is dated) we were in the midst of transitioning from the python blame-builder to the rust version (bug 1627532) and shortly after that I switched the cinnabar calls to use the new batch API (bug 1634772). So it's possible that the code to use cinnabar-helper prior to the new batch API was buggy and produced the wrong result for some revisions.

At any rate, the fix here will be to rebuild the blame repo so it has the correct information.

This is fixed now after https://bugzilla.mozilla.org/show_bug.cgi?id=1683563#c6

Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Assignee: nobody → kats
You need to log in before you can comment on or make changes to this bug.