Patchwork D6535: strip: use bailifchanged() instead of reimplementing it

login
register
mail settings
Submitter phabricator
Date June 17, 2019, 6 p.m.
Message ID <differential-rev-PHID-DREV-anyfska42nfdchqx36e2-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40555/
State Superseded
Headers show

Comments

phabricator - June 17, 2019, 6 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6535

AFFECTED FILES
  hgext/strip.py
  tests/test-mq.t
  tests/test-strip.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -551,7 +551,7 @@ 
 
   $ 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 @@ 
   $ echo a > a
   $ hg add a
   $ hg strip -B B
-  abort: local changes found
+  abort: uncommitted changes
   [255]
   $ hg bookmarks
    * B                         6:ff43616e5d0f
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -811,7 +811,7 @@ 
   $ echo y>y
   $ hg add y
   $ hg strip tip
-  abort: local changes found
+  abort: uncommitted changes
   [255]
 
 --force strip with local changes
diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -50,15 +50,7 @@ 
     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):