← Back to branch summary

~lifeless/bzrtools/trunk

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Robert Collins
  • Date: 2008-07-08 04:10:56 UTC
  • Revision ID: robertc@robertcollins.net-20080708041056-f4c2a420k479zmxh
Teach shelve to create a merge --interactive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
360
360
        return 0
361
361
 
362
362
 
 
363
class cmd_merge(BzrToolsCommand):
 
364
    __doc__ = bzrlib.builtins.cmd_merge.__doc__
 
365
 
 
366
    _original_command = None
 
367
    encoding_type = bzrlib.builtins.cmd_merge.encoding_type
 
368
    _see_also = bzrlib.builtins.cmd_merge._see_also
 
369
    takes_args = bzrlib.builtins.cmd_merge.takes_args
 
370
    takes_options =  bzrlib.builtins.cmd_merge.takes_options
 
371
    takes_options.append(Option('interactive', short_name='i',
 
372
        help='Prompt for hunks to merge.'))
 
373
 
 
374
    def run(self, location=None, revision=None, force=False,
 
375
            merge_type=None, show_base=False, reprocess=False, remember=False,
 
376
            uncommitted=False, pull=False,
 
377
            directory=None,
 
378
            preview=False,
 
379
            interactive=False,
 
380
            ):
 
381
        if not interactive:
 
382
            return
 
383
        source = BzrPatchSource(None, None)
 
384
        s = shelf.Shelf(source.base)
 
385
        s.shelve(source, False, None, False, merge_mode=True)
 
386
        return 0
 
387
 
 
388
    def run_argv_aliases(self, argv, alias_argv=None):
 
389
        """Decorate bzr's cmd_merge to run a shelve with merge_hunk_selector."""
 
390
        orig_argv = list(argv)
 
391
        if '-i' in argv:
 
392
            argv.remove('-i')
 
393
        if '--interactive' in argv:
 
394
            argv.remove('--interactive')
 
395
        self._original_command().run_argv_aliases(argv, alias_argv)
 
396
        super(cmd_merge, self).run_argv_aliases(orig_argv, alias_argv)
 
397
 
 
398
 
 
399
cmd_merge._original_command = bzrlib.commands.register_command(
 
400
    cmd_merge, True)
 
401
 
 
402
 
363
403
class cmd_shell(BzrToolsCommand):
364
404
    """Begin an interactive shell tailored for bzr.
365
405
    Bzr commands can be used without typing bzr first, and will be run natively