This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1025

fbhistedit: add graft histedit action
ClosedPublic

Authored by mbthomas on Oct 12 2017, 6:14 AM.

Download Raw Diff

Details

Reviewers

ryanmce

Group Reviewers

Restricted Project

Commits

rFBHGX59da598a3d75: fbhistedit: add graft histedit action

Summary

Add a new histedit verb: graft. This allows grafting (copying) of
changesets from outside of the history that is being edited, using the
node hash of the other changeset.

The other changeset is left intact - its contents are duplicated in a new
changeset.

The other changeset must not be one of the changesets that are being
edited as part of the histedit.

Diff Detail

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Oct 12 2017, 6:14 AM

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 12 2017, 6:14 AM

mbthomas added a reviewer: ryanmce.Oct 12 2017, 6:15 AM

What happens if you attempt to graft an ancestor that isn't listed? Say you run hg histedit .^ and graft the hash of .^^? Does this behave like graft -f, which would attempt to apply it, or like graft which would skip it because it's an ancestor?

I wish graft were 4 chars...

tests/test-fbhistedit-graft.t
60–68	At first I was confused by the new rev numbers here, but then I realized that in this test we're actually still stripping the old rev 3, thus the re-ordering of rev numbers.

This revision is now accepted and ready to land.Oct 13 2017, 6:43 AM

It acts like graft -f and allows you to reapply it. I picked this deliberately as it's the more flexible option, and lets users reapply backed-out changes. For example: you make a commit and publish it, and then make a draft stack that depends on that commit. Someone else backs out your change, which you discover when you rebase your stack and it breaks. You can now use histedit to re-introduce it into your stack at an appropriate point (and presumably then fix whatever it was that caused them to back it out).

Closed by commit rFBHGX59da598a3d75: fbhistedit: add graft histedit action (authored by mbthomas). · Explain WhyOct 13 2017, 10:33 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext3rd/fbhistedit.py (14 lines)
A	M		tests/test-fbhistedit-graft.t (93 lines)

Diff 2688

hgext3rd/fbhistedit.py


	@histedit.action(['execr', 'xr'],			@histedit.action(['execr', 'xr'],
	_('execute given command relative to current directory'))			_('execute given command relative to current directory'))
	class executerelative(execute):			class executerelative(execute):
	def __init__(self, state, command):			def __init__(self, state, command):
	super(executerelative, self).__init__(state, command)			super(executerelative, self).__init__(state, command)
	self.cwd = pycompat.getcwd()			self.cwd = pycompat.getcwd()

				@histedit.action(['graft', 'g'],
				_('graft a commit from elsewhere'))
				class graft(histedit.histeditaction):
				def _verifynodeconstraints(self, prev, expected, seen):
				if self.node in expected:
				msg = _('%s "%s" changeset was an edited list candidate')
				raise error.ParseError(
				msg % (self.verb, node.short(self.node)),
				hint=_('graft must only use unlisted changesets'))

				def continueclean(self):
				ctx, replacement = super(graft, self).continueclean()
				return ctx, []

	return stop, execute, executerelative			return stop, execute, executerelative

	def extsetup(ui):			def extsetup(ui):
	try:			try:
	extensions.find('histedit')			extensions.find('histedit')
	except KeyError:			except KeyError:
	raise error.Abort(			raise error.Abort(
	_('fbhistedit: please enable histedit extension as well'))			_('fbhistedit: please enable histedit extension as well'))

tests/test-fbhistedit-graft.t

This file was added.

				$ . "$TESTDIR/histedit-helpers.sh"

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> histedit=
				> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
				> [alias]
				> tglog = log -G --template "{rev}:{node}:{phase} '{desc}'\n"
				> EOF

				$ hg init repo
				$ cd repo
				$ echo base > base
				$ hg add base
				$ hg commit -m "base"
				$ for x in a b c ; do
				> echo $x > $x
				> hg add $x
				> hg commit -m $x
				> done
				$ hg up -q 0
				$ for x in d e f ; do
				> echo $x > $x
				> hg add $x
				> hg commit -m $x
				> done
				created new head
				$ hg tglog
				@ 6:1eb7eda15cd7b2222738a7c9b47d1f51349b2bdb:draft 'f'
				\|
				o 5:581a2eefdc84e2ec03c03b152f4982eefd77d7d8:draft 'e'
				\|
				o 4:331acda6ee0072ace4b46c46bf80bb585d55d799:draft 'd'
				\|
				\| o 3:f9d2e574dc5853aac398917ed798d8640e8203af:draft 'c'
				\| \|
				\| o 2:c87fe1ae405ff0a6dcc1ce27064cb9d303a05734:draft 'b'
				\| \|
				\| o 1:c604726e05fb3a349978173b3ab4a3ee6e43cd6c:draft 'a'
				\|/
				o 0:d20a80d4def38df63a4b330b7fb688f3d4cae1e3:draft 'base'

				Use histedit to graft an extra commit into current history

				$ hg up -q 3
				$ hg histedit 1 --commands - 2>&1 << EOF \| fixbundle
				> pick c604726e05fb
				> pick c87fe1ae405f
				> graft 581a2eefdc84
				> pick f9d2e574dc58
				> EOF
				[1]

				$ hg tglog
				@ 7:fc9a25c1b8afb917f8e3dacad873f0d0bea14a96:draft 'c'
				\|
				o 6:efc3ff9af0d1c5d50876bd81f6c4782dccc1c5b2:draft 'e'
				\|
				\| o 5:1eb7eda15cd7b2222738a7c9b47d1f51349b2bdb:draft 'f'
				\| \|
				\| o 4:581a2eefdc84e2ec03c03b152f4982eefd77d7d8:draft 'e'
				\| \|
				\| o 3:331acda6ee0072ace4b46c46bf80bb585d55d799:draft 'd'
				\| \|
				o \| 2:c87fe1ae405ff0a6dcc1ce27064cb9d303a05734:draft 'b'
				\| \|
				o \| 1:c604726e05fb3a349978173b3ab4a3ee6e43cd6c:draft 'a'
				\|/
				ryanmceUnsubmitted Not Done At first I was confused by the new rev numbers here, but then I realized that in this test we're actually still stripping the old rev 3, thus the re-ordering of rev numbers. ryanmce: At first I was confused by the new rev numbers here, but then I realized that in this test…
				o 0:d20a80d4def38df63a4b330b7fb688f3d4cae1e3:draft 'base'

				Try to use histedit to graft a non-existent commit

				$ hg histedit 1 --commands - 2>&1 << EOF \| fixbundle
				> pick c604726e05fb
				> pick c87fe1ae405f
				> graft abcdefabcdef
				> pick fc3ff9af0d1c
				> pick fc9a25c1b8af
				> EOF
				hg: parse error: unknown changeset abcdefabcdef listed

				Try to use histedit to graft a commit from the set of commits being edited

				$ hg histedit 1 --commands - 2>&1 << EOF \| fixbundle
				> pick c604726e05fb
				> pick c87fe1ae405f
				> graft fc9a25c1b8af
				> pick fc3ff9af0d1c
				> pick fc9a25c1b8af
				> EOF
				hg: parse error: graft "fc9a25c1b8af" changeset was an edited list candidate
				(graft must only use unlisted changesets)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2614		Oct 12 2017, 6:14 AM	★	★
Diff 2	2688	rFBHGX59da598a3d7519cb11579b05f0a34aa77282d464	Oct 13 2017, 7:05 AM	★	★