D7686: split: use rewriteutil.precheck() instead of reimplementing it

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG2349a60f33db: split: use rewriteutil.precheck() instead of reimplementing it (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7686?vs=18830&id=18861

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7686/new/

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

AFFECTED FILES
  hgext/split.py
  tests/test-split.t

CHANGE DETAILS

diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -77,7 +77,7 @@
 
   $ hg phase --public -r 'all()'
   $ hg split .
-  abort: cannot split public changeset
+  abort: cannot split public changesets
   (see 'hg help phases' for details)
   [255]
 
@@ -466,7 +466,7 @@
   $ cd $TESTTMP/d
 #if obsstore-off
   $ runsplit -r 1 --no-rebase
-  abort: cannot split changeset with children without rebase
+  abort: cannot split changeset with children
   [255]
 #else
   $ runsplit -r 1 --no-rebase >/dev/null
@@ -517,7 +517,7 @@
   $ eval `hg tags -T '{tag}={node}\n'`
   $ rm .hg/localtags
   $ hg split $B --config experimental.evolution=createmarkers
-  abort: split would leave orphaned changesets behind
+  abort: cannot split changeset with children
   [255]
   $ cat > $TESTTMP/messages <<EOF
   > Split B
diff --git a/hgext/split.py b/hgext/split.py
--- a/hgext/split.py
+++ b/hgext/split.py
@@ -22,11 +22,10 @@
     commands,
     error,
     hg,
-    obsolete,
-    phases,
     pycompat,
     registrar,
     revsetlang,
+    rewriteutil,
     scmutil,
 )
 
@@ -77,45 +76,26 @@
 
         rev = revs.first()
         ctx = repo[rev]
+        # Handle nullid specially here (instead of leaving for precheck()
+        # below) so we get a nicer message and error code.
         if rev is None or ctx.node() == nullid:
             ui.status(_(b'nothing to split\n'))
             return 1
         if ctx.node() is None:
             raise error.Abort(_(b'cannot split working directory'))
 
-        # rewriteutil.precheck is not very useful here because:
-        # 1. null check is done above and it's more friendly to return 1
-        #    instead of abort
-        # 2. mergestate check is done below by cmdutil.bailifchanged
-        # 3. unstable check is more complex here because of --rebase
-        #
-        # So only "public" check is useful and it's checked directly here.
-        if ctx.phase() == phases.public:
-            raise error.Abort(
-                _(b'cannot split public changeset'),
-                hint=_(b"see 'hg help phases' for details"),
-            )
-
-        descendants = list(repo.revs(b'(%d::) - (%d)', rev, rev))
-        alloworphaned = obsolete.isenabled(repo, obsolete.allowunstableopt)
         if opts.get(b'rebase'):
             # Skip obsoleted descendants and their descendants so the rebase
             # won't cause conflicts for sure.
+            descendants = list(repo.revs(b'(%d::) - (%d)', rev, rev))
             torebase = list(
                 repo.revs(
                     b'%ld - (%ld & obsolete())::', descendants, descendants
                 )
             )
-            if not alloworphaned and len(torebase) != len(descendants):
-                raise error.Abort(
-                    _(b'split would leave orphaned changesets behind')
-                )
         else:
-            if not alloworphaned and descendants:
-                raise error.Abort(
-                    _(b'cannot split changeset with children without rebase')
-                )
-            torebase = ()
+            torebase = []
+        rewriteutil.precheck(repo, [rev] + torebase, b'split')
 
         if len(ctx.parents()) > 1:
             raise error.Abort(_(b'cannot split a merge changeset'))



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