( )⚙ D2855 graft: add a version number to the state file formats

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2855

graft: add a version number to the state file formats
AbandonedPublic

Authored by pulkit on Mar 14 2018, 4:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Adding version number to state file formats can help us in preventing an older
mercurial try to read a newer graft state file which can cause issues.
Moreover, the version numbers can help in lot of other ways also.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 14 2018, 4:55 AM
pulkit updated this revision to Diff 7108.Mar 19 2018, 9:29 AM
yuja added a subscriber: yuja.Mar 27 2018, 9:12 AM

Perhaps the version shouldn't be in the CBOR data structure, because future
state file might not be a superset of CBOR.

pulkit abandoned this revision.Jun 14 2018, 4:13 PM
In D2855#47833, @yuja wrote:

Perhaps the version shouldn't be in the CBOR data structure, because future
state file might not be a superset of CBOR.

That was a very nice suggestion. Thanks!

Abandoning since it's not required anymore because now by default, state.cmdstate() write version numbers in plain text.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (13 lines)

Diff 7304

mercurial/commands.py

cmdstate = statemod.cmdstate(repo, 'graftstate') 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
if cmdstate: if cmdstate:
cmdstate.load() cmdstate.load()
if cmdstate['version'] < 2:
nodes = cmdstate['nodes'] nodes = cmdstate['nodes']
revs = [repo[node].rev() for node in nodes] revs = [repo[node].rev() for node in nodes]
else: else:
# state-file is written by a newer mercurial than what we are
# using
raise error.Abort(_("unable to read to read the state file"))
else:
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)
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() for rev in revs[pos:]] nodelines = [repo[rev].hex() for rev in revs[pos:]]
cmdstate.addopts({'nodes': nodelines}) cmdstate.addopts({'version': 1, 'nodes': nodelines})
cmdstate.save() 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'
if not opts.get('dry_run'): if not opts.get('dry_run'):
repo.vfs.unlinkpath('graftstate', ignoremissing=True) repo.vfs.unlinkpath('graftstate', ignoremissing=True)
return 0 return 0
@statemod.readoldstatefile('graftstate') @statemod.readoldstatefile('graftstate')
def _oldgraftstate(fp): def _oldgraftstate(fp):
nodes = fp.read().splitlines() nodes = fp.read().splitlines()
return {'nodes': nodes} return {'version': 0, 'nodes': nodes}
@command('grep', @command('grep',
[('0', 'print0', None, _('end fields with NUL')), [('0', 'print0', None, _('end fields with NUL')),
('', 'all', None, _('print all revisions that match')), ('', 'all', None, _('print all revisions that match')),
('a', 'text', None, _('treat all files as text')), ('a', 'text', None, _('treat all files as text')),
('f', 'follow', None, ('f', 'follow', None,
_('follow changeset history,' _('follow changeset history,'
' or file history across copies and renames')), ' or file history across copies and renames')),