mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
d421c02b41
commit
081811216e
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue