1652109 - moz-phab submit borked and left my tree in a mess

Status: RESOLVED DUPLICATE of bug 1484838

(Conduit :: moz-phab, defect)

Description

[Bob Clary [:bc] (inactive)]

Previously I had submitted this stack. I had used hg histedit this morning to change the commit messages to replace a trailing , ? with , r=?.

Then, with my tree looking like:

$ moz-phab version
MozPhab (0.1.89)

$ hg wip
@  540729:ef1de0c0de47 bclary tip  debug
o  540728:64cdd23f01ab bclary  Bug 1486004 - Part 17 - Update remote xpcshell-tests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540727:b1935d97acc3 bclary  Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, r=?
o  540726:ede7b7116a54 bclary  Bug 1486004 - Part 15 - Update remotecppunittests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540725:47c9a2b513f2 bclary  Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, r=?
o  540724:efa2c26b2ffc bclary  Bug 1486004 - Part 13 - Update mozharness configs and scripts to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540714:08c9e4976ed6 bclary  Bug 1486004 - Part 12 - [mozrunner 8.0.1] Update mozrunner requirements to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540713:304af7f82a3c bclary  Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, r=?
o  540712:3ca607e12329 bclary  Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, r=?
o  540711:10799a67c673 bclary  Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, r=?
o  540710:16cc0bd3d64a bclary  Bug 1486004 - Part 8 - Update gtests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540709:dfbf8d6f8271 bclary  Bug 1486004 - Part 7 - Update Conditioned Profiles to support unrooted android devices using mozdevice 4.0.0, r=?
o  540708:a117677ee362 bclary  Bug 1486004 - Part 6 - Update mach perftest to support unrooted android devices using mozdevice 4.0.0, r=?
o  540707:ed991546d276 bclary  Bug 1486004 - Part 5 - Update reftests to support unrooted android devices using mozdevice 4.0.0, r=?
o  540706:cf29983008d9 bclary  Bug 1486004 - Part 4 - Update jstests, jit-tests to support unrooted android devices using mozdevice 4.0.0, r=?
o  540705:07c75e80cc57 bclary  Bug 1486004 - Part 3 - change help prompt for remote test root to show /data/local/tmp/test_root, r=gbrown
o  540704:b7d62b7d7720 bclary  Bug 1486004 - Part 2 - Update remoteautomation.py to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540703:4a6cafbafc61 bclary  Bug 1486004 - Part 1 - [mozdevice 4.0.0] Use run-as to work around rooted device requirement, r=gbrown,jmaher
o  540702:0ae6b01f1f4b jcoppeard  Bug 1651612 - Run extra garbage collection cycle for idle workers if cycle collection collected anything r=mccr8

I did

 $ moz-phab submit 4a6cafbafc61 64cdd23f01ab
Submitting 17 commits for review:
(D82760) 540728:64cdd23f01ab Bug 1486004 - Part 17 - Update remote xpcshell-tests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82759) 540727:b1935d97acc3 Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82758) 540726:ede7b7116a54 Bug 1486004 - Part 15 - Update remotecppunittests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82757) 540725:47c9a2b513f2 Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82756) 540724:efa2c26b2ffc Bug 1486004 - Part 13 - Update mozharness configs and scripts to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82755) 540714:08c9e4976ed6 Bug 1486004 - Part 12 - [mozrunner 8.0.1] Update mozrunner requirements to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82754) 540713:304af7f82a3c Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82753) 540712:3ca607e12329 Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82752) 540711:10799a67c673 Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82751) 540710:16cc0bd3d64a Bug 1486004 - Part 8 - Update gtests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82750) 540709:dfbf8d6f8271 Bug 1486004 - Part 7 - Update Conditioned Profiles to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82749) 540708:a117677ee362 Bug 1486004 - Part 6 - Update mach perftest to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82748) 540707:ed991546d276 Bug 1486004 - Part 5 - Update reftests to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82747) 540706:cf29983008d9 Bug 1486004 - Part 4 - Update jstests, jit-tests to support unrooted android devices using mozdevice 4.0.0, ?
!! Missing reviewers
(D82746) 540705:07c75e80cc57 Bug 1486004 - Part 3 - change help prompt for remote test root to show /data/local/tmp/test_root, r=gbrown
(D82745) 540704:b7d62b7d7720 Bug 1486004 - Part 2 - Update remoteautomation.py to support unrooted android devices using mozdevice 4.0.0, r=gbrown
(D82744) 540703:4a6cafbafc61 Bug 1486004 - Part 1 - [mozdevice 4.0.0] Use run-as to work around rooted device requirement, r=gbrown,jmaher
Warning: found 23 untracked files (will not be submitted):
Submit to https://phabricator.services.mozilla.com (YES/No/Always)? yes

Updating revision D82744:
540703:4a6cafbafc61 Bug 1486004 - Part 1 - [mozdevice 4.0.0] Use run-as to work around rooted device requirement, r=gbrown,jmaher

Updating revision D82745:
540704:b7d62b7d7720 Bug 1486004 - Part 2 - Update remoteautomation.py to support unrooted android devices using mozdevice 4.0.0, r=gbrown

Updating revision D82746:
540705:07c75e80cc57 Bug 1486004 - Part 3 - change help prompt for remote test root to show /data/local/tmp/test_root, r=gbrown

Updating revision D82747:
540706:cf29983008d9 Bug 1486004 - Part 4 - Update jstests, jit-tests to support unrooted android devices using mozdevice 4.0.0, ?
14 new orphan changesets

Updating revision D82748:
540707:ed991546d276 Bug 1486004 - Part 5 - Update reftests to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82749:
540708:a117677ee362 Bug 1486004 - Part 6 - Update mach perftest to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82750:
540709:dfbf8d6f8271 Bug 1486004 - Part 7 - Update Conditioned Profiles to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82751:
540710:16cc0bd3d64a Bug 1486004 - Part 8 - Update gtests to support unrooted android devices using mozdevice 4.0.0, r=gbrown

Updating revision D82752:
540711:10799a67c673 Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82753:
540712:3ca607e12329 Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82754:
540713:304af7f82a3c Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82755:
540714:08c9e4976ed6 Bug 1486004 - Part 12 - [mozrunner 8.0.1] Update mozrunner requirements to support unrooted android devices using mozdevice 4.0.0, r=gbrown

Updating revision D82756:
540724:efa2c26b2ffc Bug 1486004 - Part 13 - Update mozharness configs and scripts to support unrooted android devices using mozdevice 4.0.0, r=gbrown

Updating revision D82757:
540725:47c9a2b513f2 Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82758:
540726:ede7b7116a54 Bug 1486004 - Part 15 - Update remotecppunittests to support unrooted android devices using mozdevice 4.0.0, r=gbrown

Updating revision D82759:
540727:b1935d97acc3 Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, ?

Updating revision D82760:
540728:64cdd23f01ab Bug 1486004 - Part 17 - Update remote xpcshell-tests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
rebasing 540731:841db1ad66a4 "Bug 1486004 - Part 5 - Update reftests to support unrooted android devices using mozdevice 4.0.0, ?"
rebasing 540732:8e865d8a1743 "Bug 1486004 - Part 6 - Update mach perftest to support unrooted android devices using mozdevice 4.0.0, ?"
rebasing 540733:2cc9dde2f924 "Bug 1486004 - Part 7 - Update Conditioned Profiles to support unrooted android devices using mozdevice 4.0.0, ?"
rebasing 540710:16cc0bd3d64a "Bug 1486004 - Part 8 - Update gtests to support unrooted android devices using mozdevice 4.0.0, r=gbrown"
rebasing 540734:48c01827531a "Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, ?"
note: not rebasing 540711:10799a67c673 "Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, r=?" and its descendants as this would cause divergence
note: not rebasing 540712:3ca607e12329 "Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, r=?" and its descendants as this would cause divergence
note: not rebasing 540713:304af7f82a3c "Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, r=?" and its descendants as this would cause divergence
note: not rebasing 540725:47c9a2b513f2 "Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, r=?" and its descendants as this would cause divergence
note: not rebasing 540727:b1935d97acc3 "Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, r=?" and its descendants as this would cause divergence
abort: hidden revision '48c01827531aa1632b2a87ecf84cedcdc6f1a23a' was rewritten as: 8d5d3fc2ab0b!
(use --hidden to access hidden revisions)
CommandError: command 'hg' failed to complete successfully
Run moz-phab again with '--trace' to show debugging output
Sentry is attempting to send 0 pending error messages
Waiting up to 2 seconds
Press Ctrl-C to quit

I didn't notice the messages about !! Missing reviewers before I answered yes.

My tree is now in the state:

$ hg wip
o  540743:8d5d3fc2ab0b bclary tip  Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, ?
o  540742:2718a0c08e75 bclary  Bug 1486004 - Part 8 - Update gtests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540741:4ac5f64c53fc bclary  Bug 1486004 - Part 7 - Update Conditioned Profiles to support unrooted android devices using mozdevice 4.0.0, ?
o  540740:b72b4b912884 bclary  Bug 1486004 - Part 6 - Update mach perftest to support unrooted android devices using mozdevice 4.0.0, ?
o  540739:2f533ff7aa6c bclary  Bug 1486004 - Part 5 - Update reftests to support unrooted android devices using mozdevice 4.0.0, ?
| *  540738:facf3789b3ce bclary  Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, ?
| | *  540737:44c6a14a6e0f bclary  Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, ?
| | | *  540736:efe53fc44ed9 bclary  Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, ?
| | | | *  540735:101802a6652e bclary  Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, ?
o | | | |  540730:7860592c675b bclary  Bug 1486004 - Part 4 - Update jstests, jit-tests to support unrooted android devices using mozdevice 4.0.0, ?
| | | | | *  540729:ef1de0c0de47 bclary  debug
| | | | | @  540728:64cdd23f01ab bclary  Bug 1486004 - Part 17 - Update remote xpcshell-tests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
| +-------x  540727:b1935d97acc3 bclary  Bug 1486004 - Part 16 - Update web-platform tests to support unrooted android devices using mozdevice 4.0.0, r=?
| * | | |  540726:ede7b7116a54 bclary  Bug 1486004 - Part 15 - Update remotecppunittests to support unrooted android devices using mozdevice 4.0.0, r=gbrown
| x | | |  540725:47c9a2b513f2 bclary  Bug 1486004 - Part 14 - Update raptor to support unrooted android devices using mozdevice 4.0.0, r=?
| |/ / /
| * | |  540724:efa2c26b2ffc bclary  Bug 1486004 - Part 13 - Update mozharness configs and scripts to support unrooted android devices using mozdevice 4.0.0, r=gbrown
| * | |  540714:08c9e4976ed6 bclary  Bug 1486004 - Part 12 - [mozrunner 8.0.1] Update mozrunner requirements to support unrooted android devices using mozdevice 4.0.0, r=gbrown
| x | |  540713:304af7f82a3c bclary  Bug 1486004 - Part 11 - [mozpower 1.1.1] Update mozpower requirements to support unrooted android devices using mozdevice 4.0.0, r=?
| |/ /
| x /  540712:3ca607e12329 bclary  Bug 1486004 - Part 10 - Update mochitest to support unrooted android devices using mozdevice 4.0.0, r=?
| |/
| x  540711:10799a67c673 bclary  Bug 1486004 - Part 9 - [marionette-harness 5.0.1] Update marionette harness requirements to support unrooted android devices using mozdevice 4.0.0, r=?
|/
o  540705:07c75e80cc57 bclary  Bug 1486004 - Part 3 - change help prompt for remote test root to show /data/local/tmp/test_root, r=gbrown
o  540704:b7d62b7d7720 bclary  Bug 1486004 - Part 2 - Update remoteautomation.py to support unrooted android devices using mozdevice 4.0.0, r=gbrown
o  540703:4a6cafbafc61 bclary  Bug 1486004 - Part 1 - [mozdevice 4.0.0] Use run-as to work around rooted device requirement, r=gbrown,jmaher
o  540702:0ae6b01f1f4b jcoppeard  Bug 1651612 - Run extra garbage collection cycle for idle workers if cycle collection collected anything r=mccr8

I'm not sure what happened and what I did wrong. It would have been nice if moz-phab hadn't let me hork my tree. Is there anything I can do to recover or do I have to manually recreate my patch set ?