This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10388

split: fix issue with empty splits adjusting phases
ClosedPublic

Authored by spectral on Apr 13 2021, 2:52 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8ee1ac083ee7: split: fix issue with empty splits adjusting phases

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Apr 13 2021, 2:52 PM
pulkit accepted this revision.Apr 14 2021, 7:48 PM
This revision is now accepted and ready to land.Apr 14 2021, 7:48 PM
spectral added a commit: rHG8ee1ac083ee7: split: fix issue with empty splits adjusting phases.Apr 14 2021, 8:41 PM
Closed by commit rHG8ee1ac083ee7: split: fix issue with empty splits adjusting phases (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (6 lines)
Mtests/test-split.t (21 lines)

Diff 26908

hgext/split.py

) % short(ctx.node()) ) % short(ctx.node())
opts.update( opts.update(
{ {
b'edit': True, b'edit': True,
b'interactive': True, b'interactive': True,
b'message': header + ctx.description(), b'message': header + ctx.description(),
} }
) )
origctx = repo[b'.']
commands.commit(ui, repo, **pycompat.strkwargs(opts)) commands.commit(ui, repo, **pycompat.strkwargs(opts))
newctx = repo[b'.'] newctx = repo[b'.']
# Ensure user didn't do a "no-op" split (such as deselecting
# everything).
if origctx.node() != newctx.node():
committed.append(newctx) committed.append(newctx)
if not committed: if not committed:
raise error.InputError(_(b'cannot split an empty revision')) raise error.InputError(_(b'cannot split an empty revision'))
scmutil.cleanupnodes( scmutil.cleanupnodes(
repo, repo,
{ctx.node(): [c.node() for c in committed]}, {ctx.node(): [c.node() for c in committed]},
operation=b'split', operation=b'split',

tests/test-split.t

$ hg phase -p $ hg phase -p
$ echo foo > foo $ echo foo > foo
$ hg ci -qAm foo $ hg ci -qAm foo
$ hg log -G -T'{phase} {rev}:{node|short} {desc}' $ hg log -G -T'{phase} {rev}:{node|short} {desc}'
@ draft 1:ae694b2901bb foo @ draft 1:ae694b2901bb foo
| |
o public 0:222799e2f90b r0 o public 0:222799e2f90b r0
FIXME: This should not show "So far it has been split into"
$ printf 'd\na\n' | HGEDITOR=cat hg split || true $ printf 'd\na\n' | HGEDITOR=cat hg split || true
diff --git a/foo b/foo diff --git a/foo b/foo
new file mode 100644 new file mode 100644
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] d (enter ? for help) [Ynesfdaq?] d
no changes to record no changes to record
diff --git a/foo b/foo diff --git a/foo b/foo
new file mode 100644 new file mode 100644
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] a (enter ? for help) [Ynesfdaq?] a
HG: Splitting ae694b2901bb. So far it has been split into: HG: Splitting ae694b2901bb. Write commit message for the first split changeset.
HG: - 0:222799e2f90b "r0"
HG: Write commit message for the next split changeset.
foo foo
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added foo HG: added foo
warning: commit already existed in the repository! warning: commit already existed in the repository!
saved backup bundle to $TESTTMP/noop/.hg/strip-backup/ae694b2901bb-28e0b457-split.hg (obsstore-off !) saved backup bundle to $TESTTMP/noop/.hg/strip-backup/ae694b2901bb-28e0b457-split.hg (obsstore-off !)
transaction abort! (obsstore-on !) transaction abort! (obsstore-on !)
rollback completed (obsstore-on !) rollback completed (obsstore-on !)
abort: changeset ae694b2901bb cannot obsolete itself (obsstore-on !) abort: changeset ae694b2901bb cannot obsolete itself (obsstore-on !)
FIXME: this should not have stripped the commit we just no-op split FIXME: this should not have stripped the commit we just no-op split
(obsstore-off only), or made r0 draft. (obsstore-off only)
$ hg log -G -T'{phase} {rev}:{node|short} {desc}' $ hg log -G -T'{phase} {rev}:{node|short} {desc}'
warning: ignoring unknown working parent ae694b2901bb! (obsstore-off !) warning: ignoring unknown working parent ae694b2901bb! (obsstore-off !)
@ draft 1:ae694b2901bb foo (obsstore-on !) @ draft 1:ae694b2901bb foo (obsstore-on !)
| (obsstore-on !) | (obsstore-on !)
o public 0:222799e2f90b r0 (obsstore-on !) o public 0:222799e2f90b r0
o draft 0:222799e2f90b r0 (obsstore-off !)
Now try the same thing but modifying the message so we don't trigger the Now try the same thing but modifying the message so we don't trigger the
identical changeset failures identical changeset failures
$ hg init $TESTTMP/noop2 $ hg init $TESTTMP/noop2
$ cd $TESTTMP/noop2 $ cd $TESTTMP/noop2
$ echo r0 > r0 $ echo r0 > r0
$ hg ci -qAm r0 $ hg ci -qAm r0
$ hg phase -p $ hg phase -p
$ echo foo > foo $ echo foo > foo
$ hg ci -qAm foo $ hg ci -qAm foo
$ hg log -G -T'{phase} {rev}:{node|short} {desc}' $ hg log -G -T'{phase} {rev}:{node|short} {desc}'
@ draft 1:ae694b2901bb foo @ draft 1:ae694b2901bb foo
| |
o public 0:222799e2f90b r0 o public 0:222799e2f90b r0
$ cat > $TESTTMP/messages <<EOF $ cat > $TESTTMP/messages <<EOF
> message1 > message1
> EOF > EOF
FIXME: This should not show "So far it has been split into"
$ printf 'd\na\n' | HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" hg split $ printf 'd\na\n' | HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" hg split
diff --git a/foo b/foo diff --git a/foo b/foo
new file mode 100644 new file mode 100644
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] d (enter ? for help) [Ynesfdaq?] d
no changes to record no changes to record
diff --git a/foo b/foo diff --git a/foo b/foo
new file mode 100644 new file mode 100644
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] a (enter ? for help) [Ynesfdaq?] a
EDITOR: HG: Splitting ae694b2901bb. So far it has been split into: EDITOR: HG: Splitting ae694b2901bb. Write commit message for the first split changeset.
EDITOR: HG: - 0:222799e2f90b "r0"
EDITOR: HG: Write commit message for the next split changeset.
EDITOR: foo EDITOR: foo
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: branch 'default' EDITOR: HG: branch 'default'
EDITOR: HG: added foo EDITOR: HG: added foo
created new head created new head
saved backup bundle to $TESTTMP/noop2/.hg/strip-backup/ae694b2901bb-28e0b457-split.hg (obsstore-off !) saved backup bundle to $TESTTMP/noop2/.hg/strip-backup/ae694b2901bb-28e0b457-split.hg (obsstore-off !)
FIXME: this should not have made r0 draft
$ hg log -G -T'{phase} {rev}:{node|short} {desc}' $ hg log -G -T'{phase} {rev}:{node|short} {desc}'
@ draft 1:de675559d3f9 message1 (obsstore-off !) @ draft 1:de675559d3f9 message1 (obsstore-off !)
@ draft 2:de675559d3f9 message1 (obsstore-on !) @ draft 2:de675559d3f9 message1 (obsstore-on !)
| |
o draft 0:222799e2f90b r0 o public 0:222799e2f90b r0
#if obsstore-on #if obsstore-on
FIXME: this should not have marked 222799e (r0) as a precursor of anything.
$ hg debugobsolete $ hg debugobsolete
ae694b2901bb8b0f8c4b5e075ddec0d63468d57a 222799e2f90be09ccbe49f519c4615d8375a9242 de675559d3f93ffc822c6eb7490e5c73033f17c7 0 * (glob) ae694b2901bb8b0f8c4b5e075ddec0d63468d57a de675559d3f93ffc822c6eb7490e5c73033f17c7 0 * (glob)
#endif #endif