← Back to branch summary

~abentley/thekraken/1.1

« back to all changes in this revision

Viewing changes to commands.py

  • Committer: Aaron Bentley
  • Date: 2010-12-03 00:55:12 UTC
  • Revision ID: aaron@aaronbentley.com-20101203005512-i8c03kkhomn6ybwz
Implement pump --reprocess.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
327
327
        Option('from',
328
328
               help="Pump start.  May be a pipe or a non-pipe.",
329
329
               type=unicode),
330
 
        Option('show-base', help='Show base revision text in conflicts.')
 
330
        Option('show-base', help='Show base revision text in conflicts.'),
 
331
        'reprocess'
331
332
    ]
332
333
 
333
334
    def run(self, directory=None, from_submit=False, show_base=False,
334
 
            **kwargs):
 
335
            reprocess=False, **kwargs):
335
336
        """Run the command.  kwargs are needed to accept --from."""
336
337
        tree, manager = self._get_checkout_manager(directory)
337
338
        unexpected = set(kwargs.keys()).difference(set(['from']))
354
355
        else:
355
356
            from_branch = None
356
357
 
357
 
        merge_config = MergeConfig(show_base)
 
358
        merge_config = MergeConfig(show_base, reprocess)
358
359
        if not manager.pipeline_merge(from_branch, merge_config):
359
360
            trace.note('Please resolve conflicts, commit, and re-run pump.')
360
361