/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Gordon Tyler
  • Date: 2010-11-12 02:02:40 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20101112020240-ko26mz9j34q3oh9n
Reverted some more command-related stuff that I missed earlier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3837
3837
        Option('preview', help='Instead of merging, show a diff of the'
3838
3838
               ' merge.'),
3839
3839
        Option('interactive', help='Select changes interactively.',
3840
 
            short_name='i'),
 
3840
            short_name='i')
3841
3841
    ]
3842
3842
 
3843
3843
    def run(self, location=None, revision=None, force=False,
4124
4124
    """
4125
4125
    takes_args = ['file*']
4126
4126
    takes_options = [
4127
 
        'merge-type',
4128
 
        'reprocess',
4129
 
        Option('show-base',
4130
 
               help="Show base revision text in conflicts.")
 
4127
            'merge-type',
 
4128
            'reprocess',
 
4129
            Option('show-base',
 
4130
                   help="Show base revision text in conflicts.")
4131
4131
    ]
4132
4132
 
4133
4133
    def run(self, file_list=None, merge_type=None, show_base=False,
6106
6106
    for (name, aliases, module_name) in [
6107
6107
        ('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6108
6108
        ('cmd_config', [], 'bzrlib.config'),
6109
 
        ('cmd_conflicts', [], 'bzrlib.conflicts'),
6110
6109
        ('cmd_dpush', [], 'bzrlib.foreign'),
 
6110
        ('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6111
6111
        ('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
 
6112
        ('cmd_conflicts', [], 'bzrlib.conflicts'),
6112
6113
        ('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6113
6114
        ('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6114
 
        ('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6115
6115
        ]:
6116
6116
        builtin_command_registry.register_lazy(name, aliases, module_name)