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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
84
84
    )
85
85
from .sixish import (
86
86
    BytesIO,
 
87
    PY3,
87
88
    text_type,
88
89
    viewitems,
89
90
    viewvalues,
1581
1582
                else:
1582
1583
                    prefix = " "
1583
1584
                self.outf.write("%s %s\n" % (
1584
 
                    prefix, name.encode(self.outf.encoding)))
 
1585
                    prefix, (name if PY3 else name.encode(self.outf.encoding))))
1585
1586
 
1586
1587
 
1587
1588
class cmd_checkout(Command):
5461
5462
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5462
5463
                 revno=revno, local=local, keep_tags=keep_tags)
5463
5464
        self.outf.write(gettext('You can restore the old tip by running:\n'
5464
 
             '  brz pull . -r revid:%s\n') % last_rev_id)
 
5465
             '  brz pull . -r revid:%s\n') % last_rev_id.decode('utf-8'))
5465
5466
 
5466
5467
 
5467
5468
class cmd_break_lock(Command):