/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 bzrlib/builtins.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1666
1666
                        'regular expression.',
1667
1667
                   type=str),
1668
1668
            Option('limit',
 
1669
                   short_name='l',
1669
1670
                   help='Limit the output to the first N revisions.',
1670
1671
                   argname='N',
1671
1672
                   type=_parse_limit),
2231
2232
                    "files in the working tree."),
2232
2233
             ListOption('fixes', type=str,
2233
2234
                    help="Mark a bug as being fixed by this revision."),
2234
 
             Option('author', type=str,
 
2235
             Option('author', type=unicode,
2235
2236
                    help="Set the author's name, if it's different "
2236
2237
                         "from the committer."),
2237
2238
             Option('local',
3579
3580
                    Option('force', help='Say yes to all questions.')]
3580
3581
    takes_args = ['location?']
3581
3582
    aliases = []
 
3583
    encoding_type = 'replace'
3582
3584
 
3583
3585
    def run(self, location=None,
3584
3586
            dry_run=False, verbose=False,
4025
4027
    def _run(self, submit_branch, revision, public_branch, remember, format,
4026
4028
             no_bundle, no_patch, output, from_, mail_to, message):
4027
4029
        from bzrlib.revision import NULL_REVISION
 
4030
        branch = Branch.open_containing(from_)[0]
4028
4031
        if output is None:
4029
4032
            outfile = StringIO()
4030
4033
        elif output == '-':
4031
4034
            outfile = self.outf
4032
4035
        else:
4033
4036
            outfile = open(output, 'wb')
 
4037
        # we may need to write data into branch's repository to calculate
 
4038
        # the data to send.
 
4039
        branch.lock_write()
4034
4040
        try:
4035
 
            branch = Branch.open_containing(from_)[0]
4036
 
            # we may need to write data into branch's repository to calculate
4037
 
            # the data to send.
4038
 
            branch.lock_write()
4039
4041
            if output is None:
4040
4042
                config = branch.get_config()
4041
4043
                if mail_to is None: