From 2cd65cc444576cdf3fede2868ac6cd7d31b59822 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 24 May 2013 21:30:00 -0500 Subject: [PATCH] remote-helpers: improve marks usage Always convert to strings (they are unicode because they come from JSON). Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- git-remote-hg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index bd545aa..1e61f43 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -165,7 +165,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 @@ -185,7 +185,10 @@ class Marks: return rev in self.marks def get_tip(self, branch): - return self.tips.get(branch, None) + try: + return str(self.tips[branch]) + except KeyError: + return None def set_tip(self, branch, tip): self.tips[branch] = tip