Open Bug 1605754 Opened 6 years ago Updated 2 years ago

moz-phab patch should skip closed dependencies

Categories

(Conduit :: moz-phab, defect, P2)

defect

Tracking

(Not tracked)

REOPENED

People

(Reporter: Gijs, Unassigned)

Details

(Keywords: conduit-triaged)

Running moz-phab patch -a . https://phabricator.services.mozilla.com/D57015 on current, up-to-date central gives me:

Patching revisions: D56283 D56284 D56285 D56286 D56287 D56288 D56289 D56290 D56291 D56292 D56634 D56773 D57015
Checked out .
file browser/components/ssb/tests/browser/test_page.html already exists
1 out of 1 hunks FAILED -- saving rejects to file browser/components/ssb/tests/browser/test_page.html.rej
file browser/components/ssb/tests/browser/head.js already exists
1 out of 1 hunks FAILED -- saving rejects to file browser/components/ssb/tests/browser/head.js.rej

and so on for every file in D56283 - because that revision is closed, having already landed.

moz-phab should not try to apply closed dependencies.

Keywords: conduit-triaged
Priority: -- → P2
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → DUPLICATE

This was duped to a bug about submit, but the problem still exists for patch, see the output in bug 1676220.

This is frustrating because I have to explicitly indicate --skip-dependencies or things fail to apply.

Status: RESOLVED → REOPENED
Resolution: DUPLICATE → ---

This continues to bite me and is pretty frustrating - it leaves junk in my srcdir and then I have to figure out what the "right" set of patches to apply is, and do it manually (ie apply each in turn with --skip-dependencies). Is there anything I can do to help resolve this / do we know what needs to happen here?

Flags: needinfo?(zeid)

When we pull down child dependencies from Phabricator we need to check if they are closed and remove them from the set of dependencies which will be applied. We already have the --include-abandoned flag, which is essentially the same behaviour except checking for abandoned revisions. So most of the work here is to add similar filtering but for the closed state.

I think this behaviour should be the default, but can be turned off via a config knob or the use of an --include-closed flag.

I'll try and write a patch for this when I have a few spare cycles.

Flags: needinfo?(zeid)
You need to log in before you can comment on or make changes to this bug.