This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3664

graft: reuse the --edit value passed initially in `hg graft --continue` (BC)
Needs RevisionPublic

Authored by pulkit on May 25 2018, 6:25 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

This patch starts storing the value of --edit flag passed by the user initially
when they runs hg graft --edit. We can now read the value from graftstate in
case of --continue and respect the value which user passed earlier.

The tests changes demonstrate the fix.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.May 25 2018, 6:25 PM
yuja added a subscriber: yuja.Jun 5 2018, 8:00 AM

Queued the first two, thanks.

This patch starts storing the value of --edit flag passed by the user initially
when they runs `hg graft --edit`. We can now read the value from graftstate in
case of `--continue` and respect the value which user passed earlier.

I'm -0.5 on this since --edit is an option to change the interactive behavior,
and I think we don't preserve such options across interrupted sessions.

baymax requested changes to this revision.Jan 24 2020, 12:33 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:33 PM

Revision Contents
Changeset List

Diff 8909

mercurial/commands.py

# a dict of data to be stored in state file # a dict of data to be stored in state file
statedata = {} statedata = {}
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',
**pycompat.strkwargs(opts))
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():
statedata = _readgraftstate(repo, graftstate) statedata = _readgraftstate(repo, graftstate)
if statedata.get('date'): if statedata.get('date'):
opts['date'] = statedata['date'] opts['date'] = statedata['date']
if statedata.get('user'): if statedata.get('user'):
opts['user'] = statedata['user'] opts['user'] = statedata['user']
if statedata.get('log'): if statedata.get('log'):
opts['log'] = True opts['log'] = True
if statedata.get('edit'):
opts['edit'] = True
nodes = statedata['nodes'] nodes = statedata['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)
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
editor = cmdutil.getcommiteditor(editform='graft',
**pycompat.strkwargs(opts))
skipped = set() skipped = set()
# check for merges # check for merges
for rev in repo.revs('%ld and merge()', revs): for rev in repo.revs('%ld and merge()', revs):
ui.warn(_('skipping ungraftable merge revision %d\n') % rev) ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
skipped.add(rev) skipped.add(rev)
revs = [r for r in revs if r not in skipped] revs = [r for r in revs if r not in skipped]
if not revs: if not revs:
return -1 return -1
['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
nodes = [repo[rev].hex() for rev in revs[pos:]] nodes = [repo[rev].hex() for rev in revs[pos:]]
statedata['nodes'] = nodes statedata['nodes'] = nodes
if opts.get('edit'):
statedata['edit'] = True
stateversion = 1 stateversion = 1
graftstate.save(stateversion, statedata) graftstate.save(stateversion, statedata)
hint=_("use 'hg resolve' and 'hg graft --continue'") hint=_("use 'hg resolve' and 'hg graft --continue'")
raise error.Abort( raise error.Abort(
_("unresolved conflicts, can't continue"), _("unresolved conflicts, can't continue"),
hint=hint) hint=hint)
else: else:
cont = False cont = False

tests/test-graft.t

[255] [255]
$ echo foobar > b $ echo foobar > b
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ HGEDITOR=cat hg graft --continue $ HGEDITOR=cat hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
added b
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
HG: user: test
HG: branch 'default'
HG: changed b
grafting 2:8be98ac1a569 "added c" grafting 2:8be98ac1a569 "added c"
added c
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
HG: user: test
HG: branch 'default'
HG: added c
$ hg log -Gr '.^^::.' $ hg log -Gr '.^^::.'
@ changeset: 13:7ee8d3496b19 @ changeset: 13:7ee8d3496b19
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: added c | summary: added c
| |