/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/git/roundtrip.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-02 01:50:36 UTC
  • mfrom: (6973.13.15 python3-l)
  • Revision ID: breezy.the.bot@gmail.com-20180702015036-p7h30yemu44e4p01
Fix more tests on Python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/roundtrip.py
156
156
    """
157
157
    lines = []
158
158
    for path in sorted(file_ids.keys()):
159
 
        lines.append(b"%s\0%s\n" % (path, file_ids[path]))
 
159
        lines.append(b"%s\0%s\n" % (path.encode('utf-8'), file_ids[path]))
160
160
    return lines
161
161
 
162
162
 
171
171
    lines = f.readlines()
172
172
    for l in lines:
173
173
        (path, file_id) = l.rstrip(b"\n").split(b"\0")
174
 
        ret[path] = file_id
 
174
        ret[path.decode('utf-8')] = file_id
175
175
    return ret