1321548 - autoland fails to land gecko:ad83087831c6 - unknown revision "

Status: RESOLVED FIXED

(Conduit Graveyard :: Transplant, defect)

Description

[:glob ✱]

https://reviewboard.mozilla.org/r/95398/diff/3

hg error in cmd: hg rewritecommitdescriptions --descriptions=/tmp/tmpBVIVJW ad83087831c65e4c4736efe90d455072742a8cc8: saved backup bundle to /repos/mozreview-gecko/.hg/strip-backup/2a520851d322-c370f1c1-replacing.hg
warning: ignoring unknown working parent adf44fc5e1a6!
rev: 4575b3e40429 -> fba00a9fc212
rev: 2a520851d322 -> ac27634cc312
abort: unknown revision 'adf44fc5e1a68d29ddaec7b8f0e96adc53a624d9'!

Comment 1

[:glob ✱]

steps to reproduce:

edit your .hgrc file to enable rewritecommitdescriptions and disable evolve extensions
> [extensions]
> # evolve = ~/.hg_extensions/evolve-main/hgext/evolve.py
> rewritecommitdescriptions = ~/.mozbuild/version-control-tools/autoland/hgext/rewritecommitdescriptions.py

take a fresh clone of mozilla-central
> hg clone https://hg.mozilla.org/mozilla-central/

pull down the review request
> hg pull https://reviewboard-hg.mozilla.org/gecko -r ad83087831c65e4c4736efe90d455072742a8cc8
> hg update ad83087831c65e4c4736efe90d455072742a8cc8

create json file with commit descriptions
> echo '{"4575b3e4042989971c89aa304d6ab625b4c969ef":"Bug 1320084 - Remove unused devtools/client/themes/dom.css file. r=Honza\n\nMozReview-Commit-ID: 1sjsBmMUlGz","2a520851d322aa927a6fc705762351d75a5c01d3":"Bug 1320084 - Remove project editor test files from firefox package. r=bgrins\n\nMozReview-Commit-ID: FBvL2jtL2LZ","ad83087831c65e4c4736efe90d455072742a8cc8":"Bug 1320084 - Remove useless devtools JSM shims. r=jryans\n\nMozReview-Commit-ID: JUui79wiNYi"}' > rewrite.json

rewrite
> hg rewritecommitdescriptions --descriptions=rewrite.json ad83087831c65e4c4736efe90d455072742a8cc8

Comment 2

[Alexandre Poirot [:ochameau]]

Still fails:
https://reviewboard.mozilla.org/r/95456/diff/4/

Comment 3

[:glob ✱]

sorry this is taking so long; i've been on pto, and have limited time to look at it this week.

looks like this is caused by a node that doesn't require a commit description rewrite being stripped.  i have a fix in hand which i'll put up for review once i've done more testing.

Comment 5

[:glob ✱]

Attachment: autoland: fix "unknown revision" errors when rewriting commit descriptions (bug 1321548)

rewrite all nodes instead of just those where the description has changed.
this resolves issues caused by unmodified parents being stripped.

Review commit: https://reviewboard.mozilla.org/r/104532/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/104532/

Comment 6

[Steven MacLeod [:smacleod]]

Comment on attachment 8826598 [details]
autoland: fix "unknown revision" errors when rewriting commit descriptions (bug 1321548)

https://reviewboard.mozilla.org/r/104532/#review105196

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/e7a1797d902a
autoland: fix "unknown revision" errors when rewriting commit descriptions r=smacleod

Comment 8

[:glob ✱]

backed out due to test failures (urgh, sorry!)

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

Comment 9

[:glob ✱]

Attachment: mozhg: don't strip/obsolete unmodified revisions during rewrite (bug bug 1321548)

Review commit: https://reviewboard.mozilla.org/r/108676/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/108676/

Comment 10

[:glob ✱]

Comment on attachment 8826598 [details]
autoland: fix "unknown revision" errors when rewriting commit descriptions (bug 1321548)

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/104532/diff/1-2/

Comment 11

[Gregory Szorc [:gps]]

Comment on attachment 8832353 [details]
mozhg: don't strip/obsolete unmodified revisions during rewrite (bug bug 1321548)

https://reviewboard.mozilla.org/r/108676/#review109938

Good catch.

I'm surprised this bug hasn't bit us more.

Comment 12

[Steven MacLeod [:smacleod]]

Comment on attachment 8826598 [details]
autoland: fix "unknown revision" errors when rewriting commit descriptions (bug 1321548)

https://reviewboard.mozilla.org/r/104532/#review114170

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/f9e20419aa59
mozhg: don't strip/obsolete unmodified revisions during rewrite (bug bug 1321548) r=gps
https://hg.mozilla.org/hgcustom/version-control-tools/rev/1af53eaac838
autoland: fix "unknown revision" errors when rewriting commit descriptions r=smacleod