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

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.

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
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.May 25 2018, 2:55 PM
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
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

PathPackages
Mmercurial/commands.py (2 lines)

Diff 8893

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: