mercurial-scm/hg-stable: mercurial/commands.py comparison

comparison mercurial/commands.py @ 40499:3c0d5016b2be

graft: introduce --base option for using custom base revision while merging The graft command usually performs an internal merge of the current parent revision with the graft revision, using p1 of the grafted revision as base for the merge. As a trivial extension of this, we introduce the --base option to allow for using another base revision. This can be used as a building block for grafting and collapsing multiple changesets at once, or for grafting the resulting change from a merge as a single simple change. (This is kind of similar to backout --parent ... only different: this graft base must be an ancestor, but is usually *not* a parent.) This is probably an advanced use case, and we do thus not show it in the non-verbose help.

author	Mads Kiilerich <mads@kiilerich.com>
date	Sun, 14 Oct 2018 17:08:18 +0200
parents	1feb4b2c8e40
children	db61a18148a4

comparison

equal deleted inserted replaced

-:808b762679cd
+:3c0d5016b2be
 return rejected and 1 or 0
 @command(
 'graft',
 [('r', 'rev', [], _('revisions to graft'), _('REV')),
+('', 'base', '',
+_('base revision when doing the graft merge (ADVANCED)'), _('REV')),
 ('c', 'continue', False, _('resume interrupted graft')),
 ('', 'stop', False, _('stop interrupted graft')),
 ('', 'abort', False, _('abort interrupted graft')),
 ('e', 'edit', False, _('invoke editor on commit messages')),
 ('', 'log', None, _('append graft info to log message')),
 The -c/--continue option reapplies all the earlier options.
 .. container:: verbose
+The --base option exposes more of how graft internally uses merge with a
+custom base revision. --base can be used to specify another ancestor than
+the first and only parent.
+The command::
+hg graft -r 345 --base 234
+is thus pretty much the same as::
+hg diff -r 234 -r 345 | hg import
+but using merge to resolve conflicts and track moved files.
+The result of a merge can thus be backported as a single commit by
+specifying one of the merge parents as base, and thus effectively
+grafting the changes from the other side.
+It is also possible to collapse multiple changesets and clean up history
+by specifying another ancestor as base, much like rebase --collapse
+--keep.
+The commit message can be tweaked after the fact using commit --amend .
+For using non-ancestors as the base to backout changes, see the backout
+command and the hidden --parent option.
+.. container:: verbose
 Examples:
 - copy a single change to the stable branch and edit its description::
 hg update stable
 hg log --debug -r .
 - show revisions sorted by date::
 hg log -r "sort(all(), date)"
+- backport the result of a merge as a single commit::
+hg graft -r 123 --base 123^
+- land a feature branch as one changeset::
+hg up -cr default
+hg graft -r featureX --base "ancestor('featureX', 'default')"
 See :hg:`help revisions` for more about specifying revisions.
 Returns 0 on successful completion.
 '''
 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
 'revision ordering!\n'))
 revs = list(revs)
 revs.extend(opts.get('rev'))
+basectx = None
+if opts.get('base'):
+basectx = scmutil.revsingle(repo, opts['base'], None)
 # a dict of data to be stored in state file
 statedata = {}
 # list of new nodes created by ongoing graft
 statedata['newnodes'] = []
 cmdutil.checkunfinished(repo)
 cmdutil.bailifchanged(repo)
 revs = scmutil.revrange(repo, revs)
 skipped = set()
-# check for merges
+if basectx is None:
-for rev in repo.revs('%ld and merge()', revs):
+# check for merges
-ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
+for rev in repo.revs('%ld and merge()', revs):
-skipped.add(rev)
+ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
+skipped.add(rev)
 revs = [r for r in revs if r not in skipped]
 if not revs:
 return -1
+if basectx is not None and len(revs) != 1:
+raise error.Abort(_('only one revision allowed with --base '))
 # Don't check in the --continue case, in effect retaining --force across
 # --continues. That's because without --force, any revisions we decided to
 # skip would have been filtered out here, so they wouldn't have made their
 # way to the graftstate. With --force, any revisions we would have otherwise
 # skipped would not have been filtered out, and if they hadn't been applied
 # already, they'd have been in the graftstate.
-if not (cont or opts.get('force')):
+if not (cont or opts.get('force')) and basectx is None:
 # check for ancestors of dest branch
 crev = repo['.'].rev()
 ancestors = repo.changelog.ancestors([crev], inclusive=True)
 # XXX make this lazy in the future
 # don't mutate while iterating, create a copy
 # we don't merge the first commit when continuing
 if not cont:
 # perform the graft merge with p1(rev) as 'ancestor'
 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+base = ctx.p1() if basectx is None else basectx
 with ui.configoverride(overrides, 'graft'):
-stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
+stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
 # report any conflicts
 if stats.unresolvedcount > 0:
 # write out state for --continue
 nodes = [repo[rev].hex() for rev in revs[pos:]]
 statedata['nodes'] = nodes

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 40499:3c0d5016b2be