| hg-reviewers |
This patch start using the new state file class in graft command. Look how
beautiful the code is now, no try-excepts clauses and no checking the error
type.
| Lint Skipped |
| Unit Tests Skipped |
| 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 | ||||
| cmdstate = 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 cmdstate: | ||||
| with repo.vfs('graftstate', 'rb') as fp: | cmdstate.load() | ||||
| stateopts = _oldgraftstate(fp) | nodes = cmdstate['nodes'] | ||||
| nodes = stateopts['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) | ||||
| 'graft') | 'graft') | ||||
| stats = mergemod.graft(repo, ctx, ctx.p1(), | stats = mergemod.graft(repo, ctx, ctx.p1(), | ||||
| ['local', 'graft']) | ['local', 'graft']) | ||||
| finally: | finally: | ||||
| repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | ||||
| # report any conflicts | # report any conflicts | ||||
| if stats.unresolvedcount > 0: | if stats.unresolvedcount > 0: | ||||
| # write out state for --continue | # write out state for --continue | ||||
| nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | nodelines = [repo[rev].hex() for rev in revs[pos:]] | ||||
| repo.vfs.write('graftstate', ''.join(nodelines)) | cmdstate.addopts({'nodes': nodelines}) | ||||
| cmdstate.save() | |||||
| extra = '' | extra = '' | ||||
| if opts.get('user'): | if opts.get('user'): | ||||
| extra += ' --user %s' % procutil.shellquote(opts['user']) | extra += ' --user %s' % procutil.shellquote(opts['user']) | ||||
| if opts.get('date'): | if opts.get('date'): | ||||
| extra += ' --date %s' % procutil.shellquote(opts['date']) | extra += ' --date %s' % procutil.shellquote(opts['date']) | ||||
| if opts.get('log'): | if opts.get('log'): | ||||
| extra += ' --log' | extra += ' --log' | ||||
| hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | ||||