Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 38147:58b08f4ce5f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 25 May 2018 01:25:31 +0530
parents 009aa4af5093
children 476324a304b2
comparison
equal deleted inserted replaced
38146:009aa4af5093 38147:58b08f4ce5f5
52 registrar, 52 registrar,
53 revsetlang, 53 revsetlang,
54 rewriteutil, 54 rewriteutil,
55 scmutil, 55 scmutil,
56 server, 56 server,
57 state as statemod,
57 streamclone, 58 streamclone,
58 tags as tagsmod, 59 tags as tagsmod,
59 templatekw, 60 templatekw,
60 ui as uimod, 61 ui as uimod,
61 util, 62 util,
2214 2215
2215 editor = cmdutil.getcommiteditor(editform='graft', 2216 editor = cmdutil.getcommiteditor(editform='graft',
2216 **pycompat.strkwargs(opts)) 2217 **pycompat.strkwargs(opts))
2217 2218
2218 cont = False 2219 cont = False
2220 graftstate = statemod.cmdstate(repo, 'graftstate')
2219 if opts.get('continue'): 2221 if opts.get('continue'):
2220 cont = True 2222 cont = True
2221 if revs: 2223 if revs:
2222 raise error.Abort(_("can't specify --continue and revisions")) 2224 raise error.Abort(_("can't specify --continue and revisions"))
2223 # read in unfinished revisions 2225 # read in unfinished revisions
2224 try: 2226 if graftstate.exists():
2225 nodes = _readgraftstate(repo)['nodes'] 2227 nodes = _readgraftstate(repo)['nodes']
2226 revs = [repo[node].rev() for node in nodes] 2228 revs = [repo[node].rev() for node in nodes]
2227 except IOError as inst: 2229 else:
2228 if inst.errno != errno.ENOENT:
2229 raise
2230 cmdutil.wrongtooltocontinue(repo, _('graft')) 2230 cmdutil.wrongtooltocontinue(repo, _('graft'))
2231 else: 2231 else:
2232 if not revs: 2232 if not revs:
2233 raise error.Abort(_('no revisions specified')) 2233 raise error.Abort(_('no revisions specified'))
2234 cmdutil.checkunfinished(repo) 2234 cmdutil.checkunfinished(repo)