diff --git a/hggit/git_handler.py b/hggit/git_handler.py index ad15a2ecf989077f497c044315496f487637a98a_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..03d8e33bf7761526048576c5374cb89735268d49_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -597,8 +597,8 @@ '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] @@ -601,6 +601,6 @@ 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 @@ -606,5 +606,5 @@ 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.