This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3654

graft: start using the cmdstate class to read and write data to graftstate
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG476324a304b2: graft: start using the cmdstate class to read and write data to graftstate
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.

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.

Event Timeline

pulkit created this revision.May 24 2018, 5:01 PM
martinvonz added a subscriber: martinvonz.May 24 2018, 6:40 PM
martinvonz added inline comments.
mercurial/commands.py
2389–2390

Will join these two lines in flight. (I don't know if you're going to make this more complex in the future, but the variable seems unnecessary at this point.)

Closed by commit rHG476324a304b2: graft: start using the cmdstate class to read and write data to graftstate (authored by pulkit). · Explain WhyMay 25 2018, 12:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (17 lines)

Diff 8891

mercurial/commands.py

cont = False cont = False
graftstate = statemod.cmdstate(repo, 'graftstate') 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
if graftstate.exists(): if graftstate.exists():
nodes = _readgraftstate(repo)['nodes'] nodes = _readgraftstate(repo, graftstate)['nodes']
revs = [repo[node].rev() for node in nodes] revs = [repo[node].rev() for node in nodes]
else: 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)
'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:]] nodes = [repo[rev].hex() for rev in revs[pos:]]
repo.vfs.write('graftstate', ''.join(nodelines)) statedata = {'nodes': nodes}
stateversion = 1
graftstate.save(stateversion, statedata)
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
(ctx.rev(), ctx)) (ctx.rev(), ctx))
# remove state when we complete successfully # remove state when we complete successfully
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
def _readgraftstate(repo): def _readgraftstate(repo, graftstate):
"""read the graft state file and return a dict of the data stored in it""" """read the graft state file and return a dict of the data stored in it"""
try:
return graftstate.read()
except error.CorruptedState:
martinvonzUnsubmitted
Not Done

Will join these two lines in flight. (I don't know if you're going to make this more complex in the future, but the variable seems unnecessary at this point.)

martinvonz: Will join these two lines in flight. (I don't know if you're going to make this more complex in…
nodes = repo.vfs.read('graftstate').splitlines() nodes = repo.vfs.read('graftstate').splitlines()
return {'nodes': nodes} return {'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')),