facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

git_handler: fix safehasattr - hg util is hgutil

Browse Source
This commit is contained in:
Mads Kiilerich 2012-08-13 18:56:27 +02:00
parent 857bdca65d
commit 0c4f25ccd3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hggit/git_handler.py
View File

@ -597,14 +597,14 @@ class GitHandler(object):
'name' in self._tags: 'name' in self._tags:
# Mercurial 1.5 and later. # Mercurial 1.5 and later.
del self.repo._tags[name] del self.repo._tags[name]
if (util.safehasattr(self.repo, '_tagtypes') and if (hgutil.safehasattr(self.repo, '_tagtypes') and
self.repo._tagtypes and self.repo._tagtypes and
name in self.repo._tagtypes): name in self.repo._tagtypes):
# Mercurial 1.9 and earlier. # Mercurial 1.9 and earlier.
del self.repo._tagtypes[name] del self.repo._tagtypes[name]
elif (util.safehasattr(self.repo, 'tagscache') and elif (hgutil.safehasattr(self.repo, 'tagscache') and
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 self.repo.tagscache._tagtypes and
name in self.repo.tagscache._tagtypes): name in self.repo.tagscache._tagtypes):
# Mercurial 2.0 and later. # Mercurial 2.0 and later.