This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3751

graft: start storing new nodes formed in graftstate
ClosedPublic

Authored by pulkit on Jun 15 2018, 4:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3c07e0b1f6c6: graft: start storing new nodes formed in graftstate
Summary

This patch starts storing the new nodes formed during the ongoing graft
operation in the graftstate. We need the list of new nodes formed while
implmenting graft --abort which will strip out the new nodes.

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.Jun 15 2018, 4:09 PM
pulkit updated this revision to Diff 9273.Jun 25 2018, 6:04 AM
Closed by commit rHG3c07e0b1f6c6: graft: start storing new nodes formed in graftstate (authored by pulkit). · Explain WhyJun 25 2018, 11:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)

Diff 9280

mercurial/commands.py

if revs and opts.get('rev'): if revs and opts.get('rev'):
ui.warn(_('warning: inconsistent use of --rev might give unexpected ' ui.warn(_('warning: inconsistent use of --rev might give unexpected '
'revision ordering!\n')) 'revision ordering!\n'))
revs = list(revs) revs = list(revs)
revs.extend(opts.get('rev')) revs.extend(opts.get('rev'))
# a dict of data to be stored in state file # a dict of data to be stored in state file
statedata = {} statedata = {}
# list of new nodes created by ongoing graft
statedata['newnodes'] = []
if not opts.get('user') and opts.get('currentuser'): if not opts.get('user') and opts.get('currentuser'):
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))
# commit # commit
node = repo.commit(text=message, user=user, node = repo.commit(text=message, user=user,
date=date, extra=extra, editor=editor) date=date, extra=extra, editor=editor)
if node is None: if node is None:
ui.warn( ui.warn(
_('note: graft of %d:%s created no changes to commit\n') % _('note: graft of %d:%s created no changes to commit\n') %
(ctx.rev(), ctx)) (ctx.rev(), ctx))
# checking that newnodes exist because old state files won't have it
elif statedata.get('newnodes') is not None:
statedata['newnodes'].append(node)
# remove state when we complete successfully # remove state when we complete successfully
if not opts.get('dry_run'): if not opts.get('dry_run'):
graftstate.delete() graftstate.delete()
return 0 return 0
def _readgraftstate(repo, graftstate): def _readgraftstate(repo, graftstate):