equal
deleted
inserted
replaced
4184 |
4184 |
4185 repo._phasedefaults.append(mqphasedefaults) |
4185 repo._phasedefaults.append(mqphasedefaults) |
4186 |
4186 |
4187 |
4187 |
4188 def mqimport(orig, ui, repo, *args, **kwargs): |
4188 def mqimport(orig, ui, repo, *args, **kwargs): |
4189 if util.safehasattr(repo, 'abortifwdirpatched') and not kwargs.get( |
4189 if hasattr(repo, 'abortifwdirpatched') and not kwargs.get( |
4190 'no_commit', False |
4190 'no_commit', False |
4191 ): |
4191 ): |
4192 repo.abortifwdirpatched( |
4192 repo.abortifwdirpatched( |
4193 _(b'cannot import over an applied patch'), kwargs.get('force') |
4193 _(b'cannot import over an applied patch'), kwargs.get('force') |
4194 ) |
4194 ) |