undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-bzr: convert all unicode keys to str

Browse Source 
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:
Felipe Contreras 2013-05-03 19:31:06 -05:00 committed by Junio C Hamano
parent d421c02b41
commit 081811216e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ class Marks:
return self.marks[rev] return self.marks[rev]
def to_rev(self, mark): def to_rev(self, mark):
return self.rev_marks[mark] return str(self.rev_marks[mark])
def next_mark(self): def next_mark(self):
self.last_mark += 1 self.last_mark += 1
@ -621,7 +621,7 @@ def parse_commit(parser):
files[path] = f files[path] = f
committer, date, tz = committer 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) revid = bzrlib.generate_ids.gen_revision_id(committer, date)
props = {} props = {}
props['branch-nick'] = branch.nick props['branch-nick'] = branch.nick