| marmoute |
| hg-reviewers |
Without this change, running graft --continue after grafting a merge commit using --base
(and encountering conflicts) will output "skipping ungraftable merge revision" even though
we specified a base in the initial graft command.
Graft's improve behaviour is reflected in test-graft.t.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (10 lines) | |||
| M | tests/test-graft.t (20 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | charlesetc | ||
| Abandoned | charlesetc |
| _( | _( | ||||
| b'warning: inconsistent use of --rev might give unexpected ' | b'warning: inconsistent use of --rev might give unexpected ' | ||||
| b'revision ordering!\n' | b'revision ordering!\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| revs = list(revs) | revs = list(revs) | ||||
| revs.extend(opts.get(b'rev')) | revs.extend(opts.get(b'rev')) | ||||
| basectx = None | |||||
| if opts.get(b'base'): | |||||
| basectx = scmutil.revsingle(repo, opts[b'base'], None) | |||||
| # 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 | # list of new nodes created by ongoing graft | ||||
| statedata[b'newnodes'] = [] | statedata[b'newnodes'] = [] | ||||
| cmdutil.resolvecommitoptions(ui, opts) | cmdutil.resolvecommitoptions(ui, opts) | ||||
| editor = cmdutil.getcommiteditor( | editor = cmdutil.getcommiteditor( | ||||
| if statedata.get(b'date'): | if statedata.get(b'date'): | ||||
| opts[b'date'] = statedata[b'date'] | opts[b'date'] = statedata[b'date'] | ||||
| if statedata.get(b'user'): | if statedata.get(b'user'): | ||||
| opts[b'user'] = statedata[b'user'] | opts[b'user'] = statedata[b'user'] | ||||
| if statedata.get(b'log'): | if statedata.get(b'log'): | ||||
| opts[b'log'] = True | opts[b'log'] = True | ||||
| if statedata.get(b'no_commit'): | if statedata.get(b'no_commit'): | ||||
| opts[b'no_commit'] = statedata.get(b'no_commit') | opts[b'no_commit'] = statedata.get(b'no_commit') | ||||
| if statedata.get(b'base'): | |||||
| opts[b'base'] = statedata.get(b'base') | |||||
| nodes = statedata[b'nodes'] | nodes = statedata[b'nodes'] | ||||
| revs = [repo[node].rev() for node in nodes] | revs = [repo[node].rev() for node in nodes] | ||||
| else: | else: | ||||
| cmdutil.wrongtooltocontinue(repo, _(b'graft')) | cmdutil.wrongtooltocontinue(repo, _(b'graft')) | ||||
| else: | else: | ||||
| if not revs: | if not revs: | ||||
| raise error.Abort(_(b'no revisions specified')) | raise error.Abort(_(b'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) | ||||
| skipped = set() | skipped = set() | ||||
| basectx = None | |||||
| if opts.get(b'base'): | |||||
| basectx = scmutil.revsingle(repo, opts[b'base'], None) | |||||
| if basectx is None: | if basectx is None: | ||||
| # check for merges | # check for merges | ||||
| for rev in repo.revs(b'%ld and merge()', revs): | for rev in repo.revs(b'%ld and merge()', revs): | ||||
| ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev) | ui.warn(_(b'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 | ||||
| % (r, repo[r], rev, ctx) | % (r, repo[r], rev, ctx) | ||||
| ) | ) | ||||
| revs.remove(r) | revs.remove(r) | ||||
| if not revs: | if not revs: | ||||
| return -1 | return -1 | ||||
| if opts.get(b'no_commit'): | if opts.get(b'no_commit'): | ||||
| statedata[b'no_commit'] = True | statedata[b'no_commit'] = True | ||||
| if opts.get(b'base'): | |||||
| statedata[b'base'] = True | |||||
| for pos, ctx in enumerate(repo.set(b"%ld", revs)): | for pos, ctx in enumerate(repo.set(b"%ld", revs)): | ||||
| desc = b'%d:%s "%s"' % ( | desc = b'%d:%s "%s"' % ( | ||||
| ctx.rev(), | ctx.rev(), | ||||
| ctx, | ctx, | ||||
| ctx.description().split(b'\n', 1)[0], | ctx.description().split(b'\n', 1)[0], | ||||
| ) | ) | ||||
| names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | ||||
| if names: | if names: | ||||
| $ hg resolve -m a | $ hg resolve -m a | ||||
| (no more unresolved files) | (no more unresolved files) | ||||
| continue: hg graft --continue | continue: hg graft --continue | ||||
| $ hg graft -c | $ hg graft -c | ||||
| grafting 24:2e7ea477be26 "24" | grafting 24:2e7ea477be26 "24" | ||||
| $ cat a | $ cat a | ||||
| abc | abc | ||||
| graft --continue after --base with conflits | |||||
| $ echo base > d | |||||
| $ hg ci -m _ | |||||
| $ hg graft -r 6 | |||||
| skipping ungraftable merge revision 6 | |||||
| [255] | |||||
| $ hg graft -r 6 --base 5 | |||||
| grafting 6:25a2b029d3ae "6" | |||||
| merging d | |||||
| merging e | |||||
| warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | |||||
| abort: unresolved conflicts, can't continue | |||||
| (use 'hg resolve' and 'hg graft --continue') | |||||
| [1] | |||||
| $ echo a > d && hg resolve -qm | |||||
| continue: hg graft --continue | |||||
| $ hg graft --continue | |||||
| grafting 6:25a2b029d3ae "6" | |||||
| Continue testing same origin policy, using revision numbers from test above | Continue testing same origin policy, using revision numbers from test above | ||||
| but do some destructive editing of the repo: | but do some destructive editing of the repo: | ||||
| $ hg up -qC 7 | $ hg up -qC 7 | ||||
| $ hg tag -l -r 13 tmp | $ hg tag -l -r 13 tmp | ||||
| $ hg --config extensions.strip= strip 2 | $ hg --config extensions.strip= strip 2 | ||||
| saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg | saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg | ||||
| $ hg graft tmp | $ hg graft tmp | ||||