##// END OF EJS Templates
mq: rename abort_if_wdir_patched to abortifwdirpatched
Adrian Buehlmann -
r14596:6a0070d0 default
parent child Browse files
Show More
@@ -3095,7 +3095,7 b' def reposetup(ui, repo):'
3095 def mq(self):
3095 def mq(self):
3096 return queue(self.ui, self.join(""))
3096 return queue(self.ui, self.join(""))
3097
3097
3098 def abort_if_wdir_patched(self, errmsg, force=False):
3098 def abortifwdirpatched(self, errmsg, force=False):
3099 if self.mq.applied and not force:
3099 if self.mq.applied and not force:
3100 parents = self.dirstate.parents()
3100 parents = self.dirstate.parents()
3101 patches = [s.node for s in self.mq.applied]
3101 patches = [s.node for s in self.mq.applied]
@@ -3104,7 +3104,7 b' def reposetup(ui, repo):'
3104
3104
3105 def commit(self, text="", user=None, date=None, match=None,
3105 def commit(self, text="", user=None, date=None, match=None,
3106 force=False, editor=False, extra={}):
3106 force=False, editor=False, extra={}):
3107 self.abort_if_wdir_patched(
3107 self.abortifwdirpatched(
3108 _('cannot commit over an applied mq patch'),
3108 _('cannot commit over an applied mq patch'),
3109 force)
3109 force)
3110
3110
@@ -3189,9 +3189,9 b' def reposetup(ui, repo):'
3189 repo.__class__ = mqrepo
3189 repo.__class__ = mqrepo
3190
3190
3191 def mqimport(orig, ui, repo, *args, **kwargs):
3191 def mqimport(orig, ui, repo, *args, **kwargs):
3192 if (hasattr(repo, 'abort_if_wdir_patched')
3192 if (hasattr(repo, 'abortifwdirpatched')
3193 and not kwargs.get('no_commit', False)):
3193 and not kwargs.get('no_commit', False)):
3194 repo.abort_if_wdir_patched(_('cannot import over an applied patch'),
3194 repo.abortifwdirpatched(_('cannot import over an applied patch'),
3195 kwargs.get('force'))
3195 kwargs.get('force'))
3196 return orig(ui, repo, *args, **kwargs)
3196 return orig(ui, repo, *args, **kwargs)
3197
3197
General Comments 0
You need to be logged in to leave comments. Login now