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

Fix existing object lookup issues when pulling from remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapping.py
209
209
            # We've hit a file that's not a child of the previous path
210
210
            tree.serialize()
211
211
            sha = tree.id
212
 
            yield sha, tree, cur
 
212
            yield sha, tree, cur.encode("utf-8")
213
213
            t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
214
214
            cur, tree = stack.pop()
215
215
            tree.add(*t)
226
226
            else:
227
227
                raise AssertionError("Unknown kind %s" % entry.kind)
228
228
            sha = blob.id
229
 
            yield sha, blob, path
 
229
            yield sha, blob, path.encode("utf-8")
230
230
            name = urlutils.basename(path).encode("utf-8")
231
231
            tree.add(entry_mode(entry), name, sha)
232
232
 
233
233
    while len(stack) > 1:
234
234
        tree.serialize()
235
235
        sha = tree.id
236
 
        yield sha, tree, cur
 
236
        yield sha, tree, cur.encode("utf-8")
237
237
        t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
238
238
        cur, tree = stack.pop()
239
239
        tree.add(*t)
240
240
 
241
241
    tree.serialize()
242
 
    yield tree.id, tree, cur
 
242
    yield tree.id, tree, cur.encode("utf-8")
243
243
 
244
244
 
245
245
def revision_to_commit(rev, tree_sha, parent_lookup):