/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-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
3050
3050
            if verbose:
3051
3051
                outstring = '%-8s %s' % (fc, outstring)
3052
3052
                if show_ids and fid is not None:
3053
 
                    outstring = "%-50s %s" % (outstring, fid)
 
3053
                    outstring = "%-50s %s" % (outstring, fid.decode('utf-8'))
3054
3054
                self.outf.write(outstring + '\n')
3055
3055
            elif null:
3056
3056
                self.outf.write(fp + '\0')
3057
3057
                if show_ids:
3058
3058
                    if fid is not None:
3059
 
                        self.outf.write(fid)
 
3059
                        self.outf.write(fid.decode('utf-8'))
3060
3060
                    self.outf.write('\0')
3061
3061
                self.outf.flush()
3062
3062
            else:
3063
3063
                if show_ids:
3064
3064
                    if fid is not None:
3065
 
                        my_id = fid
 
3065
                        my_id = fid.decode('utf-8')
3066
3066
                    else:
3067
3067
                        my_id = ''
3068
3068
                    self.outf.write('%-50s %s\n' % (outstring, my_id))
6786
6786
        if len(installed) > 0:
6787
6787
            self.outf.write("Installed:\n")
6788
6788
            for rev in installed:
6789
 
                self.outf.write(rev + "\n")
 
6789
                self.outf.write(rev.decode('utf-8') + "\n")
6790
6790
        if len(failed) > 0:
6791
6791
            self.outf.write("Still missing:\n")
6792
6792
            for rev in failed:
6793
 
                self.outf.write(rev + "\n")
 
6793
                self.outf.write(rev.decode('utf-8') + "\n")
6794
6794
        if not no_fix and len(installed) > 0:
6795
6795
            cmd_reconcile().run(".")
6796
6796