/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

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