Skip to content

Commit 0818112

Browse files
felipecgitster
authored andcommitted
remote-bzr: convert all unicode keys to str
Otherwise some versions of bazaar might barf. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d421c02 commit 0818112

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/remote-helpers/git-remote-bzr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Marks:
9595
return self.marks[rev]
9696

9797
def to_rev(self, mark):
98-
return self.rev_marks[mark]
98+
return str(self.rev_marks[mark])
9999

100100
def next_mark(self):
101101
self.last_mark += 1
@@ -621,7 +621,7 @@ def parse_commit(parser):
621621
files[path] = f
622622

623623
committer, date, tz = committer
624-
parents = [str(mark_to_rev(p)) for p in parents]
624+
parents = [mark_to_rev(p) for p in parents]
625625
revid = bzrlib.generate_ids.gen_revision_id(committer, date)
626626
props = {}
627627
props['branch-nick'] = branch.nick

0 commit comments

Comments
 (0)