/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 breezy/option.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/option.py
27
27
    registry as _mod_registry,
28
28
    revisionspec,
29
29
    )
30
 
from .sixish import (
31
 
    text_type,
32
 
    )
33
30
 
34
31
 
35
32
class BadOptionValue(errors.BzrError):
111
108
    >>> _parse_change_str('123..124')
112
109
    Traceback (most recent call last):
113
110
      ...
114
 
    RangeInChangeOption: Option --change does not accept revision ranges
 
111
    breezy.errors.RangeInChangeOption: Option --change does not accept revision ranges
115
112
    """
116
113
    revs = _parse_revision_str(revstr)
117
114
    if len(revs) > 1:
564
561
               short_name='c',
565
562
               param_name='revision',
566
563
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
567
 
_global_option('directory', short_name='d', type=text_type,
 
564
_global_option('directory', short_name='d', type=str,
568
565
               help='Branch to operate on, instead of working directory.')
569
 
_global_option('file', type=text_type, short_name='F')
 
566
_global_option('file', type=str, short_name='F')
570
567
_global_registry_option('log-format', "Use specified log format.",
571
568
                        lazy_registry=('breezy.log', 'log_formatter_registry'),
572
569
                        value_switches=True, title='Log format',
574
571
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
575
572
                        lazy_registry=('breezy.merge', 'merge_type_registry'),
576
573
                        value_switches=True, title='Merge algorithm')
577
 
_global_option('message', type=text_type,
 
574
_global_option('message', type=str,
578
575
               short_name='m',
579
576
               help='Message string.')
580
577
_global_option('null', short_name='0',