Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 48593:47b3fca301f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12025
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 21 Jan 2022 13:48:48 -0800
parents a51c522c0064
children 6cfa30681a1d
comparison
equal deleted inserted replaced
48592:bcc4820242cf 48593:47b3fca301f8
3307 if not cont: 3307 if not cont:
3308 # perform the graft merge with p1(rev) as 'ancestor' 3308 # perform the graft merge with p1(rev) as 'ancestor'
3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} 3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3310 base = ctx.p1() if basectx is None else basectx 3310 base = ctx.p1() if basectx is None else basectx
3311 with ui.configoverride(overrides, b'graft'): 3311 with ui.configoverride(overrides, b'graft'):
3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft']) 3312 stats = mergemod.graft(
3313 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3314 )
3313 # report any conflicts 3315 # report any conflicts
3314 if stats.unresolvedcount > 0: 3316 if stats.unresolvedcount > 0:
3315 # write out state for --continue 3317 # write out state for --continue
3316 nodes = [repo[rev].hex() for rev in revs[pos:]] 3318 nodes = [repo[rev].hex() for rev in revs[pos:]]
3317 statedata[b'nodes'] = nodes 3319 statedata[b'nodes'] = nodes