← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

(gz) Move merge_type_registry from bzrlib.options to bzrlib.merge (Martin
 Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
519
519
            _verbosity_level = -1
520
520
 
521
521
 
522
 
class MergeTypeRegistry(_mod_registry.Registry):
523
 
 
524
 
    pass
525
 
 
526
 
 
527
 
_merge_type_registry = MergeTypeRegistry()
528
 
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
529
 
                                   "Merge using external diff3.")
530
 
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
531
 
                                   "LCA-newness merge.")
532
 
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
533
 
                                   "Native diff3-style merge.")
534
 
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
535
 
                                   "Weave-based merge.")
536
 
 
537
522
# Declare the standard options
538
523
_standard_option('help', short_name='h',
539
524
                 help='Show help message.')
560
545
                        value_switches=True, title='Log format',
561
546
                        short_value_switches={'short': 'S'})
562
547
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
563
 
                        _merge_type_registry, value_switches=True,
564
 
                        title='Merge algorithm')
 
548
                        lazy_registry=('bzrlib.merge', 'merge_type_registry'),
 
549
                        value_switches=True, title='Merge algorithm')
565
550
_global_option('message', type=unicode,
566
551
               short_name='m',
567
552
               help='Message string.')