← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2010-04-01 04:29:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5128.
  • Revision ID: mbp@sourcefrog.net-20100401042928-1rsluku2vrillege
Lazy-load conflict commands

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4066
4066
 
4067
4067
    def run(self, file_list=None, merge_type=None, show_base=False,
4068
4068
            reprocess=False):
 
4069
        from bzrlib.conflicts import restore
4069
4070
        if merge_type is None:
4070
4071
            merge_type = _mod_merge.Merge3Merger
4071
4072
        tree, file_list = tree_files(file_list)
5985
5986
    for (name, aliases, module_name) in [
5986
5987
        ('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5987
5988
        ('cmd_version_info', [], 'bzrlib.cmd_version_info'),
 
5989
        ('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
 
5990
        ('cmd_conflicts', [], 'bzrlib.conflicts'),
5988
5991
        ]:
5989
5992
        builtin_command_registry.register_lazy(name, aliases, module_name)
5990
5993
 
5991
5994
 
5992
 
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5993
5995
from bzrlib.foreign import cmd_dpush
5994
5996
from bzrlib.sign_my_commits import cmd_sign_my_commits