This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3652

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

Authored by pulkit on May 24 2018, 5:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG58b08f4ce5f5: graft: use state.cmdstate() to check whether graftstate exists
Summary

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.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (8 lines)

Diff 8890

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 ( from .utils import (
opts['user'] = ui.username() opts['user'] = ui.username()
if not opts.get('date') and opts.get('currentdate'): if not opts.get('date') and opts.get('currentdate'):
opts['date'] = "%d %d" % dateutil.makedate() opts['date'] = "%d %d" % dateutil.makedate()
editor = cmdutil.getcommiteditor(editform='graft', editor = cmdutil.getcommiteditor(editform='graft',
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
cont = False cont = False
graftstate = statemod.cmdstate(repo, 'graftstate')
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: if graftstate.exists():
nodes = _readgraftstate(repo)['nodes'] nodes = _readgraftstate(repo)['nodes']
revs = [repo[node].rev() for node in nodes] revs = [repo[node].rev() for node in nodes]
except IOError as inst: else:
if inst.errno != errno.ENOENT:
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'))
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)