← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

(jelmer) Reduce the number of connections made during "bzr branch
 --stacked". (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
17
17
# TODO: For things like --diff-prefix, we want a way to customize the display
18
18
# of the option argument.
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
import optparse
23
21
import re
24
22
 
521
519
            _verbosity_level = -1
522
520
 
523
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
 
524
537
# Declare the standard options
525
538
_standard_option('help', short_name='h',
526
539
                 help='Show help message.')
547
560
                        value_switches=True, title='Log format',
548
561
                        short_value_switches={'short': 'S'})
549
562
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
550
 
                        lazy_registry=('bzrlib.merge', 'merge_type_registry'),
551
 
                        value_switches=True, title='Merge algorithm')
 
563
                        _merge_type_registry, value_switches=True,
 
564
                        title='Merge algorithm')
552
565
_global_option('message', type=unicode,
553
566
               short_name='m',
554
567
               help='Message string.')