This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3656

graft: use cmdstate.delete() to delete the state file
ClosedPublic

Authored by pulkit on May 25 2018, 2:55 PM.

Download Raw Diff

Details

Reviewers

martinvonz

Group Reviewers

hg-reviewers

Commits

rHG0dfa27e53c57: graft: use cmdstate.delete() to delete the state file

Summary

Previous patches start using state.cmdstate() class for statefiles. The class
has a function delete() to delete the state file. This patch replaces the
existing repo.vfs.unlink() with that delete() function.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

Event Timeline

pulkit created this revision.May 25 2018, 2:55 PM

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

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

martinvonz accepted this revision.May 25 2018, 3:14 PM

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

pulkit added a child revision: D3657: graft: store user passed date and user information in graftstate.May 25 2018, 4:55 PM

Closed by commit rHG0dfa27e53c57: graft: use cmdstate.delete() to delete the state file (authored by pulkit). · Explain WhyMay 25 2018, 4:59 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

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 8901

mercurial/commands.py

	date=date, extra=extra, editor=editor)			date=date, extra=extra, editor=editor)
	if node is None:			if node is None:
	ui.warn(			ui.warn(
	_('note: graft of %d:%s created no changes to commit\n') %			_('note: graft of %d:%s created no changes to commit\n') %
	(ctx.rev(), ctx))			(ctx.rev(), ctx))

	# remove state when we complete successfully			# remove state when we complete successfully
	if not opts.get('dry_run'):			if not opts.get('dry_run'):
	repo.vfs.unlinkpath('graftstate', ignoremissing=True)			graftstate.delete()

	return 0			return 0

	def _readgraftstate(repo, graftstate):			def _readgraftstate(repo, graftstate):
	"""read the graft state file and return a dict of the data stored in it"""			"""read the graft state file and return a dict of the data stored in it"""
	try:			try:
	return graftstate.read()			return graftstate.read()
	except error.CorruptedState:			except error.CorruptedState:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8893		May 25 2018, 2:55 PM	★	★
Diff 2	8901	rHG0dfa27e53c57638effd098ecdcf96be685e13af9	May 25 2018, 6:30 AM	★	★