Patchwork D2016: split: preserve phase of commit that is being split

login
register
mail settings
Submitter phabricator
Date Feb. 2, 2018, 11:40 p.m.
Message ID <differential-rev-PHID-DREV-5jw45qxmwk3uku5wten3-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27244/
State Superseded
Headers show

Comments

phabricator - Feb. 2, 2018, 11:40 p.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  With this change, `hg split` will preserve the phase of the commit that is being
  split, ignoring the phases.new-commit setting. Previously, we would use whatever
  phases.new-commit was set to (unless our parent was secret, then we would be
  secret even if phases.new-commit=draft).
  
  Now, splitting a draft commit with phases.new-commit=secret does not cause the
  new commits to become secret, and splitting a secret commit with
  phases.new-commit=draft and a draft parent does not cause the new commits to
  become draft.

REPOSITORY
  rHG Mercurial

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

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

CHANGE DETAILS




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

Patch

diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -531,3 +531,36 @@ 
   o  0:426bada5c675 A
   
 #endif
+
+Preserve secret phase in split
+
+  $ cp -R $TESTTMP/clean $TESTTMP/phases1
+  $ cd $TESTTMP/phases1
+  $ hg phase --secret -fr tip
+  $ hg log -T '{short(node)} {phase}\n'
+  1df0d5c5a3ab secret
+  a61bcde8c529 draft
+  $ runsplit tip >/dev/null
+  $ hg log -T '{short(node)} {phase}\n'
+  00eebaf8d2e2 secret
+  a09ad58faae3 secret
+  e704349bd21b secret
+  a61bcde8c529 draft
+
+Do not move things to secret even if phases.new-commit=secret
+
+  $ cp -R $TESTTMP/clean $TESTTMP/phases2
+  $ cd $TESTTMP/phases2
+  $ cat >> .hg/hgrc <<EOF
+  > [phases]
+  > new-commit=secret
+  > EOF
+  $ hg log -T '{short(node)} {phase}\n'
+  1df0d5c5a3ab draft
+  a61bcde8c529 draft
+  $ runsplit tip >/dev/null
+  $ hg log -T '{short(node)} {phase}\n'
+  00eebaf8d2e2 draft
+  a09ad58faae3 draft
+  e704349bd21b draft
+  a61bcde8c529 draft
diff --git a/hgext/split.py b/hgext/split.py
--- a/hgext/split.py
+++ b/hgext/split.py
@@ -86,6 +86,7 @@ 
         if ctx.phase() == phases.public:
             raise error.Abort(_('cannot split public changeset'),
                               hint=_("see 'hg help phases' for details"))
+        opts['secret'] = ctx.phase() == phases.secret
 
         descendants = list(repo.revs('(%d::) - (%d)', rev, rev))
         alloworphaned = obsolete.isenabled(repo, obsolete.allowunstableopt)