Commit 7754dbf1 authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

graft: use state.cmdstate() to check whether graftstate exists

This is a step towards make graft use the new state.cmdstate() class. This patch
replaces the ugly try-except with nice if-else conditionals.

Differential Revision: https://phab.mercurial-scm.org/D3652
parent 009aa4af5093
......@@ -54,6 +54,7 @@ from . import (
rewriteutil,
scmutil,
server,
state as statemod,
streamclone,
tags as tagsmod,
templatekw,
......@@ -2216,17 +2217,16 @@ def _dograft(ui, repo, *revs, **opts):
**pycompat.strkwargs(opts))
cont = False
graftstate = statemod.cmdstate(repo, 'graftstate')
if opts.get('continue'):
cont = True
if revs:
raise error.Abort(_("can't specify --continue and revisions"))
# read in unfinished revisions
try:
if graftstate.exists():
nodes = _readgraftstate(repo)['nodes']
revs = [repo[node].rev() for node in nodes]
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
else:
cmdutil.wrongtooltocontinue(repo, _('graft'))
else:
if not revs:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment