remote-bzr: convert all unicode keys to str
Otherwise some versions of bazaar might barf. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 3, 2013 at 19:31 UTC
081811216e99fe0396d74d8a2bd6dd3d119dccde
1 file changed
+2
-2
contrib/remote-helpers/git-remote-bzr
+2
-2
@@ -95,7 +95,7 @@ class Marks:
95
return self.marks[rev]
96
97
def to_rev(self, mark):
98
- return self.rev_marks[mark]
98
+ return str(self.rev_marks[mark])
99
100
def next_mark(self):
101
self.last_mark += 1
@@ -621,7 +621,7 @@ def parse_commit(parser):
621
files[path] = f
622
623
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]
625
revid = bzrlib.generate_ids.gen_revision_id(committer, date)
626
props = {}
627
props['branch-nick'] = branch.nick