Skip to content

Commit

Permalink
remote-bzr: convert all unicode keys to str
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed May 6, 2013
1 parent d421c02 commit 0818112
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/remote-helpers/git-remote-bzr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0818112

Please sign in to comment.