488400 - pork_barrel: Add logic to to filter patches, and ensure they're unique

Status: RESOLVED FIXED

(Developer Infrastructure :: Source Code Analysis, defect)

Description

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

pork_barrel.py just smashes all patches output from child processes into a single patch.  This means when a header is modified during the rewrite of more than one .ii file, the changes are duplicated in the final patch.  That shouldn't happen.

Instead, duplicated changes should be merged into a unique hunk, and conflicting changes should trigger an error.

Comment 1

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

pork_barrel will be split into two parts:

  * process_manager, which has all the old pork_barrel logic unchanged
  * pork_barrel, which contains pork-specific logic for managing patches, a la pork-barrel.cc

The interface to process_manager will identical to that of the former pork_barrel, down to the command line arguments accepted.

Comment 2

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Attachment: New pork_barrel + process_manager tag team

r? to Taras for the patch logic in pork_barrel

Comment 3

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Comment on attachment 372810 [details] [diff] [review]
New pork_barrel + process_manager tag team

r? to David for process_manager

Comment 4

[(dormant account)]

Comment on attachment 372810 [details] [diff] [review]
New pork_barrel + process_manager tag team

i think this is ok.

Comment 5

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Attachment: same patch as above, but reparented to piglet/

Will be committing soon as part of porky import.

Comment 6

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Pushed
8127f912e99c Chris Jones - bug 488400: add process_manager.py, make pork_barrel.py smarter. r=tglek, r=dmandelin