graft: move logic to read current graft state file in separate function
AbandonedPublic

Authored by pulkit on Mar 3 2018, 2:19 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

Summary

The logic to read the current graft state format is moved in a separate function
so that can be used in future when we need to fallback reading to current graft
state.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 3 2018, 2:19 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 3 2018, 2:19 PM

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

pulkit added a child revision: D2595: graft: start using the new state file class.Mar 3 2018, 2:19 PM

pulkit updated this revision to Diff 6619.Mar 4 2018, 4:29 PM

pulkit updated this revision to Diff 6760.Mar 9 2018, 5:55 AM

pulkit updated this revision to Diff 7022.Mar 14 2018, 4:55 AM

pulkit updated this revision to Diff 7106.Mar 19 2018, 9:28 AM

martinvonz added a subscriber: martinvonz.Mar 25 2018, 2:32 AM

martinvonz added inline comments.

mercurial/state.py
117–120	Shouldn't this code be in commands.py? I don't think we should centralize the code for parsing all old formats in state.py. That will not happen with third-party extensions anyway, of course.

pulkit added inline comments.Mar 26 2018, 11:10 AM

mercurial/state.py
117–120	No strong reason to have it here. I will move it in commands.py.

pulkit edited the summary of this revision. (Show Details)Mar 26 2018, 1:09 PM

pulkit retitled this revision from graft: move logic to read current graft state file in state.py to graft: move logic to read current graft state file in separate function.

pulkit updated this revision to Diff 7301.

Superseded by D3651.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (5 lines)
M			mercurial/state.py (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6445		Mar 3 2018, 2:19 PM	★	★
Diff 2	6619		Mar 4 2018, 4:29 PM	★	★
Diff 3	6760		Mar 9 2018, 5:55 AM	★	★
Diff 4	7022		Mar 14 2018, 4:54 AM	★	★
Diff 5	7106		Mar 19 2018, 9:28 AM	★	★
Diff 6	7301		Mar 26 2018, 1:09 PM	★	★

Status	Author	Revision
Needs Revision	pulkit	D2945 state: add a magicheader to each state file
Abandoned	pulkit	D2596 state: raise ProgrammingError if an invalid key is being accessed
Abandoned	pulkit	D2595 graft: start using the new state file class
Abandoned	pulkit	D2594 graft: move logic to read current graft state file in separate function
Abandoned	pulkit	D2593 state: add logic to parse the state file in old way if cbor fails
Abandoned	pulkit	D2592 state: add registrar to register function to read old state files

Diff 7022

mercurial/commands.py

	phases,			phases,
	pycompat,			pycompat,
	rcutil,			rcutil,
	registrar,			registrar,
	revsetlang,			revsetlang,
	rewriteutil,			rewriteutil,
	scmutil,			scmutil,
	server,			server,
				state as statemod,
	streamclone,			streamclone,
	tags as tagsmod,			tags as tagsmod,
	templatekw,			templatekw,
	ui as uimod,			ui as uimod,
	util,			util,
	wireprotoserver,			wireprotoserver,
	)			)
	from .utils import dateutil			from .utils import dateutil

	cont = False			cont = False
	if opts.get('continue'):			if opts.get('continue'):
	cont = True			cont = True
	if revs:			if revs:
	raise error.Abort(_("can't specify --continue and revisions"))			raise error.Abort(_("can't specify --continue and revisions"))
	# read in unfinished revisions			# read in unfinished revisions
	try:			try:
	nodes = repo.vfs.read('graftstate').splitlines()			with repo.vfs('graftstate', 'rb') as fp:
				stateopts = statemod.oldgraftstate(fp)
				nodes = stateopts['nodes']
	revs = [repo[node].rev() for node in nodes]			revs = [repo[node].rev() for node in nodes]
	except IOError as inst:			except IOError as inst:
	if inst.errno != errno.ENOENT:			if inst.errno != errno.ENOENT:
	raise			raise
	cmdutil.wrongtooltocontinue(repo, _('graft'))			cmdutil.wrongtooltocontinue(repo, _('graft'))
	else:			else:
	if not revs:			if not revs:
	raise error.Abort(_('no revisions specified'))			raise error.Abort(_('no revisions specified'))

mercurial/state.py

	such cases."""			such cases."""
	def dec(func):			def dec(func):
	"""func here should accept the file object of the state file and			"""func here should accept the file object of the state file and
	should return a dict of data stored in state file."""			should return a dict of data stored in state file."""
	assert path not in oldstatefilefns			assert path not in oldstatefilefns
	oldstatefilefns[path] = func			oldstatefilefns[path] = func
	return func			return func
	return dec			return dec

				@readoldstatefile('graftstate')
				def oldgraftstate(fp):
				nodes = fp.read().splitlines()
				return {'nodes': nodes}
				martinvonzUnsubmitted Not Done Shouldn't this code be in commands.py? I don't think we should centralize the code for parsing all old formats in state.py. That will not happen with third-party extensions anyway, of course. martinvonz: Shouldn't this code be in commands.py? I don't think we should centralize the code for parsing…
				pulkitAuthorUnsubmitted Not Done No strong reason to have it here. I will move it in commands.py. pulkit: No strong reason to have it here. I will move it in commands.py.

This is an archive of the discontinued Mercurial Phabricator instance.

graft: move logic to read current graft state file in separate functionAbandonedPublic