diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-03 19:31:06 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-06 09:18:52 -0700 |
| commit | 081811216e99fe0396d74d8a2bd6dd3d119dccde (patch) | |
| tree | 494ae64db1b500f038457546ee91828ded6b4228 | |
| parent | remote-bzr: access branches only when needed (diff) | |
| download | tgif-081811216e99fe0396d74d8a2bd6dd3d119dccde.tar.xz | |
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>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 4 |
1 files 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 |