This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	spectral	D10389 split: avoid strip if split is a no-op (identical to original)
Closed	spectral	D10388 split: fix issue with empty splits adjusting phases
Closed	spectral	D10387 split: add test demonstrating issue with empty splits adjusting phases

Diff 26909

	# Ensure user didn't do a "no-op" split (such as deselecting			# Ensure user didn't do a "no-op" split (such as deselecting
	# everything).			# everything).
	if origctx.node() != newctx.node():			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'))

				if len(committed) != 1 or committed[0].node() != ctx.node():
				# Ensure we don't strip a node if we produce the same commit as already
				# exists
	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',
	fixphase=True,			fixphase=True,
	)			)

	return committed[-1]			return committed[-1]


	def dorebase(ui, repo, src, destctx):			def dorebase(ui, repo, src, destctx):
	rebase.rebase(			rebase.rebase(
	ui,			ui,
	repo,			repo,
	rev=[revsetlang.formatspec(b'%ld', src)],			rev=[revsetlang.formatspec(b'%ld', src)],
	dest=revsetlang.formatspec(b'%d', destctx.rev()),			dest=revsetlang.formatspec(b'%d', destctx.rev()),
	)			)


	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 !)
	transaction abort! (obsstore-on !)
	rollback completed (obsstore-on !)
	abort: changeset ae694b2901bb cannot obsolete itself (obsstore-on !)
	FIXME: this should not have stripped the commit we just no-op split
	(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 !)			@ draft 1:ae694b2901bb foo
	@ draft 1:ae694b2901bb foo (obsstore-on !)			\|
	\| (obsstore-on !)
	o public 0:222799e2f90b r0			o public 0:222799e2f90b r0


	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