.hg-annotate-ignore-revs and .git-blame-ignore-revs missing commits
Categories
(Developer Infrastructure :: Lint and Formatting, defect)
Tracking
(firefox77 fixed)
| Tracking | Status | |
|---|---|---|
| firefox77 | --- | fixed |
People
(Reporter: jya, Assigned: glandium)
References
(Regression)
Details
(Keywords: regression)
Attachments
(8 files, 2 obsolete files)
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review | |
|
47 bytes,
text/x-phabricator-request
|
Details | Review |
We have "Bug 1298559 - Enable eslint for /browser/base/content/test/ r=mattn"
and "Bug 1561435 - Format browser/base/, a=automatic-formatting"
prevents reading blame properly
|
||
Comment 1•4 years ago
|
||
Bugbug thinks this bug should belong to this component, but please revert this change in case of error.
|
Reporter | |
Comment 2•4 years ago
|
||
Actually, too many missing to count. So will convert all the .hg-annotate-ignore-revs to the git version
|
|
Reporter | |
Comment 3•4 years ago
|
||
Redoing the whole file for simplicity, and because so many were missing.
This was done with the command:
while IFS= read -r line; do commit=echo "$line" | sed "s/\(.*\) - .* - \(Bug .*\)$/\\1/g" ; title= echo "$line" | sed "s/\(.*\) - .* - \(Bug .*\)$/\\2/g"; echo "# $title"; echo "# https://hg.mozilla.org/mozilla-central/rev/$commit"; cmd=git cinnabar hg2git $commit; echo $cmd "# gecko-dev"; done < .hg-annotate-ignore-revs > .git-blame-ignore-revs
Also adding commit "Bug 1298559 - Enable eslint for /browser/base/content/test/ r=mattn" to the list as it was absent.
|
|
Reporter | |
Comment 4•4 years ago
|
||
Redoing the whole file for simplicity, and because so many were missing.
This was done with the command:
while IFS= read -r line; do commit=echo "$line" | sed "s/\(.*\) - .* - \(Bug .*\)$/\\1/g" ; title= echo "$line" | sed "s/\(.*\) - .* - \(Bug .*\)$/\\2/g"; echo "# $title"; echo "# https://hg.mozilla.org/mozilla-central/rev/$commit"; cmd=git cinnabar hg2git $commit; echo $cmd "# gecko-dev"; done < .hg-annotate-ignore-revs > .git-blame-ignore-revs
Also adding commit "Bug 1298559 - Enable eslint for /browser/base/content/test/ r=mattn" to the list as it was absent.
|
Assignee | |
Comment 5•4 years ago
|
||
A few issues:
- you attached 2 patches
- there are some null ids in there (0000000000000000000000000000000000000000)
- this is not listing gecko-dev commits, but native cinnabar commits. While claiming they are gecko-dev, and dropping the gecko-dev commits that were already listed.
|
|
Assignee | |
Comment 6•4 years ago
|
||
- The null id is from bug 1563300 not having the right mercurial id in .hg-annotate-ignore-revs.
- There are also a bunch of entries in .git-blame-ignore-revs that don't have an equivalent in .hg-annotate-ignore-revs, like 6f3709b3878117466168c40affa7bca0b60cf75b, d57dde190f67e7964bb3a908d33a4d086da696b1, etc.
- I think the format for .git-blame-ignore-revs would be better if it looked more like .hg-annotate-ignore-revs. Like, taking the file verbatim, adding a # before each line, and interleave with the corresponding git commits.
|
||
Updated•4 years ago
|
|
|
Assignee | |
Comment 7•4 years ago
|
||
Bonus: of the 232 commits with "ignore-this-changeset", 147 are not in .hg-annotate-ignore-revs, 210 are not in .git-blame-ignore-revs for cinnabar ids, and 126 are not in .git-blame-ignore-revs for gecko-dev ids.
|
|
Reporter | |
Updated•4 years ago
|
|
|
Reporter | |
Comment 8•4 years ago
|
||
Leaving this to someone more experienced with what to do.
|
|
||
Updated•4 years ago
|
|
|
Assignee | |
Comment 9•4 years ago
|
||
Per its definition in v-c-t, hg smart-annotate skips them in addition to
the contents of the .hg-annotate-ignore-revs file, so they don't need to
appear in the file.
|
|
||
Updated•4 years ago
|
|
|
Assignee | |
Comment 10•4 years ago
|
||
|
|
Assignee | |
Comment 11•4 years ago
|
||
|
|
Assignee | |
Comment 12•4 years ago
|
||
|
|
Assignee | |
Comment 13•4 years ago
|
||
|
|
Assignee | |
Comment 14•4 years ago
|
||
|
|
Assignee | |
Comment 15•4 years ago
|
||
It was generated by mixing every commit with "ignore-this-changeset" and
everything listed in .hg-annotate-ignore-revs, in topologic order.
The format was changed to:
# hg-sha1 - author - subject
cinnabar-sha1 # cinnabar
gecko-dev-sha1 # gecko-dev
The comment line corresponds to entries in .hg-annotate-ignore-revs (or
what they would look like for commits with "ignore-this-changeset").
|
|
Assignee | |
Comment 16•4 years ago
|
||
|
||
Comment 17•4 years ago
|
||
Pushed by mh@glandium.org: https://hg.mozilla.org/integration/autoland/rev/09aa29bbae71 Remove mercurial changesets that are marked "ignore-this-changeset". r=sylvestre https://hg.mozilla.org/integration/autoland/rev/a260fa7a69b4 Fix the ignore changeset for bug 1563300. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/627d4256d95b Add changesets that appear in .git-blame-ignore-revs but aren't already marked as ignored for mercurial. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/f7b3e879c09d Reorder .hg-annotate-ignore-revs by topologic order. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/24d544171364 Add a changeset marked as "skip-blame" to .hg-annotate-ignore-revs. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/acd7ab1651c1 Adjust messages in .hg-annotate-ignore-revs to match what is actually in the changesets. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/02cbfa7967b2 Refresh .git-blame-ignore-revs. r=sylvestre https://hg.mozilla.org/integration/autoland/rev/64504e869f32 Add bug 1298559 to .{hg-annotate,git-blame}-ignore-revs. r=sylvestre
|
||
Comment 18•4 years ago
|
||
| bugherder | ||
https://hg.mozilla.org/mozilla-central/rev/09aa29bbae71
https://hg.mozilla.org/mozilla-central/rev/a260fa7a69b4
https://hg.mozilla.org/mozilla-central/rev/627d4256d95b
https://hg.mozilla.org/mozilla-central/rev/f7b3e879c09d
https://hg.mozilla.org/mozilla-central/rev/24d544171364
https://hg.mozilla.org/mozilla-central/rev/acd7ab1651c1
https://hg.mozilla.org/mozilla-central/rev/02cbfa7967b2
https://hg.mozilla.org/mozilla-central/rev/64504e869f32
|
||
Updated•2 years ago
|
|
||
Updated•8 months ago
|
|
|
||
Updated•8 months ago
|
Description
•