strip: move checklocalchanges from mq to strip
One more step for issue3824.
--- a/hgext/mq.py Thu Sep 26 23:12:43 2013 +0200
+++ b/hgext/mq.py Thu Sep 26 23:32:52 2013 +0200
@@ -89,6 +89,8 @@
stripext = extensions.load(dummyui(), 'strip', '')
checksubstate = stripext.checksubstate
+checklocalchanges = stripext.checklocalchanges
+
# Patch names looks like unix-file names.
# They must be joinable with queue directory and result in the patch path.
@@ -2909,18 +2911,6 @@
q.savedirty()
return 0
-def checklocalchanges(repo, force=False, excsuffix=''):
- cmdutil.checkunfinished(repo)
- m, a, r, d = repo.status()[:4]
- if not force:
- if (m or a or r or d):
- _("local changes found") # i18n tool detection
- raise util.Abort(_("local changes found" + excsuffix))
- if checksubstate(repo):
- _("local changed subrepos found") # i18n tool detection
- raise util.Abort(_("local changed subrepos found" + excsuffix))
- return m, a, r, d
-
def strip(ui, repo, revs, update=True, backup="all", force=None):
wlock = lock = None
try:
--- a/hgext/strip.py Thu Sep 26 23:12:43 2013 +0200
+++ b/hgext/strip.py Thu Sep 26 23:32:52 2013 +0200
@@ -22,3 +22,15 @@
inclsubs.append(s)
return inclsubs
+def checklocalchanges(repo, force=False, excsuffix=''):
+ cmdutil.checkunfinished(repo)
+ m, a, r, d = repo.status()[:4]
+ if not force:
+ if (m or a or r or d):
+ _("local changes found") # i18n tool detection
+ raise util.Abort(_("local changes found" + excsuffix))
+ if checksubstate(repo):
+ _("local changed subrepos found") # i18n tool detection
+ raise util.Abort(_("local changed subrepos found" + excsuffix))
+ return m, a, r, d
+