/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/upload/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/upload/cmds.py
16
16
 
17
17
"""bzr-upload command implementations."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from ... import (
20
22
    commands,
21
23
    config,
37
39
    )
38
40
""")
39
41
 
 
42
from ...sixish import (
 
43
    text_type,
 
44
    )
40
45
 
41
46
auto_option = config.Option(
42
47
    'upload_auto', default=False, from_unicode=config.bool_from_store,
478
483
                      help='Branch to upload from, '
479
484
                      'rather than the one containing the working directory.',
480
485
                      short_name='d',
481
 
                      type=str,
 
486
                      type=text_type,
482
487
                      ),
483
488
        option.Option('auto',
484
489
                      'Trigger an upload from this branch whenever the tip '