/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

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