Mercurial > hg
comparison hgext/mq.py @ 16416:c3aedd526d53 stable
mq: replace hasattr() with util.safehasattr(), update check-code.py
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Fri, 13 Apr 2012 15:07:13 +0200 |
| parents | 7ee8aa662937 |
| children | 9b26d541e972 |
comparison
equal
deleted
inserted
replaced
| 16396:03e408a122c4 | 16416:c3aedd526d53 |
|---|---|
| 3306 repo.__class__ = mqrepo | 3306 repo.__class__ = mqrepo |
| 3307 | 3307 |
| 3308 repo._phasedefaults.append(mqphasedefaults) | 3308 repo._phasedefaults.append(mqphasedefaults) |
| 3309 | 3309 |
| 3310 def mqimport(orig, ui, repo, *args, **kwargs): | 3310 def mqimport(orig, ui, repo, *args, **kwargs): |
| 3311 if (hasattr(repo, 'abortifwdirpatched') | 3311 if (util.safehasattr(repo, 'abortifwdirpatched') |
| 3312 and not kwargs.get('no_commit', False)): | 3312 and not kwargs.get('no_commit', False)): |
| 3313 repo.abortifwdirpatched(_('cannot import over an applied patch'), | 3313 repo.abortifwdirpatched(_('cannot import over an applied patch'), |
| 3314 kwargs.get('force')) | 3314 kwargs.get('force')) |
| 3315 return orig(ui, repo, *args, **kwargs) | 3315 return orig(ui, repo, *args, **kwargs) |
| 3316 | 3316 |