transplant: restore dirstate correctly at unexpected failure

Before this patch, transplant can't restore dirstate as expected at
failure other than one while patching. This causes:

  - unexpected file status

  - dirstate refers already rollback-ed parent
    (only at failure of transplanting the 2nd or later revision)

To restore dirstate correctly also at unexpected failure, this patch
encloses scope of store lock and transaction by 'dirstateguard'.

This is temporary fixing for stable branch. See
DirstateTransactionPlan wiki page for detail about the future plan to
treat dirstate consistently around scope boundary of transaction.

    https://mercurial.selenic.com/wiki/DirstateTransactionPlan

This patch also adds 'if lock' examination for safety
'lock.release()', because creating 'dirstateguard' object may fail
unexpectedly (e.g. IOError for saving dirstate).

BTW, in the test script, putting section header '[extensions]' into
'.hg/hgrc' is needed to fix incomplete disabling 'abort' extension at
4d1382fd96ff.

hgext/transplant.py

@@ -1,710 +1,716 b''
 # 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 changes to another parent revision,
 possibly in another repository. The transplant is done using 'diff' patches.
 
 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, exchange
 
 class TransplantError(error.Abort):
     pass
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 # Note for extension authors: ONLY specify testedwith = 'internal' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = 'internal'
 
 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, opts):
         self.ui = ui
         self.path = repo.join('transplant')
         self.opener = scmutil.opener(self.path)
         self.transplants = transplants(self.path, 'transplants',
                                        opener=self.opener)
         def getcommiteditor():
             editform = cmdutil.mergeeditform(repo[None], 'transplant')
             return cmdutil.getcommiteditor(editform=editform, **opts)
         self.getcommiteditor = getcommiteditor
 
     def applied(self, repo, node, parent):
         '''returns True if a node is already an ancestor of parent
         or is parent or has already been transplanted'''
         if hasnode(repo, parent):
             parentrev = repo.changelog.rev(parent)
         if hasnode(repo, node):
             rev = repo.changelog.rev(node)
             reachable = repo.changelog.ancestors([parentrev], rev,
                                                  inclusive=True)
             if rev in reachable:
                 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
             lnoderev = repo.changelog.rev(t.lnode)
             if lnoderev in repo.changelog.ancestors([parentrev], lnoderev,
                                                     inclusive=True):
                 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.difffeatureopts(self.ui, opts)
         diffopts.git = True
 
-        lock = wlock = tr = None
+        lock = wlock = tr = dsguard = None
         try:
             wlock = repo.wlock()
+            dsguard = cmdutil.dirstateguard(repo, 'transplant')
             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') or opts.get('log')):
                     # 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:
                             exchange.pull(repo, source.peer(), 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):
                         exchange.pull(repo, source.peer(), 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, parent, node, opts=diffopts)
                     for chunk in gen:
                         fp.write(chunk)
                     fp.close()
 
                 del revmap[rev]
                 if patchfile or domerge:
                     try:
                         try:
                             n = self.applyone(repo, node,
                                               source.changelog.read(node),
                                               patchfile, merge=domerge,
                                               log=opts.get('log'),
                                               filter=opts.get('filter'))
                         except TransplantError:
                             # Do not rollback, it is up to the user to
                             # fix the merge or cancel everything
                             tr.close()
+                            dsguard.close()
                             raise
                         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()
+            dsguard.close()
             if pulls:
                 exchange.pull(repo, source.peer(), heads=pulls)
                 merge.update(repo, pulls[-1], False, False, None)
         finally:
             self.saveseries(revmap, merges)
             self.transplants.write()
             if tr:
                 tr.release()
-            lock.release()
+            if lock:
+                lock.release()
+            if dsguard:
+                dsguard.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:
             self.ui.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'))
             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)
             except Exception as 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 TransplantError(_('fix up the merge and run '
                                         'hg transplant --continue'))
         else:
             files = None
         if merge:
             p1, p2 = repo.dirstate.parents()
             repo.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.getcommiteditor())
         if not n:
             self.ui.warn(_('skipping emptied changeset %s\n') % short(node))
             return None
         if not merge:
             self.transplants.set(n, node)
 
         return n
 
     def resume(self, repo, source, opts):
         '''recover last transaction and apply remaining changesets'''
         if os.path.exists(os.path.join(self.path, 'journal')):
             n, node = self.recover(repo, source, opts)
             if n:
                 self.ui.status(_('%s transplanted as %s\n') % (short(node),
                                                                short(n)))
             else:
                 self.ui.status(_('%s skipped due to empty diff\n')
                                % (short(node),))
         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, source, opts):
         '''commit working directory using journal metadata'''
         node, user, date, message, parents = self.readlog()
         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 != parent:
                 raise util.Abort(_('working directory not at transplant '
                                    'parent %s') % revlog.hex(parent))
             if merge:
                 repo.setparents(p1, parents[1])
             modified, added, removed, deleted = repo.status()[:4]
             if merge or modified or added or removed or deleted:
                 n = repo.commit(message, user, date, extra=extra,
                                 editor=self.getcommiteditor())
                 if not n:
                     raise util.Abort(_('commit failed'))
                 if not merge:
                     self.transplants.set(n, node)
             else:
                 n = None
             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'''
     displayer = cmdutil.show_changeset(ui, repo, opts)
     transplants = []
     merges = []
     prompt = _('apply changeset? [ynmpcq?]:'
                '$$ &yes, transplant this changeset'
                '$$ &no, skip this changeset'
                '$$ &merge at this changeset'
                '$$ show &patch'
                '$$ &commit selected changesets'
                '$$ &quit and cancel transplant'
                '$$ &? (show this help)')
     for node in nodes:
         displayer.show(repo[node])
         action = None
         while not action:
             action = 'ynmpcq?'[ui.promptchoice(prompt)]
             if action == '?':
                 for c, t in ui.extractchoices(prompt)[1]:
                     ui.write('%s: %s\n' % (c, t))
                 action = None
             elif action == 'p':
                 parent = repo.changelog.parents(node)[0]
                 for chunk in patch.diff(repo, parent, node):
                     ui.write(chunk)
                 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', '', _('transplant changesets from REPO'), _('REPO')),
     ('b', 'branch', [], _('use this source changeset as head'), _('REV')),
     ('a', 'all', None, _('pull all changesets up to the --branch revisions')),
     ('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 fixing conflicts')),
     ('', '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 with different
     identities.
 
     Consider using the graft command if everything is inside the same
     repository - it will use merges and will usually give a better result.
     Use the rebase extension if the changesets are unpublished and you want
     to move them instead of copying them.
 
     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.
 
     --source/-s specifies another repository to use for selecting changesets,
     just as if it temporarily had been pulled.
     If --branch/-b is specified, these revisions will be used as
     heads when deciding which changesets to transplant, just as if only
     these revisions had been pulled.
     If --all/-a is specified, all the revisions up to the heads specified
     with --branch will be transplanted.
 
     Example:
 
     - transplant all changes up to REV on top of your current revision::
 
         hg transplant --branch REV --all
 
     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, dest, heads, match=util.always):
         '''Yield all nodes that are ancestors of a head but not ancestors
         of dest.
         If no heads are specified, the heads of repo will be used.'''
         if not heads:
             heads = repo.heads()
         ancestors = []
         ctx = repo[dest]
         for head in heads:
             ancestors.append(ctx.ancestor(repo[head]).node())
         for node in repo.changelog.nodesbetween(ancestors, heads)[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 and --merge'))
             return
         if not (opts.get('source') or revs or
                 opts.get('merge') or opts.get('branch')):
             raise util.Abort(_('no source URL, branch revision 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'):
         # deprecated config: transplant.log
         opts['log'] = ui.config('transplant', 'log')
     if not opts.get('filter'):
         # deprecated config: transplant.filter
         opts['filter'] = ui.config('transplant', 'filter')
 
     tp = transplanter(ui, repo, opts)
 
     cmdutil.checkunfinished(repo)
     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:
         peer = hg.peer(repo, opts, ui.expandpath(sourcerepo))
         heads = map(peer.lookup, opts.get('branch', ()))
         target = set(heads)
         for r in revs:
             try:
                 target.add(peer.lookup(r))
             except error.RepoError:
                 pass
         source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer,
                                     onlyheads=sorted(target), force=True)
     else:
         source = repo
         heads = 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 = set(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, heads,
                                                 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 revset.baseset([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
     cmdutil.unfinishedstates.append(
         ['series', True, False, _('transplant in progress'),
          _("use 'hg transplant --continue' or 'hg update' to abort")])
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = [revsettransplanted, kwtransplanted]

tests/test-transplant.t

@@ -1,880 +1,918 b''
 #require killdaemons
 
   $ 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
 (this also tests that editor is not invoked if '--edit' is not specified)
 
   $ HGEDITOR=cat 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 transplanted keyword
 
   $ hg log --template '{rev} {transplanted}\n'
   7 a53251cdf717679d1907b289f991534be05c997a
   6 722f4667af767100cb15b6a79324bf8abbfe1ef4
   5 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21
   4 
   3 
   2 
   1 
   0 
 
 test destination() revset predicate with a transplant of a transplant; new
 clone so subsequent rollback isn't affected
 (this also tests that editor is invoked if '--edit' is specified)
 
   $ hg clone -q . ../destination
   $ cd ../destination
   $ hg up -Cq 0
   $ hg branch -q b4
   $ hg ci -qm "b4"
   $ hg status --rev "7^1" --rev 7
   A b3
   $ cat > $TESTTMP/checkeditform.sh <<EOF
   > env | grep HGEDITFORM
   > true
   > EOF
   $ cat > $TESTTMP/checkeditform-n-cat.sh <<EOF
   > env | grep HGEDITFORM
   > cat \$*
   > EOF
   $ HGEDITOR="sh $TESTTMP/checkeditform-n-cat.sh" hg transplant --edit 7
   applying ffd6818a3975
   HGEDITFORM=transplant.normal
   b3
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'b4'
   HG: added b3
   ffd6818a3975 transplanted to 502236fa76bb
 
 
   $ hg log -r 'destination()'
   changeset:   5:e234d668f844
   parent:      1:d11e3596cc1a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b1
   
   changeset:   6:539f377d78df
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
   changeset:   7:ffd6818a3975
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
   changeset:   9:502236fa76bb
   branch:      b4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
   $ hg log -r 'destination(a53251cdf717)'
   changeset:   7:ffd6818a3975
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
   changeset:   9:502236fa76bb
   branch:      b4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
 
 test subset parameter in reverse order
   $ hg log -r 'reverse(all()) and destination(a53251cdf717)'
   changeset:   9:502236fa76bb
   branch:      b4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
   changeset:   7:ffd6818a3975
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b3
   
 
 back to the original dir
   $ cd ../rebase
 
 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
 
 test same-parent transplant with --log
 
   $ hg clone -r 1 ../t ../sameparent
   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 ../sameparent
   $ hg transplant --log -s ../prune 5
   searching for changes
   applying e234d668f844
   e234d668f844 transplanted to e07aea8ecf9c
   $ hg log --template '{rev} {parents} {desc}\n'
   2  b1
   (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170)
   1  r2
   0  r1
 remote transplant, and also test that transplant doesn't break with
 format-breaking diffopts
 
   $ 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 --config diff.noprefix=True 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/ 37a1297eb21b a53251cdf717
   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
 
 remote transplant without pull
 (It was using "2" and "4" (as the previous transplant used to) which referenced
 revision different from one run to another)
 
   $ hg pull -q http://localhost:$HGPORT/
   $ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76
   skipping already applied revision 2:8d9279348abb
   applying 722f4667af76
   722f4667af76 transplanted to 76e321915884
 
 transplant --continue
 
   $ hg init ../tc
   $ cd ../tc
   $ cat <<EOF > foo
   > foo
   > bar
   > baz
   > EOF
   $ echo toremove > toremove
   $ echo baz > baz
   $ hg ci -Amfoo
   adding baz
   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
   $ cat > baz <<EOF
   > before baz
   > baz
   > after baz
   > EOF
   $ hg ci -Ambar
   adding bar
   $ echo bar2 >> bar
   $ hg ci -mbar2
   $ hg up 0
   3 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 46ae92138f3c
   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 46ae92138f3c
   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]
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
   HGEDITFORM=transplant.normal
   46ae92138f3c transplanted as 9159dada197d
   $ hg transplant 1:3
   skipping already applied revision 1:46ae92138f3c
   applying 9d6d6b5a8275
   9d6d6b5a8275 transplanted to 2d17a10c922f
   applying 1dab759070cf
   1dab759070cf transplanted to e06a69927eb0
   $ hg locate
   added
   bar
   baz
   foo
 
 test multiple revisions and --continue
 
   $ hg up -qC 0
   $ echo bazbaz > baz
   $ hg ci -Am anotherbaz baz
   created new head
   $ hg transplant 1:3
   applying 46ae92138f3c
   46ae92138f3c transplanted to 1024233ea0ba
   applying 9d6d6b5a8275
   patching file baz
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file baz.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ echo fixed > baz
   $ hg transplant --continue
   9d6d6b5a8275 transplanted as d80c49962290
   applying 1dab759070cf
   1dab759070cf transplanted to aa0ffe6bd5ae
 
   $ 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
 
 transplant
 
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant -m 1 -e
   applying 42dc4432fd35
   HGEDITFORM=transplant.merge
   1:42dc4432fd35 merged at a9f4acbac129
   $ hg update -q -C 2
   $ cat > a <<EOF
   > x
   > y
   > z
   > EOF
   $ hg commit -m replace
   $ hg update -q -C 4
   $ hg transplant -m 5
   applying 600a3cdcb41d
   patching file a
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
   HGEDITFORM=transplant.merge
   600a3cdcb41d transplanted as a3f88be652e0
 
   $ 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
 
 test "--merge" causing pull from source repository on local host
 
   $ hg --config extensions.mq= -q strip 2
   $ hg transplant -s ../t --merge tip
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   applying a53251cdf717
   4:a53251cdf717 merged at 4831f4dc831a
 
 test interactive transplant
 
   $ hg --config extensions.strip= -q strip 0
   $ hg -R ../t log -G --template "{rev}:{node|short}"
   @  4:a53251cdf717
   |
   o  3:722f4667af76
   |
   o  2:37a1297eb21b
   |
   | o  1:d11e3596cc1a
   |/
   o  0:17ab29e464c6
   
   $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
   > p
   > y
   > n
   > n
   > m
   > c
   > EOF
   0:17ab29e464c6
   apply changeset? [ynmpcq?]: p
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/r1	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +r1
   apply changeset? [ynmpcq?]: y
   1:d11e3596cc1a
   apply changeset? [ynmpcq?]: n
   2:37a1297eb21b
   apply changeset? [ynmpcq?]: n
   3:722f4667af76
   apply changeset? [ynmpcq?]: m
   4:a53251cdf717
   apply changeset? [ynmpcq?]: c
   $ hg log -G --template "{node|short}"
   @    88be5dde5260
   |\
   | o  722f4667af76
   | |
   | o  37a1297eb21b
   |/
   o  17ab29e464c6
   
   $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
   > x
   > ?
   > y
   > q
   > EOF
   1:d11e3596cc1a
   apply changeset? [ynmpcq?]: x
   unrecognized response
   apply changeset? [ynmpcq?]: ?
   y: yes, transplant this changeset
   n: no, skip this changeset
   m: merge at this changeset
   p: show patch
   c: commit selected changesets
   q: quit and cancel transplant
   ?: ? (show this help)
   apply changeset? [ynmpcq?]: y
   4:a53251cdf717
   apply changeset? [ynmpcq?]: q
   $ hg heads --template "{node|short}\n"
   88be5dde5260
 
   $ cd ..
 
 
 #if unix-permissions system-sh
 
 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]
   $ cd ..
 
 #endif
 
 
 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
   $ cd ..
 
 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
   $ cd ..
 
 test transplanting a patch turning into a no-op
 
   $ hg init binarysource
   $ cd binarysource
   $ echo a > a
   $ hg ci -Am adda a
   >>> file('b', 'wb').write('\0b1')
   $ hg ci -Am addb b
   >>> file('b', 'wb').write('\0b2')
   $ hg ci -m changeb b
   $ cd ..
 
   $ hg clone -r0 binarysource binarydest
   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 binarydest
   $ cp ../binarysource/b b
   $ hg ci -Am addb2 b
   $ hg transplant -s ../binarysource 2
   searching for changes
   applying 7a7d57e15850
   skipping emptied changeset 7a7d57e15850
 
 Test empty result in --continue
 
   $ hg transplant -s ../binarysource 1
   searching for changes
   applying 645035761929
   file b already exists
   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   patch failed to apply
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ hg status
   ? b.rej
   $ hg transplant --continue
   645035761929 skipped due to empty diff
 
   $ cd ..
 
 Explicitly kill daemons to let the test exit on Windows
 
   $ killdaemons.py
 
 Test that patch-ed files are treated as "modified", when transplant is
 aborted by failure of patching, even if none of mode, size and
 timestamp of them isn't changed on the filesystem (see also issue4583)
 
   $ cd t
 
   $ cat > $TESTTMP/abort.py <<EOF
   > # emulate that patch.patch() is aborted at patching on "abort" file
   > from mercurial import extensions, patch as patchmod
   > def patch(orig, ui, repo, patchname,
   >           strip=1, prefix='', files=None,
   >           eolmode='strict', similarity=0):
   >     if files is None:
   >         files = set()
   >     r = orig(ui, repo, patchname,
   >         strip=strip, prefix=prefix, files=files,
   >         eolmode=eolmode, similarity=similarity)
   >     if 'abort' in files:
   >         raise patchmod.PatchError('intentional error while patching')
   >     return r
   > def extsetup(ui):
   >     extensions.wrapfunction(patchmod, 'patch', patch)
   > EOF
 
   $ echo X1 > r1
   $ hg diff --nodates r1
   diff -r a53251cdf717 r1
   --- a/r1
   +++ b/r1
   @@ -1,1 +1,1 @@
   -r1
   +X1
   $ hg commit -m "X1 as r1"
 
   $ echo 'marking to abort patching' > abort
   $ hg add abort
   $ echo Y1 > r1
   $ hg diff --nodates r1
   diff -r 22c515968f13 r1
   --- a/r1
   +++ b/r1
   @@ -1,1 +1,1 @@
   -X1
   +Y1
   $ hg commit -m "Y1 as r1"
 
   $ hg update -q -C d11e3596cc1a
   $ cat r1
   r1
 
   $ cat >> .hg/hgrc <<EOF
   > [fakedirstatewritetime]
   > # emulate invoking dirstate.write() via repo.status() or markcommitted()
   > # at 2000-01-01 00:00
   > fakenow = 200001010000
   > 
   > # emulate invoking patch.internalpatch() at 2000-01-01 00:00
   > [fakepatchtime]
   > fakenow = 200001010000
   > 
   > [extensions]
   > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
   > fakepatchtime = $TESTDIR/fakepatchtime.py
   > abort =  $TESTTMP/abort.py
   > EOF
   $ hg transplant "22c515968f13::"
   applying 22c515968f13
   22c515968f13 transplanted to * (glob)
   applying e38700ba9dd3
   intentional error while patching
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > fakedirstatewritetime = !
   > fakepatchtime = !
+  > [extensions]
   > abort = !
   > EOF
 
   $ cat r1
   Y1
   $ hg debugstate | grep ' r1$'
   n 644          3 unset               r1
   $ hg status -A r1
   M r1
 
+Test that rollback by unexpected failure after transplanting the first
+revision restores dirstate correctly.
+
+  $ hg rollback -q
+  $ rm -f abort
+  $ hg update -q -C d11e3596cc1a
+  $ hg parents -T "{node|short}\n"
+  d11e3596cc1a
+  $ hg status -A
+  C r1
+  C r2
+
+  $ cat >> .hg/hgrc <<EOF
+  > [hooks]
+  > # emulate failure at transplanting the 2nd revision
+  > pretxncommit.abort = test ! -f abort
+  > EOF
+  $ hg transplant "22c515968f13::"
+  applying 22c515968f13
+  22c515968f13 transplanted to * (glob)
+  applying e38700ba9dd3
+  transaction abort!
+  rollback completed
+  abort: pretxncommit.abort hook exited with status 1
+  [255]
+  $ cat >> .hg/hgrc <<EOF
+  > [hooks]
+  > pretxncommit.abort = !
+  > EOF
+
+  $ hg parents -T "{node|short}\n"
+  d11e3596cc1a
+  $ hg status -A
+  M r1
+  ? abort
+  C r2
+
   $ cd ..