This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3662

graft: reuse the --log value passed initially in `hg graft --continue` (BC)
ClosedPublic

Authored by pulkit on May 25 2018, 5:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2b8c8b8d1a06: graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Summary

We now stores the value of --log flag passed initially in the graftstate and
reuse that value when doing hg graft --continue which is a nice behavior.

The test updates demonstrate the fix.

Since we now preserve the value by default, drop the mention of --log flag
from the hint which we see after conflicts.

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.

Revision Contents
Changeset List

Diff 8985

mercurial/commands.py

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'):
opts['log'] = 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)
statedata['user'] = user statedata['user'] = user
date = ctx.date() date = ctx.date()
if opts.get('date'): if opts.get('date'):
date = opts['date'] date = opts['date']
statedata['date'] = date statedata['date'] = date
message = ctx.description() message = ctx.description()
if opts.get('log'): if opts.get('log'):
message += '\n(grafted from %s)' % ctx.hex() message += '\n(grafted from %s)' % ctx.hex()
statedata['log'] = True
# we don't merge the first commit when continuing # we don't merge the first commit when continuing
if not cont: if not cont:
# perform the graft merge with p1(rev) as 'ancestor' # perform the graft merge with p1(rev) as 'ancestor'
try: try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'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
nodes = [repo[rev].hex() for rev in revs[pos:]] nodes = [repo[rev].hex() for rev in revs[pos:]]
statedata['nodes'] = nodes statedata['nodes'] = nodes
stateversion = 1 stateversion = 1
graftstate.save(stateversion, statedata) graftstate.save(stateversion, statedata)
extra = '' hint = _("use 'hg resolve' and 'hg graft --continue'")
if opts.get('log'):
extra += ' --log'
hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
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
# commit # commit
node = repo.commit(text=message, user=user, node = repo.commit(text=message, user=user,

tests/test-graft.t

picked tool ':merge' for e (binary False symlink False changedelete False) picked tool ':merge' for e (binary False symlink False changedelete False)
merging e merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
e: versions differ -> m (merge) e: versions differ -> m (merge)
picked tool ':merge' for e (binary False symlink False changedelete False) picked tool ':merge' for e (binary False symlink False changedelete False)
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue --log') (use 'hg resolve' and 'hg graft --continue')
[255] [255]
Summary should mention graft: Summary should mention graft:
$ hg summary |grep graft $ hg summary |grep graft
commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
Using status to get more context Using status to get more context
$ hg up '.^^' $ hg up '.^^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg graft -r 1 -r 2 --log $ hg graft -r 1 -r 2 --log
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue --log') (use 'hg resolve' and 'hg graft --continue')
[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
$ 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"
$ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.' $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
@ 11:7ee8d3496b19 added c @ 11:30c1050a58b2 added c
| | (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
o 10:802f1eae3af3 added b o 10:ec7eda2313e2 added b
| | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
o 3:9e887f7a939c bar to b o 3:9e887f7a939c bar to b
| |
~ ~