From 0c4f25ccd3746e04cd66c6334f7c05e4a941a25a Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Mon, 13 Aug 2012 18:56:27 +0200 Subject: [PATCH] git_handler: fix safehasattr - hg util is hgutil --- hggit/git_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hggit/git_handler.py b/hggit/git_handler.py index d14be8f7c2..cd8d982975 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -597,14 +597,14 @@ class GitHandler(object): 'name' in self._tags: # Mercurial 1.5 and later. del self.repo._tags[name] - if (util.safehasattr(self.repo, '_tagtypes') and + if (hgutil.safehasattr(self.repo, '_tagtypes') and self.repo._tagtypes and name in self.repo._tagtypes): # Mercurial 1.9 and earlier. del self.repo._tagtypes[name] - elif (util.safehasattr(self.repo, 'tagscache') and + elif (hgutil.safehasattr(self.repo, 'tagscache') and self.repo.tagscache and - util.safehasattr(self.repo.tagscache, '_tagtypes') and + hgutil.safehasattr(self.repo.tagscache, '_tagtypes') and self.repo.tagscache._tagtypes and name in self.repo.tagscache._tagtypes): # Mercurial 2.0 and later.