equal
deleted
inserted
replaced
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 |