This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3657

graft: store user passed date and user information in graftstate
ClosedPublic

Authored by pulkit on May 25 2018, 4:51 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG63553c2bef7e: graft: store user passed date and user information in graftstate

Summary

Right now, hg help graft says:

The -c/--continue option does not reapply earlier options, except for --force.

which should be treated as a bug.

A good user experience is that the commands remember the arguments passed
initially and preserve them during hg graft --continue.

This patch starts storing the user and date information in graftstate if user
passed it. Upcoming patches will make sure we preserve that information during
--continue and them don't allow user to pass any new arguments with --continue.

I don't think there is any another --continue flag which allows new options to
be passed with it.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.May 25 2018, 4:51 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 25 2018, 4:51 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit added a child revision: D3658: tests: add test showing --continue not preserving --date and --user flags.May 25 2018, 4:52 PM

pulkit added a parent revision: D3656: graft: use cmdstate.delete() to delete the state file.May 25 2018, 4:55 PM

I'm assuming we don't need to bump the state version since the new state file format is still relatively new. But if we had shipped the new state file in a release, I would insist on bumping the state version any time new data is added to state.

This revision is now accepted and ready to land.May 25 2018, 5:08 PM

In D3657#57527, @indygreg wrote:

I'm assuming we don't need to bump the state version since the new state file format is still relatively new. But if we had shipped the new state file in a release, I would insist on bumping the state version any time new data is added to state.

Yes I agree. The new state file format has not been part of any release, so no need to bump it. Once I finish coding work, I will add a wiki page on how to use these state files and when to bump the version.

Closed by commit rHG63553c2bef7e: graft: store user passed date and user information in graftstate (authored by pulkit). · Explain WhyMay 25 2018, 5:13 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (6 lines)

Commit	Parents	Author	Summary	Date
		Pulkit Goyal		May 25 2018, 6:44 AM

Status	Author	Revision
Closed	pulkit	D3660 graft: drop --user and --date values info from hint in case of conflicts
Closed	pulkit	D3659 graft: reuse --user and --date values in `hg graft --continue` (BC)
Closed	pulkit	D3658 tests: add test showing --continue not preserving --date and --user flags
Closed	pulkit	D3657 graft: store user passed date and user information in graftstate
Closed	pulkit	D3656 graft: use cmdstate.delete() to delete the state file
Closed	pulkit	D2597 graft: add test for reading old graftstate files with new mechanism
Closed	pulkit	D3654 graft: start using the cmdstate class to read and write data to graftstate
Closed	pulkit	D3653 state: removing remaining instances of opts class variable
Closed	pulkit	D3652 graft: use state.cmdstate() to check whether graftstate exists
Closed	pulkit	D3651 graft: factor out function to read graft state in separate function

Diff 8897

mercurial/commands.py

	def _dograft(ui, repo, revs, *opts):			def _dograft(ui, repo, revs, *opts):
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	if revs and opts.get('rev'):			if revs and opts.get('rev'):
	ui.warn(_('warning: inconsistent use of --rev might give unexpected '			ui.warn(_('warning: inconsistent use of --rev might give unexpected '
	'revision ordering!\n'))			'revision ordering!\n'))

	revs = list(revs)			revs = list(revs)
	revs.extend(opts.get('rev'))			revs.extend(opts.get('rev'))
				# a dict of data to be stored in state file
				statedata = {}

	if not opts.get('user') and opts.get('currentuser'):			if not opts.get('user') and opts.get('currentuser'):
	opts['user'] = ui.username()			opts['user'] = ui.username()
	if not opts.get('date') and opts.get('currentdate'):			if not opts.get('date') and opts.get('currentdate'):
	opts['date'] = "%d %d" % dateutil.makedate()			opts['date'] = "%d %d" % dateutil.makedate()

	editor = cmdutil.getcommiteditor(editform='graft',			editor = cmdutil.getcommiteditor(editform='graft',
	**pycompat.strkwargs(opts))			**pycompat.strkwargs(opts))
	if source:			if source:
	extra['source'] = source			extra['source'] = source
	extra['intermediate-source'] = ctx.hex()			extra['intermediate-source'] = ctx.hex()
	else:			else:
	extra['source'] = ctx.hex()			extra['source'] = ctx.hex()
	user = ctx.user()			user = ctx.user()
	if opts.get('user'):			if opts.get('user'):
	user = opts['user']			user = opts['user']
				statedata['user'] = user
	date = ctx.date()			date = ctx.date()
	if opts.get('date'):			if opts.get('date'):
	date = opts['date']			date = opts['date']
				statedata['date'] = date
	message = ctx.description()			message = ctx.description()
	if opts.get('log'):			if opts.get('log'):
	message += '\n(grafted from %s)' % ctx.hex()			message += '\n(grafted from %s)' % ctx.hex()

	# we don't merge the first commit when continuing			# we don't merge the first commit when continuing
	if not cont:			if not cont:
	# perform the graft merge with p1(rev) as 'ancestor'			# perform the graft merge with p1(rev) as 'ancestor'
	try:			try:
	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),			repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
	'graft')			'graft')
	stats = mergemod.graft(repo, ctx, ctx.p1(),			stats = mergemod.graft(repo, ctx, ctx.p1(),
	['local', 'graft'])			['local', 'graft'])
	finally:			finally:
	repo.ui.setconfig('ui', 'forcemerge', '', 'graft')			repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
	# report any conflicts			# report any conflicts
	if stats.unresolvedcount > 0:			if stats.unresolvedcount > 0:
	# write out state for --continue			# write out state for --continue
	nodes = [repo[rev].hex() for rev in revs[pos:]]			nodes = [repo[rev].hex() for rev in revs[pos:]]
	statedata = {'nodes': nodes}			statedata['nodes'] = nodes
	stateversion = 1			stateversion = 1
	graftstate.save(stateversion, statedata)			graftstate.save(stateversion, statedata)
	extra = ''			extra = ''
	if opts.get('user'):			if opts.get('user'):
	extra += ' --user %s' % procutil.shellquote(opts['user'])			extra += ' --user %s' % procutil.shellquote(opts['user'])
	if opts.get('date'):			if opts.get('date'):
	extra += ' --date %s' % procutil.shellquote(opts['date'])			extra += ' --date %s' % procutil.shellquote(opts['date'])
	if opts.get('log'):			if opts.get('log'):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8897		May 25 2018, 4:51 PM	★	★
Diff 2	8902	rHG63553c2bef7e9a7a32a3b530e71fdf2349108dfd	May 25 2018, 6:44 AM	★	★