transplant: permit merge changesets via --parent

This change permits the transplant extension to operate on merge
changesets by way of --parent.  This is particularly useful for
workflows which cherrypick branch merges rather than each commit
within a branch.

hgext/transplant.py

@@ -1,643 +1,670
 # Patch transplanting extension for Mercurial
 #
 # Copyright 2006, 2007 Brendan Cully <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''command to transplant changesets from another branch
 
 This extension allows you to transplant patches from another branch.
 
 Transplanted patches are recorded in .hg/transplant/transplants, as a
 map from a changeset hash to its hash in the source repository.
 '''
 
 from mercurial.i18n import _
 import os, tempfile
 from mercurial.node import short
 from mercurial import bundlerepo, hg, merge, match
 from mercurial import patch, revlog, scmutil, util, error, cmdutil
 from mercurial import revset, templatekw
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 
 class transplantentry(object):
     def __init__(self, lnode, rnode):
         self.lnode = lnode
         self.rnode = rnode
 
 class transplants(object):
     def __init__(self, path=None, transplantfile=None, opener=None):
         self.path = path
         self.transplantfile = transplantfile
         self.opener = opener
 
         if not opener:
             self.opener = scmutil.opener(self.path)
         self.transplants = {}
         self.dirty = False
         self.read()
 
     def read(self):
         abspath = os.path.join(self.path, self.transplantfile)
         if self.transplantfile and os.path.exists(abspath):
             for line in self.opener.read(self.transplantfile).splitlines():
                 lnode, rnode = map(revlog.bin, line.split(':'))
                 list = self.transplants.setdefault(rnode, [])
                 list.append(transplantentry(lnode, rnode))
 
     def write(self):
         if self.dirty and self.transplantfile:
             if not os.path.isdir(self.path):
                 os.mkdir(self.path)
             fp = self.opener(self.transplantfile, 'w')
             for list in self.transplants.itervalues():
                 for t in list:
                     l, r = map(revlog.hex, (t.lnode, t.rnode))
                     fp.write(l + ':' + r + '\n')
             fp.close()
         self.dirty = False
 
     def get(self, rnode):
         return self.transplants.get(rnode) or []
 
     def set(self, lnode, rnode):
         list = self.transplants.setdefault(rnode, [])
         list.append(transplantentry(lnode, rnode))
         self.dirty = True
 
     def remove(self, transplant):
         list = self.transplants.get(transplant.rnode)
         if list:
             del list[list.index(transplant)]
             self.dirty = True
 
 class transplanter(object):
     def __init__(self, ui, repo):
         self.ui = ui
         self.path = repo.join('transplant')
         self.opener = scmutil.opener(self.path)
         self.transplants = transplants(self.path, 'transplants',
                                        opener=self.opener)
         self.editor = None
 
     def applied(self, repo, node, parent):
         '''returns True if a node is already an ancestor of parent
         or has already been transplanted'''
         if hasnode(repo, node):
             if node in repo.changelog.reachable(parent, stop=node):
                 return True
         for t in self.transplants.get(node):
             # it might have been stripped
             if not hasnode(repo, t.lnode):
                 self.transplants.remove(t)
                 return False
             if t.lnode in repo.changelog.reachable(parent, stop=t.lnode):
                 return True
         return False
 
     def apply(self, repo, source, revmap, merges, opts={}):
         '''apply the revisions in revmap one by one in revision order'''
         revs = sorted(revmap)
         p1, p2 = repo.dirstate.parents()
         pulls = []
         diffopts = patch.diffopts(self.ui, opts)
         diffopts.git = True
 
         lock = wlock = tr = None
         try:
             wlock = repo.wlock()
             lock = repo.lock()
             tr = repo.transaction('transplant')
             for rev in revs:
                 node = revmap[rev]
                 revstr = '%s:%s' % (rev, short(node))
 
                 if self.applied(repo, node, p1):
                     self.ui.warn(_('skipping already applied revision %s\n') %
                                  revstr)
                     continue
 
                 parents = source.changelog.parents(node)
                 if not opts.get('filter'):
                     # If the changeset parent is the same as the
                     # wdir's parent, just pull it.
                     if parents[0] == p1:
                         pulls.append(node)
                         p1 = node
                         continue
                     if pulls:
                         if source != repo:
                             repo.pull(source, heads=pulls)
                         merge.update(repo, pulls[-1], False, False, None)
                         p1, p2 = repo.dirstate.parents()
                         pulls = []
 
                 domerge = False
                 if node in merges:
                     # pulling all the merge revs at once would mean we
                     # couldn't transplant after the latest even if
                     # transplants before them fail.
                     domerge = True
                     if not hasnode(repo, node):
                         repo.pull(source, heads=[node])
 
+                skipmerge = False
                 if parents[1] != revlog.nullid:
+                    if not opts.get('parent'):
                     self.ui.note(_('skipping merge changeset %s:%s\n')
                                  % (rev, short(node)))
+                        skipmerge = True
+                    else:
+                        parent = source.lookup(opts['parent'])
+                        if parent not in parents:
+                            raise util.Abort(_('%s is not a parent of %s') %
+                                             (short(parent), short(node)))
+                else:
+                    parent = parents[0]
+
+                if skipmerge:
                     patchfile = None
                 else:
                     fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-')
                     fp = os.fdopen(fd, 'w')
-                    gen = patch.diff(source, parents[0], node, opts=diffopts)
+                    gen = patch.diff(source, parent, node, opts=diffopts)
                     for chunk in gen:
                         fp.write(chunk)
                     fp.close()
 
                 del revmap[rev]
                 if patchfile or domerge:
                     try:
                         n = self.applyone(repo, node,
                                           source.changelog.read(node),
                                           patchfile, merge=domerge,
                                           log=opts.get('log'),
                                           filter=opts.get('filter'))
                         if n and domerge:
                             self.ui.status(_('%s merged at %s\n') % (revstr,
                                       short(n)))
                         elif n:
                             self.ui.status(_('%s transplanted to %s\n')
                                            % (short(node),
                                               short(n)))
                     finally:
                         if patchfile:
                             os.unlink(patchfile)
             tr.close()
             if pulls:
                 repo.pull(source, heads=pulls)
                 merge.update(repo, pulls[-1], False, False, None)
         finally:
             self.saveseries(revmap, merges)
             self.transplants.write()
             if tr:
                 tr.release()
             lock.release()
             wlock.release()
 
     def filter(self, filter, node, changelog, patchfile):
         '''arbitrarily rewrite changeset before applying it'''
 
         self.ui.status(_('filtering %s\n') % patchfile)
         user, date, msg = (changelog[1], changelog[2], changelog[4])
         fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-')
         fp = os.fdopen(fd, 'w')
         fp.write("# HG changeset patch\n")
         fp.write("# User %s\n" % user)
         fp.write("# Date %d %d\n" % date)
         fp.write(msg + '\n')
         fp.close()
 
         try:
             util.system('%s %s %s' % (filter, util.shellquote(headerfile),
                                    util.shellquote(patchfile)),
                         environ={'HGUSER': changelog[1],
                                  'HGREVISION': revlog.hex(node),
                                  },
                         onerr=util.Abort, errprefix=_('filter failed'),
                         out=self.ui.fout)
             user, date, msg = self.parselog(file(headerfile))[1:4]
         finally:
             os.unlink(headerfile)
 
         return (user, date, msg)
 
     def applyone(self, repo, node, cl, patchfile, merge=False, log=False,
                  filter=None):
         '''apply the patch in patchfile to the repository as a transplant'''
         (manifest, user, (time, timezone), files, message) = cl[:5]
         date = "%d %d" % (time, timezone)
         extra = {'transplant_source': node}
         if filter:
             (user, date, message) = self.filter(filter, node, cl, patchfile)
 
         if log:
             # we don't translate messages inserted into commits
             message += '\n(transplanted from %s)' % revlog.hex(node)
 
         self.ui.status(_('applying %s\n') % short(node))
         self.ui.note('%s %s\n%s\n' % (user, date, message))
 
         if not patchfile and not merge:
             raise util.Abort(_('can only omit patchfile if merging'))
         if patchfile:
             try:
                 files = set()
                 patch.patch(self.ui, repo, patchfile, files=files, eolmode=None)
                 files = list(files)
                 if not files:
                     self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
                     return None
             except Exception, inst:
                 seriespath = os.path.join(self.path, 'series')
                 if os.path.exists(seriespath):
                     os.unlink(seriespath)
                 p1 = repo.dirstate.p1()
                 p2 = node
                 self.log(user, date, message, p1, p2, merge=merge)
                 self.ui.write(str(inst) + '\n')
                 raise util.Abort(_('fix up the merge and run '
                                    'hg transplant --continue'))
         else:
             files = None
         if merge:
             p1, p2 = repo.dirstate.parents()
             repo.dirstate.setparents(p1, node)
             m = match.always(repo.root, '')
         else:
             m = match.exact(repo.root, '', files)
 
         n = repo.commit(message, user, date, extra=extra, match=m,
                         editor=self.editor)
         if not n:
             # Crash here to prevent an unclear crash later, in
             # transplants.write().  This can happen if patch.patch()
             # does nothing but claims success or if repo.status() fails
             # to report changes done by patch.patch().  These both
             # appear to be bugs in other parts of Mercurial, but dying
             # here, as soon as we can detect the problem, is preferable
             # to silently dropping changesets on the floor.
             raise RuntimeError('nothing committed after transplant')
         if not merge:
             self.transplants.set(n, node)
 
         return n
 
     def resume(self, repo, source, opts=None):
         '''recover last transaction and apply remaining changesets'''
         if os.path.exists(os.path.join(self.path, 'journal')):
             n, node = self.recover(repo)
             self.ui.status(_('%s transplanted as %s\n') % (short(node),
                                                            short(n)))
         seriespath = os.path.join(self.path, 'series')
         if not os.path.exists(seriespath):
             self.transplants.write()
             return
         nodes, merges = self.readseries()
         revmap = {}
         for n in nodes:
             revmap[source.changelog.rev(n)] = n
         os.unlink(seriespath)
 
         self.apply(repo, source, revmap, merges, opts)
 
     def recover(self, repo):
         '''commit working directory using journal metadata'''
         node, user, date, message, parents = self.readlog()
-        merge = len(parents) == 2
+        merge = False
 
         if not user or not date or not message or not parents[0]:
             raise util.Abort(_('transplant log file is corrupt'))
 
+        parent = parents[0]
+        if len(parents) > 1:
+            if opts.get('parent'):
+                parent = source.lookup(opts['parent'])
+                if parent not in parents:
+                    raise util.Abort(_('%s is not a parent of %s') %
+                                     (short(parent), short(node)))
+            else:
+                merge = True
+
         extra = {'transplant_source': node}
         wlock = repo.wlock()
         try:
             p1, p2 = repo.dirstate.parents()
-            if p1 != parents[0]:
+            if p1 != parent:
                 raise util.Abort(
                     _('working dir not at transplant parent %s') %
-                                 revlog.hex(parents[0]))
+                                 revlog.hex(parent))
             if merge:
                 repo.dirstate.setparents(p1, parents[1])
             n = repo.commit(message, user, date, extra=extra,
                             editor=self.editor)
             if not n:
                 raise util.Abort(_('commit failed'))
             if not merge:
                 self.transplants.set(n, node)
             self.unlog()
 
             return n, node
         finally:
             wlock.release()
 
     def readseries(self):
         nodes = []
         merges = []
         cur = nodes
         for line in self.opener.read('series').splitlines():
             if line.startswith('# Merges'):
                 cur = merges
                 continue
             cur.append(revlog.bin(line))
 
         return (nodes, merges)
 
     def saveseries(self, revmap, merges):
         if not revmap:
             return
 
         if not os.path.isdir(self.path):
             os.mkdir(self.path)
         series = self.opener('series', 'w')
         for rev in sorted(revmap):
             series.write(revlog.hex(revmap[rev]) + '\n')
         if merges:
             series.write('# Merges\n')
             for m in merges:
                 series.write(revlog.hex(m) + '\n')
         series.close()
 
     def parselog(self, fp):
         parents = []
         message = []
         node = revlog.nullid
         inmsg = False
         user = None
         date = None
         for line in fp.read().splitlines():
             if inmsg:
                 message.append(line)
             elif line.startswith('# User '):
                 user = line[7:]
             elif line.startswith('# Date '):
                 date = line[7:]
             elif line.startswith('# Node ID '):
                 node = revlog.bin(line[10:])
             elif line.startswith('# Parent '):
                 parents.append(revlog.bin(line[9:]))
             elif not line.startswith('# '):
                 inmsg = True
                 message.append(line)
         if None in (user, date):
             raise util.Abort(_("filter corrupted changeset (no user or date)"))
         return (node, user, date, '\n'.join(message), parents)
 
     def log(self, user, date, message, p1, p2, merge=False):
         '''journal changelog metadata for later recover'''
 
         if not os.path.isdir(self.path):
             os.mkdir(self.path)
         fp = self.opener('journal', 'w')
         fp.write('# User %s\n' % user)
         fp.write('# Date %s\n' % date)
         fp.write('# Node ID %s\n' % revlog.hex(p2))
         fp.write('# Parent ' + revlog.hex(p1) + '\n')
         if merge:
             fp.write('# Parent ' + revlog.hex(p2) + '\n')
         fp.write(message.rstrip() + '\n')
         fp.close()
 
     def readlog(self):
         return self.parselog(self.opener('journal'))
 
     def unlog(self):
         '''remove changelog journal'''
         absdst = os.path.join(self.path, 'journal')
         if os.path.exists(absdst):
             os.unlink(absdst)
 
     def transplantfilter(self, repo, source, root):
         def matchfn(node):
             if self.applied(repo, node, root):
                 return False
             if source.changelog.parents(node)[1] != revlog.nullid:
                 return False
             extra = source.changelog.read(node)[5]
             cnode = extra.get('transplant_source')
             if cnode and self.applied(repo, cnode, root):
                 return False
             return True
 
         return matchfn
 
 def hasnode(repo, node):
     try:
         return repo.changelog.rev(node) is not None
     except error.RevlogError:
         return False
 
 def browserevs(ui, repo, nodes, opts):
     '''interactively transplant changesets'''
     def browsehelp(ui):
         ui.write(_('y: transplant this changeset\n'
                    'n: skip this changeset\n'
                    'm: merge at this changeset\n'
                    'p: show patch\n'
                    'c: commit selected changesets\n'
                    'q: cancel transplant\n'
                    '?: show this help\n'))
 
     displayer = cmdutil.show_changeset(ui, repo, opts)
     transplants = []
     merges = []
     for node in nodes:
         displayer.show(repo[node])
         action = None
         while not action:
             action = ui.prompt(_('apply changeset? [ynmpcq?]:'))
             if action == '?':
                 browsehelp(ui)
                 action = None
             elif action == 'p':
                 parent = repo.changelog.parents(node)[0]
                 for chunk in patch.diff(repo, parent, node):
                     ui.write(chunk)
                 action = None
             elif action not in ('y', 'n', 'm', 'c', 'q'):
                 ui.write(_('no such option\n'))
                 action = None
         if action == 'y':
             transplants.append(node)
         elif action == 'm':
             merges.append(node)
         elif action == 'c':
             break
         elif action == 'q':
             transplants = ()
             merges = ()
             break
     displayer.close()
     return (transplants, merges)
 
 @command('transplant',
     [('s', 'source', '', _('pull patches from REPO'), _('REPO')),
     ('b', 'branch', [],
      _('pull patches from branch BRANCH'), _('BRANCH')),
     ('a', 'all', None, _('pull all changesets up to BRANCH')),
     ('p', 'prune', [], _('skip over REV'), _('REV')),
     ('m', 'merge', [], _('merge at REV'), _('REV')),
+    ('', 'parent', '',
+     _('parent to choose when transplanting merge'), _('REV')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ('', 'log', None, _('append transplant info to log message')),
     ('c', 'continue', None, _('continue last transplant session '
                               'after repair')),
     ('', 'filter', '',
      _('filter changesets through command'), _('CMD'))],
     _('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] '
       '[-m REV] [REV]...'))
 def transplant(ui, repo, *revs, **opts):
     '''transplant changesets from another branch
 
     Selected changesets will be applied on top of the current working
     directory with the log of the original changeset. The changesets
     are copied and will thus appear twice in the history. Use the
     rebase extension instead if you want to move a whole branch of
     unpublished changesets.
 
     If --log is specified, log messages will have a comment appended
     of the form::
 
       (transplanted from CHANGESETHASH)
 
     You can rewrite the changelog message with the --filter option.
     Its argument will be invoked with the current changelog message as
     $1 and the patch as $2.
 
     If --source/-s is specified, selects changesets from the named
     repository. If --branch/-b is specified, selects changesets from
     the branch holding the named revision, up to that revision. If
     --all/-a is specified, all changesets on the branch will be
     transplanted, otherwise you will be prompted to select the
     changesets you want.
 
     :hg:`transplant --branch REVISION --all` will transplant the
     selected branch (up to the named revision) onto your current
     working directory.
 
     You can optionally mark selected transplanted changesets as merge
     changesets. You will not be prompted to transplant any ancestors
     of a merged transplant, and you can merge descendants of them
     normally instead of transplanting them.
 
+    Merge changesets may be transplanted directly by specifying the
+    proper parent changeset by calling :hg: `transplant --parent`.
+
     If no merges or revisions are provided, :hg:`transplant` will
     start an interactive changeset browser.
 
     If a changeset application fails, you can fix the merge by hand
     and then resume where you left off by calling :hg:`transplant
     --continue/-c`.
     '''
     def incwalk(repo, csets, match=util.always):
         for node in csets:
             if match(node):
                 yield node
 
     def transplantwalk(repo, root, branches, match=util.always):
         if not branches:
             branches = repo.heads()
         ancestors = []
         for branch in branches:
             ancestors.append(repo.changelog.ancestor(root, branch))
         for node in repo.changelog.nodesbetween(ancestors, branches)[0]:
             if match(node):
                 yield node
 
     def checkopts(opts, revs):
         if opts.get('continue'):
             if opts.get('branch') or opts.get('all') or opts.get('merge'):
                 raise util.Abort(_('--continue is incompatible with '
                                    'branch, all or merge'))
             return
         if not (opts.get('source') or revs or
                 opts.get('merge') or opts.get('branch')):
             raise util.Abort(_('no source URL, branch tag or revision '
                                'list provided'))
         if opts.get('all'):
             if not opts.get('branch'):
                 raise util.Abort(_('--all requires a branch revision'))
             if revs:
                 raise util.Abort(_('--all is incompatible with a '
                                    'revision list'))
 
     checkopts(opts, revs)
 
     if not opts.get('log'):
         opts['log'] = ui.config('transplant', 'log')
     if not opts.get('filter'):
         opts['filter'] = ui.config('transplant', 'filter')
 
     tp = transplanter(ui, repo)
     if opts.get('edit'):
         tp.editor = cmdutil.commitforceeditor
 
     p1, p2 = repo.dirstate.parents()
     if len(repo) > 0 and p1 == revlog.nullid:
         raise util.Abort(_('no revision checked out'))
     if not opts.get('continue'):
         if p2 != revlog.nullid:
             raise util.Abort(_('outstanding uncommitted merges'))
         m, a, r, d = repo.status()[:4]
         if m or a or r or d:
             raise util.Abort(_('outstanding local changes'))
 
     sourcerepo = opts.get('source')
     if sourcerepo:
         source = hg.peer(ui, opts, ui.expandpath(sourcerepo))
         branches = map(source.lookup, opts.get('branch', ()))
         source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, source,
                                     onlyheads=branches, force=True)
     else:
         source = repo
         branches = map(source.lookup, opts.get('branch', ()))
         cleanupfn = None
 
     try:
         if opts.get('continue'):
             tp.resume(repo, source, opts)
             return
 
         tf = tp.transplantfilter(repo, source, p1)
         if opts.get('prune'):
             prune = [source.lookup(r)
                      for r in scmutil.revrange(source, opts.get('prune'))]
             matchfn = lambda x: tf(x) and x not in prune
         else:
             matchfn = tf
         merges = map(source.lookup, opts.get('merge', ()))
         revmap = {}
         if revs:
             for r in scmutil.revrange(source, revs):
                 revmap[int(r)] = source.lookup(r)
         elif opts.get('all') or not merges:
             if source != repo:
                 alltransplants = incwalk(source, csets, match=matchfn)
             else:
                 alltransplants = transplantwalk(source, p1, branches,
                                                 match=matchfn)
             if opts.get('all'):
                 revs = alltransplants
             else:
                 revs, newmerges = browserevs(ui, source, alltransplants, opts)
                 merges.extend(newmerges)
             for r in revs:
                 revmap[source.changelog.rev(r)] = r
         for r in merges:
             revmap[source.changelog.rev(r)] = r
 
         tp.apply(repo, source, revmap, merges, opts)
     finally:
         if cleanupfn:
             cleanupfn()
 
 def revsettransplanted(repo, subset, x):
     """``transplanted([set])``
     Transplanted changesets in set, or all transplanted changesets.
     """
     if x:
       s = revset.getset(repo, subset, x)
     else:
       s = subset
     return [r for r in s if repo[r].extra().get('transplant_source')]
 
 def kwtransplanted(repo, ctx, **args):
     """:transplanted: String. The node identifier of the transplanted
     changeset if any."""
     n = ctx.extra().get('transplant_source')
     return n and revlog.hex(n) or ''
 
 def extsetup(ui):
     revset.symbols['transplanted'] = revsettransplanted
     templatekw.keywords['transplanted'] = kwtransplanted
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = [revsettransplanted, kwtransplanted]

tests/test-transplant.t

@@ -1,426 +1,480
   $ "$TESTDIR/hghave" serve || exit 80
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > transplant=
   > EOF
 
   $ hg init t
   $ cd t
   $ echo r1 > r1
   $ hg ci -Amr1 -d'0 0'
   adding r1
   $ echo r2 > r2
   $ hg ci -Amr2 -d'1 0'
   adding r2
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ echo b1 > b1
   $ hg ci -Amb1 -d '0 0'
   adding b1
   created new head
   $ echo b2 > b2
   $ hg ci -Amb2 -d '1 0'
   adding b2
   $ echo b3 > b3
   $ hg ci -Amb3 -d '2 0'
   adding b3
 
   $ hg log --template '{rev} {parents} {desc}\n'
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
   $ hg clone . ../rebase
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../rebase
 
   $ hg up -C 1
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
 rebase b onto r1
 
   $ hg transplant -a -b tip
   applying 37a1297eb21b
   37a1297eb21b transplanted to e234d668f844
   applying 722f4667af76
   722f4667af76 transplanted to 539f377d78df
   applying a53251cdf717
   a53251cdf717 transplanted to ffd6818a3975
   $ hg log --template '{rev} {parents} {desc}\n'
   7  b3
   6  b2
   5 1:d11e3596cc1a  b1
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
 test transplanted revset
 
   $ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n'
   5 1:d11e3596cc1a  b1
   6  b2
   7  b3
   $ hg help revsets | grep transplanted
       "transplanted([set])"
         Transplanted changesets in set, or all transplanted changesets.
 
 test tranplanted keyword
 
   $ hg log --template '{rev} {transplanted}\n'
   7 a53251cdf717679d1907b289f991534be05c997a
   6 722f4667af767100cb15b6a79324bf8abbfe1ef4
   5 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21
   4 
   3 
   2 
   1 
   0 
 
 rollback the transplant
   $ hg rollback
   repository tip rolled back to revision 4 (undo transplant)
   working directory now based on revision 1
   $ hg tip -q
   4:a53251cdf717
   $ hg parents -q
   1:d11e3596cc1a
   $ hg status
   ? b1
   ? b2
   ? b3
 
   $ hg clone ../t ../prune
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../prune
 
   $ hg up -C 1
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
 rebase b onto r1, skipping b2
 
   $ hg transplant -a -b tip -p 3
   applying 37a1297eb21b
   37a1297eb21b transplanted to e234d668f844
   applying a53251cdf717
   a53251cdf717 transplanted to 7275fda4d04f
   $ hg log --template '{rev} {parents} {desc}\n'
   6  b3
   5 1:d11e3596cc1a  b1
   4  b3
   3  b2
   2 0:17ab29e464c6  b1
   1  r2
   0  r1
 
 
 remote transplant
 
   $ hg clone -r 1 ../t ../remote
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../remote
   $ hg transplant --log -s ../t 2 4
   searching for changes
   applying 37a1297eb21b
   37a1297eb21b transplanted to c19cf0ccb069
   applying a53251cdf717
   a53251cdf717 transplanted to f7fe5bf98525
   $ hg log --template '{rev} {parents} {desc}\n'
   3  b3
   (transplanted from a53251cdf717679d1907b289f991534be05c997a)
   2  b1
   (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
   1  r2
   0  r1
 
 skip previous transplants
 
   $ hg transplant -s ../t -a -b 4
   searching for changes
   applying 722f4667af76
   722f4667af76 transplanted to 47156cd86c0b
   $ hg log --template '{rev} {parents} {desc}\n'
   4  b2
   3  b3
   (transplanted from a53251cdf717679d1907b289f991534be05c997a)
   2  b1
   (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
   1  r2
   0  r1
 
 skip local changes transplanted to the source
 
   $ echo b4 > b4
   $ hg ci -Amb4 -d '3 0'
   adding b4
   $ hg clone ../t ../pullback
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../pullback
   $ hg transplant -s ../remote -a -b tip
   searching for changes
   applying 4333daefcb15
   4333daefcb15 transplanted to 5f42c04e07cc
 
 
 remote transplant with pull
 
   $ hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid
   $ cat ../t.pid >> $DAEMON_PIDS
 
   $ hg clone -r 0 ../t ../rp
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../rp
   $ hg transplant -s http://localhost:$HGPORT/ 2 4
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   applying a53251cdf717
   a53251cdf717 transplanted to 8d9279348abb
   $ hg log --template '{rev} {parents} {desc}\n'
   2  b3
   1  b1
   0  r1
 
 transplant --continue
 
   $ hg init ../tc
   $ cd ../tc
   $ cat <<EOF > foo
   > foo
   > bar
   > baz
   > EOF
   $ echo toremove > toremove
   $ hg ci -Amfoo
   adding foo
   adding toremove
   $ cat <<EOF > foo
   > foo2
   > bar2
   > baz2
   > EOF
   $ rm toremove
   $ echo added > added
   $ hg ci -Amfoo2
   adding added
   removing toremove
   $ echo bar > bar
   $ hg ci -Ambar
   adding bar
   $ echo bar2 >> bar
   $ hg ci -mbar2
   $ hg up 0
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo foobar > foo
   $ hg ci -mfoobar
   created new head
   $ hg transplant 1:3
   applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
 
 transplant -c shouldn't use an old changeset
 
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm added
   $ hg transplant 1
   applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ hg transplant --continue
   a1e30dd1b8e7 transplanted as f1563cf27039
   $ hg transplant 1:3
   skipping already applied revision 1:a1e30dd1b8e7
   applying 1739ac5f6139
   1739ac5f6139 transplanted to d649c221319f
   applying 0282d5fbbe02
   0282d5fbbe02 transplanted to 77418277ccb3
   $ hg locate
   added
   bar
   foo
   $ cd ..
 
 Issue1111: Test transplant --merge
 
   $ hg init t1111
   $ cd t1111
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo b >> a
   $ hg ci -m appendb
   $ echo c >> a
   $ hg ci -m appendc
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo d >> a
   $ hg ci -m appendd
   created new head
 
 tranplant
 
   $ hg transplant -m 1
   applying 42dc4432fd35
   1:42dc4432fd35 merged at a9f4acbac129
   $ cd ..
 
 test transplant into empty repository
 
   $ hg init empty
   $ cd empty
   $ hg transplant -s ../t -b tip -a
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 4 files
   $ cd ..
 
 
 test filter
 
   $ hg init filter
   $ cd filter
   $ cat <<'EOF' >test-filter
   > #!/bin/sh
   > sed 's/r1/r2/' $1 > $1.new
   > mv $1.new $1
   > EOF
   $ chmod +x test-filter
   $ hg transplant -s ../t -b tip -a --filter ./test-filter
   filtering * (glob)
   applying 17ab29e464c6
   17ab29e464c6 transplanted to e9ffc54ea104
   filtering * (glob)
   applying 37a1297eb21b
   37a1297eb21b transplanted to 348b36d0b6a5
   filtering * (glob)
   applying 722f4667af76
   722f4667af76 transplanted to 0aa6979afb95
   filtering * (glob)
   applying a53251cdf717
   a53251cdf717 transplanted to 14f8512272b5
   $ hg log --template '{rev} {parents} {desc}\n'
   3  b3
   2  b2
   1  b1
   0  r2
   $ cd ..
 
 
 test filter with failed patch
 
   $ cd filter
   $ hg up 0
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo foo > b1
   $ hg ci -Am foo
   adding b1
   adding test-filter
   created new head
   $ hg transplant 1 --filter ./test-filter
   filtering * (glob)
   applying 348b36d0b6a5
   file b1 already exists
   1 out of 1 hunks FAILED -- saving rejects to file b1.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ cd ..
 
 test environment passed to filter
 
   $ hg init filter-environment
   $ cd filter-environment
   $ cat <<'EOF' >test-filter-environment
   > #!/bin/sh
   > echo "Transplant by $HGUSER" >> $1
   > echo "Transplant from rev $HGREVISION" >> $1
   > EOF
   $ chmod +x test-filter-environment
   $ hg transplant -s ../t --filter ./test-filter-environment 0
   filtering * (glob)
   applying 17ab29e464c6
   17ab29e464c6 transplanted to 5190e68026a0
 
   $ hg log --template '{rev} {parents} {desc}\n'
   0  r1
   Transplant by test
   Transplant from rev 17ab29e464c6ca53e329470efe2a9918ac617a6f
   $ cd ..
 
 test transplant with filter handles invalid changelog
 
   $ hg init filter-invalid-log
   $ cd filter-invalid-log
   $ cat <<'EOF' >test-filter-invalid-log
   > #!/bin/sh
   > echo "" > $1
   > EOF
   $ chmod +x test-filter-invalid-log
   $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
   filtering * (glob)
   abort: filter corrupted changeset (no user or date)
   [255]
 
 test with a win32ext like setup (differing EOLs)
 
   $ hg init twin1
   $ cd twin1
   $ echo a > a
   $ echo b > b
   $ echo b >> b
   $ hg ci -Am t
   adding a
   adding b
   $ echo a > b
   $ echo b >> b
   $ hg ci -m changeb
   $ cd ..
 
   $ hg init twin2
   $ cd twin2
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
   $ hg ci -Am addb
   adding b
   $ hg transplant -s ../twin1 tip
   searching for changes
   warning: repository is unrelated
   applying 2e849d776c17
   2e849d776c17 transplanted to 8e65bebc063e
   $ cat b
   a\r (esc)
   b\r (esc)
   $ cd ..
+
+test transplant with merge changeset is skipped
+
+  $ hg init merge1a
+  $ cd merge1a
+  $ echo a > a
+  $ hg ci -Am a
+  adding a
+  $ hg branch b
+  marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
+  $ hg ci -m branchb
+  $ echo b > b
+  $ hg ci -Am b
+  adding b
+  $ hg update default
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg merge b
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -m mergeb
+  $ cd ..
+
+  $ hg init merge1b
+  $ cd merge1b
+  $ hg transplant -s ../merge1a tip
+
+test transplant with merge changeset accepts --parent
+
+  $ hg init merge2a
+  $ cd merge2a
+  $ echo a > a
+  $ hg ci -Am a
+  adding a
+  $ hg branch b
+  marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
+  $ hg ci -m branchb
+  $ echo b > b
+  $ hg ci -Am b
+  adding b
+  $ hg update default
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg merge b
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -m mergeb
+  $ cd ..
+
+  $ hg init merge2b
+  $ cd merge2b
+  $ hg transplant -s ../merge2a --parent 0 tip
+  applying be9f9b39483f
+  be9f9b39483f transplanted to 9959e51f94d1