/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: Jelmer Vernooij
  • Date: 2018-07-17 21:20:55 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7050.
  • Revision ID: jelmer@jelmer.uk-20180717212055-apkv1s70oo6wpi6o
Fix a few more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
888
888
            if path == "":
889
889
                continue
890
890
            if show_ids:
891
 
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
 
891
                self.outf.write('%-50s %s\n' % (path, entry.file_id.decode('utf-8')))
892
892
            else:
893
893
                self.outf.write(path)
894
894
                self.outf.write('\n')
1914
1914
    @display_command
1915
1915
    def run(self, filename):
1916
1916
        tree, relpath = WorkingTree.open_containing(filename)
1917
 
        i = tree.path2id(relpath)
1918
 
        if i is None:
 
1917
        file_id = tree.path2id(relpath)
 
1918
        if file_id is None:
1919
1919
            raise errors.NotVersionedError(filename)
1920
1920
        else:
1921
 
            self.outf.write(i + '\n')
 
1921
            self.outf.write(file_id.decode('utf-8') + '\n')
1922
1922
 
1923
1923
 
1924
1924
class cmd_file_path(Command):
3258
3258
            raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
3259
3259
                                         % revno)
3260
3260
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
3261
 
        self.outf.write("%s\n" % revid)
 
3261
        self.outf.write("%s\n" % revid.decode('utf-8'))
3262
3262
 
3263
3263
 
3264
3264
class cmd_export(Command):