From 081811216e99fe0396d74d8a2bd6dd3d119dccde Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 3 May 2013 19:31:06 -0500 Subject: remote-bzr: convert all unicode keys to str Otherwise some versions of bazaar might barf. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 161f83193c..bbaaa8f6f3 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -95,7 +95,7 @@ class Marks: return self.marks[rev] def to_rev(self, mark): - return self.rev_marks[mark] + return str(self.rev_marks[mark]) def next_mark(self): self.last_mark += 1 @@ -621,7 +621,7 @@ def parse_commit(parser): files[path] = f committer, date, tz = committer - parents = [str(mark_to_rev(p)) for p in parents] + parents = [mark_to_rev(p) for p in parents] revid = bzrlib.generate_ids.gen_revision_id(committer, date) props = {} props['branch-nick'] = branch.nick -- cgit v1.2.3