strip: use bailifchanged() instead of reimplementing it

This also means that we get the standard error messages (see changed
test cases).

Differential Revision: https://phab.mercurial-scm.org/D6535

hgext/strip.py

@@ -50,15 +50,7 b' def checklocalchanges(repo, force=False)'
     cmdutil.checkunfinished(repo)
     s = repo.status()
     if not force:
-        if len(repo[None].parents()) > 1:
-            _("outstanding uncommitted merge") #i18 tool detection
-            raise error.Abort(_("outstanding uncommitted merge"))
-        if s.modified or s.added or s.removed or s.deleted:
-            _("local changes found") # i18n tool detection
-            raise error.Abort(_("local changes found"))
-        if checksubstate(repo):
-            _("local changed subrepos found") # i18n tool detection
-            raise error.Abort(_("local changed subrepos found"))
+        cmdutil.bailifchanged(repo)
     return s
 
 def _findupdatetarget(repo, nodes):

tests/test-mq.t

@@ -811,7 +811,7 b' strip with local changes, should complai'
   $ echo y>y
   $ hg add y
   $ hg strip tip
-  abort: local changes found
+  abort: uncommitted changes
   [255]
 
 --force strip with local changes

tests/test-strip.t

@@ -551,7 +551,7 b' Verify strip protects against stripping '
 
   $ echo c > b
   $ hg strip tip
-  abort: local changes found
+  abort: uncommitted changes
   [255]
   $ hg strip tip --keep
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
@@ -703,7 +703,7 b' test hg strip -B bookmark'
   $ echo a > a
   $ hg add a
   $ hg strip -B B
-  abort: local changes found
+  abort: uncommitted changes
   [255]
   $ hg bookmarks
    * B                         6:ff43616e5d0f