Browse Source

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>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
081811216e
  1. 4
      contrib/remote-helpers/git-remote-bzr

4
contrib/remote-helpers/git-remote-bzr

@ -95,7 +95,7 @@ class Marks: @@ -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): @@ -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

Loading…
Cancel
Save