This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3659

graft: reuse --user and --date values in `hg graft --continue` (BC)
ClosedPublic

Authored by pulkit on May 25 2018, 4:52 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdecdb587ea12: graft: reuse --user and --date values in `hg graft --continue` (BC)
Summary

Reading the user and date information from graftstate during `hg graft
--continue` will help us in preserving the user and date arguments passed when
hg graft was called. This patch reads that information and reuses that while
running hg graft --continue. So after this patch, --user and --date values are
preserved even if conflicts occur and user don't need to pass them again.

The test changes demonstrate the fix.

This is a backward incompatible change but I think of this more as a bug fix.
Also thinking about removing the line from hg help graft which says --continue
does not reapply other flags but need to check what are the other flags which
needs to be preserved.

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 25 2018, 4:52 PM
indygreg accepted this revision.May 25 2018, 5:09 PM
This revision is now accepted and ready to land.May 25 2018, 5:09 PM
Closed by commit rHGdecdb587ea12: graft: reuse --user and --date values in `hg graft --continue` (BC) (authored by pulkit). · Explain WhyMay 25 2018, 5:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (7 lines)
Mtests/test-graft.t (18 lines)

Diff 8905

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, graftstate)['nodes'] statedata = _readgraftstate(repo, graftstate)
if statedata.get('date'):
opts['date'] = statedata['date']
if statedata.get('user'):
opts['user'] = statedata['user']
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)

tests/test-graft.t

$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
grafting 2:8be98ac1a569 "added c" grafting 2:8be98ac1a569 "added c"
XXX: the user of 6 and 7 should be batman
$ hg log -Gr 3:: $ hg log -Gr 3::
@ changeset: 7:89f377552d81 @ changeset: 7:11a36ffaacf2
| tag: tip | tag: tip
| user: test | user: batman
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: added c | summary: added c
| |
o changeset: 6:393512ff89b9 o changeset: 6:76803afc6511
| parent: 3:9e887f7a939c | parent: 3:9e887f7a939c
| user: test | user: batman
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: added b | summary: added b
| |
| o changeset: 5:711e9fa999f1 | o changeset: 5:711e9fa999f1
| | 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
| | | |
$ 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
$ hg graft --continue $ hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
grafting 2:8be98ac1a569 "added c" grafting 2:8be98ac1a569 "added c"
XXX: 8 and 9 show have the date we passed
$ hg log -Gr '.^^::.' $ hg log -Gr '.^^::.'
@ changeset: 9:7ee8d3496b19 @ changeset: 9:1896b76e007a
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Fri Feb 13 21:18:00 2009 -0002
| summary: added c | summary: added c
| |
o changeset: 8:802f1eae3af3 o changeset: 8:ce2b4f1632af
| parent: 3:9e887f7a939c | parent: 3:9e887f7a939c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Fri Feb 13 21:18:00 2009 -0002
| summary: added b | summary: added b
| |
o changeset: 3:9e887f7a939c o changeset: 3:9e887f7a939c
| parent: 0:f7ad41964313 | parent: 0:f7ad41964313
~ user: test ~ user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: bar to b summary: bar to b