This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3660

graft: drop --user and --date values info from hint in case of conflicts
ClosedPublic

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

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG5736570718fe: graft: drop --user and --date values info from hint in case of conflicts
rHGd9572d344e59: graft: drop --user and --date values info from hint in case of conflicts

Summary

After previous patch, we have started preserving user and date values in
graftstate and reusing them during hg graft --continue. Now passing --user and
--date again with --continue makes no sense. Let's drop them from the hint.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

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

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

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

indygreg accepted this revision.May 25 2018, 5:10 PM

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

Closed by commit rHGd9572d344e59: graft: drop --user and --date values info from hint in case of conflicts (authored by pulkit). · Explain WhyMay 25 2018, 5:13 PM

This revision was automatically updated to reflect the committed changes.

martinvonz added a subscriber: martinvonz.May 26 2018, 1:09 AM

martinvonz added inline comments.

mercurial/commands.py
67	test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight.

commands.py:67
dateutil,
procutil,
stringutil,
test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight.

I've pushed the fixed version.

In D3660#57581, @yuja wrote:
commands.py:67
dateutil,
procutil,
stringutil,
test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight.
I've pushed the fixed version.

Thanks!

In D3660#57581, @yuja wrote:
commands.py:67
dateutil,
procutil,
stringutil,
test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight.
I've pushed the fixed version.

Thanks a lot Yuya. I will make sure I run test-check-pyflakes.t from now onwards.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (4 lines)
M			tests/test-graft.t (4 lines)

Commit	Parents	Author	Summary	Date
		Pulkit Goyal		May 25 2018, 4:41 PM

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 8900

mercurial/commands.py

	tags as tagsmod,			tags as tagsmod,
	templatekw,			templatekw,
	ui as uimod,			ui as uimod,
	util,			util,
	wireprotoserver,			wireprotoserver,
	)			)
	from .utils import (			from .utils import (
	dateutil,			dateutil,
	procutil,			procutil,
				martinvonzUnsubmitted Not Done test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight. martinvonz: test-check-pyflakes.t complains about this no longer being used. I'll remove it in flight.
	stringutil,			stringutil,
	)			)

	release = lockmod.release			release = lockmod.release

	table = {}			table = {}
	table.update(debugcommandsmod.command._table)			table.update(debugcommandsmod.command._table)

	# 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'):
	extra += ' --user %s' % procutil.shellquote(opts['user'])
	if opts.get('date'):
	extra += ' --date %s' % procutil.shellquote(opts['date'])
	if opts.get('log'):			if opts.get('log'):
	extra += ' --log'			extra += ' --log'
	hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra			hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
	raise error.Abort(			raise error.Abort(
	_("unresolved conflicts, can't continue"),			_("unresolved conflicts, can't continue"),
	hint=hint)			hint=hint)
	else:			else:
	cont = False			cont = False

tests/test-graft.t

	$ hg up '.^^'			$ hg up '.^^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved

	$ hg graft -r 1 -r 2 --user batman			$ hg graft -r 1 -r 2 --user batman
	grafting 1:80e6d2c47cfe "added b"			grafting 1:80e6d2c47cfe "added b"
	merging b			merging b
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	abort: unresolved conflicts, can't continue			abort: unresolved conflicts, can't continue
	(use 'hg resolve' and 'hg graft --continue --user batman')			(use 'hg resolve' and 'hg graft --continue')
	[255]			[255]

	$ echo wat > b			$ echo wat > b
	$ hg resolve -m			$ hg resolve -m
	(no more unresolved files)			(no more unresolved files)
	continue: hg graft --continue			continue: hg graft --continue

	$ hg graft --continue			$ hg graft --continue

	$ hg up '.^^'			$ hg up '.^^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg graft -r 1 -r 2 --date '1234560000 120'			$ hg graft -r 1 -r 2 --date '1234560000 120'
	grafting 1:80e6d2c47cfe "added b"			grafting 1:80e6d2c47cfe "added b"
	merging b			merging b
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	abort: unresolved conflicts, can't continue			abort: unresolved conflicts, can't continue
	(use 'hg resolve' and 'hg graft --continue --date '1234560000 120'')			(use 'hg resolve' and 'hg graft --continue')
	[255]			[255]

	$ echo foobar > b			$ echo foobar > b
	$ hg resolve -m			$ hg resolve -m
	(no more unresolved files)			(no more unresolved files)
	continue: hg graft --continue			continue: hg graft --continue
	$ hg graft --continue			$ hg graft --continue
	grafting 1:80e6d2c47cfe "added b"			grafting 1:80e6d2c47cfe "added b"

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8900		May 25 2018, 4:52 PM	★	★
Diff 2	8904	rHGd9572d344e59baf35ea51e84145241798d14ad8f	May 25 2018, 4:41 PM	★	★