Mercurial > hg > hg-git
diff hggit/git_handler.py @ 475:03d8e33bf776
git_handler: fix safehasattr - hg util is hgutil
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 13 Aug 2012 18:56:27 +0200 |
parents | 5861777f2f5e |
children | b9ede5f91701 68e5dddc7a20 |
line wrap: on
line diff
--- 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.