/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/plugins/propose/cmds.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/plugins/propose/cmds.py
16
16
 
17
17
"""Propose command implementations."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from io import StringIO
20
22
 
21
23
from ... import (
34
36
    Option,
35
37
    RegistryOption,
36
38
    )
 
39
from ...sixish import text_type
37
40
from ...trace import note
38
41
from ... import (
39
42
    propose as _mod_propose,
136
139
            'hoster',
137
140
            help='Use the hoster.',
138
141
            lazy_registry=('breezy.plugins.propose.propose', 'hosters')),
139
 
        ListOption('reviewers', short_name='R', type=str,
 
142
        ListOption('reviewers', short_name='R', type=text_type,
140
143
                   help='Requested reviewers.'),
141
144
        Option('name', help='Name of the new remote branch.', type=str),
142
145
        Option('description', help='Description of the change.', type=str),
145
148
        Option(
146
149
            'commit-message',
147
150
            help='Set commit message for merge, if supported', type=str),
148
 
        ListOption('labels', short_name='l', type=str,
 
151
        ListOption('labels', short_name='l', type=text_type,
149
152
                   help='Labels to apply.'),
150
153
        Option('no-allow-lossy',
151
154
               help='Allow fallback to lossy push, if necessary.'),