# HG changeset patch # User Mads Kiilerich <mads@kiilerich.com> # Date 1344876987 -7200 # Mon Aug 13 18:56:27 2012 +0200 # Node ID 03d8e33bf7761526048576c5374cb89735268d49 # Parent ad15a2ecf989077f497c044315496f487637a98a git_handler: fix safehasattr - hg util is hgutil diff --git a/hggit/git_handler.py b/hggit/git_handler.py --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -597,14 +597,14 @@ '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.