pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This patch replaces the logic to read and write data to graftstate file to use the state.cmdstate() class. The previous graftstate format didn't had any version number on top of that, so we have to catch the CorruptedState error and then read the graftstate in case of old state files. This will help us to implement nice additions to graft commands like `--no-commit`, `--abort`, `--stop` flags. Passing on test-graft.t shows that things are working fine. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3654 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2224,7 +2224,7 @@ raise error.Abort(_("can't specify --continue and revisions")) # read in unfinished revisions if graftstate.exists(): - nodes = _readgraftstate(repo)['nodes'] + nodes = _readgraftstate(repo, graftstate)['nodes'] revs = [repo[node].rev() for node in nodes] else: cmdutil.wrongtooltocontinue(repo, _('graft')) @@ -2351,8 +2351,10 @@ # report any conflicts if stats.unresolvedcount > 0: # write out state for --continue - nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] - repo.vfs.write('graftstate', ''.join(nodelines)) + nodes = [repo[rev].hex() for rev in revs[pos:]] + statedata = {'nodes': nodes} + stateversion = 1 + graftstate.save(stateversion, statedata) extra = '' if opts.get('user'): extra += ' --user %s' % procutil.shellquote(opts['user']) @@ -2381,10 +2383,14 @@ return 0 -def _readgraftstate(repo): +def _readgraftstate(repo, graftstate): """read the graft state file and return a dict of the data stored in it""" - nodes = repo.vfs.read('graftstate').splitlines() - return {'nodes': nodes} + try: + statedata = graftstate.read() + return statedata + except error.CorruptedState: + nodes = repo.vfs.read('graftstate').splitlines() + return {'nodes': nodes} @command('grep', [('0', 'print0', None, _('end fields with NUL')), To: pulkit, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
