From: Felipe Contreras Date: Sat, 25 May 2013 02:30:01 GMT Subject: [PATCH v2 45/48] remote-hg: trivial cleanup Message-ID: <1369449004-17981-46-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369449004-17981-1-git-send-email-felipe.contreras@gmail.com> It's better to catch the exception later on. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 1e61f43..b08f909 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -185,10 +185,7 @@ class Marks: return rev in self.marks def get_tip(self, branch): - try: - return str(self.tips[branch]) - except KeyError: - return None + return str(self.tips[branch]) def set_tip(self, branch, tip): self.tips[branch] = tip @@ -433,10 +430,10 @@ def export_ref(repo, name, kind, head): global prefix, marks, mode ename = '%s/%s' % (kind, name) - tip = marks.get_tip(ename) - if tip and tip in repo: + try: + tip = marks.get_tip(ename) tip = repo[tip].rev() - else: + except: tip = 0 revs = xrange(tip, head.rev() + 1) -- 1.8.3.rc3.312.g47657de