merge with stable

mercurial/filemerge.py

@@ -1,259 +1,256 b''
 # filemerge.py - file-level merge handling for Mercurial
 #
 # Copyright 2006, 2007, 2008 Matt Mackall <[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.
 
 from node import short
 from i18n import _
 import util, simplemerge, match, error
 import os, tempfile, re, filecmp
 
 def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)
 
 def _toolbool(ui, tool, part, default=False):
     return ui.configbool("merge-tools", tool + "." + part, default)
 
 def _toollist(ui, tool, part, default=[]):
     return ui.configlist("merge-tools", tool + "." + part, default)
 
 _internal = ['internal:' + s
              for s in 'fail local other merge prompt dump'.split()]
 
 def _findtool(ui, tool):
     if tool in _internal:
         return tool
     k = _toolstr(ui, tool, "regkey")
     if k:
         p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
         if p:
             p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
             if p:
                 return p
     return util.find_exe(_toolstr(ui, tool, "executable", tool))
 
 def _picktool(repo, ui, path, binary, symlink):
     def check(tool, pat, symlink, binary):
         tmsg = tool
         if pat:
             tmsg += " specified for " + pat
         if not _findtool(ui, tool):
             if pat: # explicitly requested tool deserves a warning
                 ui.warn(_("couldn't find merge tool %s\n") % tmsg)
             else: # configured but non-existing tools are more silent
                 ui.note(_("couldn't find merge tool %s\n") % tmsg)
         elif symlink and not _toolbool(ui, tool, "symlink"):
             ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
         elif binary and not _toolbool(ui, tool, "binary"):
             ui.warn(_("tool %s can't handle binary\n") % tmsg)
         elif not util.gui() and _toolbool(ui, tool, "gui"):
             ui.warn(_("tool %s requires a GUI\n") % tmsg)
         else:
             return True
         return False
 
     # HGMERGE takes precedence
     hgmerge = os.environ.get("HGMERGE")
     if hgmerge:
         return (hgmerge, hgmerge)
 
     # then patterns
     for pat, tool in ui.configitems("merge-patterns"):
         mf = match.match(repo.root, '', [pat])
         if mf(path) and check(tool, pat, symlink, False):
             toolpath = _findtool(ui, tool)
             return (tool, '"' + toolpath + '"')
 
     # then merge tools
     tools = {}
     for k, v in ui.configitems("merge-tools"):
         t = k.split('.')[0]
         if t not in tools:
             tools[t] = int(_toolstr(ui, t, "priority", "0"))
     names = tools.keys()
     tools = sorted([(-p, t) for t, p in tools.items()])
     uimerge = ui.config("ui", "merge")
     if uimerge:
         if uimerge not in names:
             return (uimerge, uimerge)
         tools.insert(0, (None, uimerge)) # highest priority
     tools.append((None, "hgmerge")) # the old default, if found
     for p, t in tools:
         if check(t, None, symlink, binary):
             toolpath = _findtool(ui, t)
             return (t, '"' + toolpath + '"')
     # internal merge as last resort
     return (not (symlink or binary) and "internal:merge" or None, None)
 
 def _eoltype(data):
     "Guess the EOL type of a file"
     if '\0' in data: # binary
         return None
     if '\r\n' in data: # Windows
         return '\r\n'
     if '\r' in data: # Old Mac
         return '\r'
     if '\n' in data: # UNIX
         return '\n'
     return None # unknown
 
 def _matcheol(file, origfile):
     "Convert EOL markers in a file to match origfile"
     tostyle = _eoltype(open(origfile, "rb").read())
     if tostyle:
         data = open(file, "rb").read()
         style = _eoltype(data)
         if style:
             newdata = data.replace(style, tostyle)
             if newdata != data:
                 open(file, "wb").write(newdata)
 
 def filemerge(repo, mynode, orig, fcd, fco, fca):
     """perform a 3-way merge in the working directory
 
     mynode = parent node before merge
     orig = original local filename before merge
     fco = other file context
     fca = ancestor file context
     fcd = local file context for current/destination file
     """
 
     def temp(prefix, ctx):
         pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre)
         data = repo.wwritedata(ctx.path(), ctx.data())
         f = os.fdopen(fd, "wb")
         f.write(data)
         f.close()
         return name
 
     def isbin(ctx):
         try:
             return util.binary(ctx.data())
         except IOError:
             return False
 
     if not fco.cmp(fcd): # files identical?
         return None
 
-    if fca == fco: # backwards, use working dir parent as ancestor
-        fca = fcd.parents()[0]
-
     ui = repo.ui
     fd = fcd.path()
     binary = isbin(fcd) or isbin(fco) or isbin(fca)
     symlink = 'l' in fcd.flags() + fco.flags()
     tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
     ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
                (tool, fd, binary, symlink))
 
     if not tool or tool == 'internal:prompt':
         tool = "internal:local"
         if ui.promptchoice(_(" no tool found to merge %s\n"
                              "keep (l)ocal or take (o)ther?") % fd,
                            (_("&Local"), _("&Other")), 0):
             tool = "internal:other"
     if tool == "internal:local":
         return 0
     if tool == "internal:other":
         repo.wwrite(fd, fco.data(), fco.flags())
         return 0
     if tool == "internal:fail":
         return 1
 
     # do the actual merge
     a = repo.wjoin(fd)
     b = temp("base", fca)
     c = temp("other", fco)
     out = ""
     back = a + ".orig"
     util.copyfile(a, back)
 
     if orig != fco.path():
         ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
     else:
         ui.status(_("merging %s\n") % fd)
 
     ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
 
     # do we attempt to simplemerge first?
     try:
         premerge = _toolbool(ui, tool, "premerge", not (binary or symlink))
     except error.ConfigError:
         premerge = _toolstr(ui, tool, "premerge").lower()
         valid = 'keep'.split()
         if premerge not in valid:
             _valid = ', '.join(["'" + v + "'" for v in valid])
             raise error.ConfigError(_("%s.premerge not valid "
                                       "('%s' is neither boolean nor %s)") %
                                     (tool, premerge, _valid))
 
     if premerge:
         r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
         if not r:
             ui.debug(" premerge successful\n")
             os.unlink(back)
             os.unlink(b)
             os.unlink(c)
             return 0
         if premerge != 'keep':
             util.copyfile(back, a) # restore from backup and try again
 
     env = dict(HG_FILE=fd,
                HG_MY_NODE=short(mynode),
                HG_OTHER_NODE=str(fco.changectx()),
                HG_BASE_NODE=str(fca.changectx()),
                HG_MY_ISLINK='l' in fcd.flags(),
                HG_OTHER_ISLINK='l' in fco.flags(),
                HG_BASE_ISLINK='l' in fca.flags())
 
     if tool == "internal:merge":
         r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other'])
     elif tool == 'internal:dump':
         a = repo.wjoin(fd)
         util.copyfile(a, a + ".local")
         repo.wwrite(fd + ".other", fco.data(), fco.flags())
         repo.wwrite(fd + ".base", fca.data(), fca.flags())
         return 1 # unresolved
     else:
         args = _toolstr(ui, tool, "args", '$local $base $other')
         if "$output" in args:
             out, a = a, back # read input from backup, write to original
         replace = dict(local=a, base=b, other=c, output=out)
         args = util.interpolate(r'\$', replace, args,
                                 lambda s: '"%s"' % util.localpath(s))
         r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env)
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
                   'conflicts' in _toollist(ui, tool, "check")):
         if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()):
             r = 1
 
     checked = False
     if 'prompt' in _toollist(ui, tool, "check"):
         checked = True
         if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd,
                            (_("&Yes"), _("&No")), 1):
             r = 1
 
     if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
                                   'changed' in _toollist(ui, tool, "check")):
         if filecmp.cmp(repo.wjoin(fd), back):
             if ui.promptchoice(_(" output file %s appears unchanged\n"
                                  "was merge successful (yn)?") % fd,
                                (_("&Yes"), _("&No")), 1):
                 r = 1
 
     if _toolbool(ui, tool, "fixeol"):
         _matcheol(repo.wjoin(fd), back)
 
     if r:
         ui.warn(_("merging %s failed!\n") % fd)
     else:
         os.unlink(back)
 
     os.unlink(b)
     os.unlink(c)
     return r

mercurial/merge.py

@@ -1,528 +1,533 b''
 # merge.py - directory-level update/merge handling for Mercurial
 #
 # Copyright 2006, 2007 Matt Mackall <[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.
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
 import util, filemerge, copies, subrepo
 import errno, os, shutil
 
 class mergestate(object):
     '''track 3-way merge state of individual files'''
     def __init__(self, repo):
         self._repo = repo
         self._read()
     def reset(self, node=None):
         self._state = {}
         if node:
             self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def _read(self):
         self._state = {}
         try:
             f = self._repo.opener("merge/state")
             for i, l in enumerate(f):
                 if i == 0:
                     self._local = bin(l[:-1])
                 else:
                     bits = l[:-1].split("\0")
                     self._state[bits[0]] = bits[1:]
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
     def _write(self):
         f = self._repo.opener("merge/state", "w")
         f.write(hex(self._local) + "\n")
         for d, v in self._state.iteritems():
             f.write("\0".join([d] + v) + "\n")
     def add(self, fcl, fco, fca, fd, flags):
         hash = util.sha1(fcl.path()).hexdigest()
         self._repo.opener("merge/" + hash, "w").write(fcl.data())
         self._state[fd] = ['u', hash, fcl.path(), fca.path(),
                            hex(fca.filenode()), fco.path(), flags]
         self._write()
     def __contains__(self, dfile):
         return dfile in self._state
     def __getitem__(self, dfile):
         return self._state[dfile][0]
     def __iter__(self):
         l = self._state.keys()
         l.sort()
         for f in l:
             yield f
     def mark(self, dfile, state):
         self._state[dfile][0] = state
         self._write()
     def resolve(self, dfile, wctx, octx):
         if self[dfile] == 'r':
             return 0
         state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]
         f = self._repo.opener("merge/" + hash)
         self._repo.wwrite(dfile, f.read(), flags)
         fcd = wctx[dfile]
         fco = octx[ofile]
         fca = self._repo.filectx(afile, fileid=anode)
         r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
         if not r:
             self.mark(dfile, 'r')
         return r
 
 def _checkunknown(wctx, mctx):
     "check for collisions between unknown files and files in mctx"
     for f in wctx.unknown():
         if f in mctx and mctx[f].cmp(wctx[f]):
             raise util.Abort(_("untracked file in working directory differs"
                                " from file in requested revision: '%s'") % f)
 
 def _checkcollision(mctx):
     "check for case folding collisions in the destination context"
     folded = {}
     for fn in mctx:
         fold = fn.lower()
         if fold in folded:
             raise util.Abort(_("case-folding collision between %s and %s")
                              % (fn, folded[fold]))
         folded[fold] = fn
 
 def _forgetremoved(wctx, mctx, branchmerge):
     """
     Forget removed files
 
     If we're jumping between revisions (as opposed to merging), and if
     neither the working directory nor the target rev has the file,
     then we need to remove it from the dirstate, to prevent the
     dirstate from listing the file when it is no longer in the
     manifest.
 
     If we're merging, and the other revision has removed a file
     that is not present in the working directory, we need to mark it
     as removed.
     """
 
     action = []
     state = branchmerge and 'r' or 'f'
     for f in wctx.deleted():
         if f not in mctx:
             action.append((f, state))
 
     if not branchmerge:
         for f in wctx.removed():
             if f not in mctx:
                 action.append((f, "f"))
 
     return action
 
 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
     """
     Merge p1 and p2 with ancestor pa and generate merge action list
 
     overwrite = whether we clobber working files
     partial = function to filter file lists
     """
 
     def fmerge(f, f2, fa):
         """merge flags"""
         a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2)
         if m == n: # flags agree
             return m # unchanged
         if m and n and not a: # flags set, don't agree, differ from parent
             r = repo.ui.promptchoice(
                 _(" conflicting flags for %s\n"
                   "(n)one, e(x)ec or sym(l)ink?") % f,
                 (_("&None"), _("E&xec"), _("Sym&link")), 0)
             if r == 1:
                 return "x" # Exec
             if r == 2:
                 return "l" # Symlink
             return ""
         if m and m != a: # changed from a to m
             return m
         if n and n != a: # changed from a to n
             return n
         return '' # flag was cleared
 
     def act(msg, m, f, *args):
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
     action, copy = [], {}
 
     if overwrite:
         pa = p1
     elif pa == p2: # backwards
         pa = p1.p1()
     elif pa and repo.ui.configbool("merge", "followcopies", True):
         dirs = repo.ui.configbool("merge", "followdirs", True)
         copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)
 
     repo.ui.note(_("resolving manifests\n"))
     repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial)))
     repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2))
 
     m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
     copied = set(copy.values())
 
     if '.hgsubstate' in m1:
         # check whether sub state is modified
         for s in p1.substate:
             if p1.sub(s).dirty():
                 m1['.hgsubstate'] += "+"
                 break
 
     # Compare manifests
     for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
             rflags = fmerge(f, f, f)
             a = ma.get(f, nullid)
             if n == m2[f] or m2[f] == a: # same or local newer
                 # is file locally modified or flags need changing?
                 # dirstate flags may need to be made current
                 if m1.flags(f) != rflags or n[20:]:
                     act("update permissions", "e", f, rflags)
             elif n == a: # remote newer
                 act("remote is newer", "g", f, rflags)
             else: # both changed
                 act("versions differ", "m", f, f, f, rflags, False)
         elif f in copied: # files we'll deal with on m2 side
             pass
         elif f in copy:
             f2 = copy[f]
             if f2 not in m2: # directory rename
                 act("remote renamed directory to " + f2, "d",
                     f, None, f2, m1.flags(f))
             else: # case 2 A,B/B/B or case 4,21 A/B/B
                 act("local copied/moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma: # clean, a different, no remote
             if n != ma[f]:
                 if repo.ui.promptchoice(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,
                     (_("&Changed"), _("&Delete")), 0):
                     act("prompt delete", "r", f)
                 else:
                     act("prompt keep", "a", f)
             elif n[20:] == "a": # added, no remote
                 act("remote deleted", "f", f)
             elif n[20:] != "u":
                 act("other deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1 or f in copied: # files already visited
             continue
         if f in copy:
             f2 = copy[f]
             if f2 not in m1: # directory rename
                 act("local renamed directory to " + f2, "d",
                     None, f, f2, m2.flags(f))
             elif f2 in m2: # rename case 1, A/A,B/A
                 act("remote copied to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), False)
             else: # case 3,20 A/B/A
                 act("remote moved to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), True)
         elif f not in ma:
             act("remote created", "g", f, m2.flags(f))
         elif n != ma[f]:
             if repo.ui.promptchoice(
                 _("remote changed %s which local deleted\n"
                   "use (c)hanged version or leave (d)eleted?") % f,
                 (_("&Changed"), _("&Deleted")), 0) == 0:
                 act("prompt recreating", "g", f, m2.flags(f))
 
     return action
 
 def actionkey(a):
     return a[1] == 'r' and -1 or 0, a
 
 def applyupdates(repo, action, wctx, mctx, actx):
     """apply the merge action list to the working directory
 
     wctx is the working copy context
     mctx is the context to be merged into the working copy
     actx is the context of the common ancestor
     """
 
     updated, merged, removed, unresolved = 0, 0, 0, 0
     ms = mergestate(repo)
     ms.reset(wctx.parents()[0].node())
     moves = []
     action.sort(key=actionkey)
     substate = wctx.substate # prime
 
     # prescan for merges
     u = repo.ui
     for a in action:
         f, m = a[:2]
         if m == 'm': # merge
             f2, fd, flags, move = a[2:]
             if f == '.hgsubstate': # merged internally
                 continue
             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
             fcl = wctx[f]
             fco = mctx[f2]
-            fca = fcl.ancestor(fco, actx) or repo.filectx(f, fileid=nullrev)
+            if mctx == actx: # backwards, use working dir parent as ancestor
+                fca = fcl.parents()[0]
+            else:
+                fca = fcl.ancestor(fco, actx)
+            if not fca:
+                fca = repo.filectx(f, fileid=nullrev)
             ms.add(fcl, fco, fca, fd, flags)
             if f != fd and move:
                 moves.append(f)
 
     # remove renamed files after safely stored
     for f in moves:
         if util.lexists(repo.wjoin(f)):
             repo.ui.debug("removing %s\n" % f)
             os.unlink(repo.wjoin(f))
 
     audit_path = util.path_auditor(repo.root)
 
     numupdates = len(action)
     for i, a in enumerate(action):
         f, m = a[:2]
         u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files')
         if f and f[0] == "/":
             continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             audit_path(f)
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)
             try:
                 util.unlink(repo.wjoin(f))
             except OSError, inst:
                 if inst.errno != errno.ENOENT:
                     repo.ui.warn(_("update failed to remove %s: %s!\n") %
                                  (f, inst.strerror))
             removed += 1
         elif m == "m": # merge
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx))
                 continue
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
             if r is not None and r > 0:
                 unresolved += 1
             else:
                 if r is None:
                     updated += 1
                 else:
                     merged += 1
             util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
             if f != fd and move and util.lexists(repo.wjoin(f)):
                 repo.ui.debug("removing %s\n" % f)
                 os.unlink(repo.wjoin(f))
         elif m == "g": # get
             flags = a[2]
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t, flags)
             t = None
             updated += 1
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)
         elif m == "d": # directory rename
             f2, fd, flags = a[2:]
             if f:
                 repo.ui.note(_("moving %s to %s\n") % (f, fd))
                 t = wctx.filectx(f).data()
                 repo.wwrite(fd, t, flags)
                 util.unlink(repo.wjoin(f))
             if f2:
                 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
                 t = mctx.filectx(f2).data()
                 repo.wwrite(fd, t, flags)
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
             repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
             util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
     u.progress(_('updating'), None, total=numupdates, unit='files')
 
     return updated, merged, removed, unresolved
 
 def recordupdates(repo, action, branchmerge):
     "record merge actions to the dirstate"
 
     for a in action:
         f, m = a[:2]
         if m == "r": # remove
             if branchmerge:
                 repo.dirstate.remove(f)
             else:
                 repo.dirstate.forget(f)
         elif m == "a": # re-add
             if not branchmerge:
                 repo.dirstate.add(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
             repo.dirstate.normallookup(f)
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.otherparent(f)
             else:
                 repo.dirstate.normal(f)
         elif m == "m": # merge
             f2, fd, flag, move = a[2:]
             if branchmerge:
                 # We've done a branch merge, mark this file as merged
                 # so that we properly record the merger later
                 repo.dirstate.merge(fd)
                 if f != f2: # copy/rename
                     if move:
                         repo.dirstate.remove(f)
                     if f != fd:
                         repo.dirstate.copy(f, fd)
                     else:
                         repo.dirstate.copy(f2, fd)
             else:
                 # We've update-merged a locally modified file, so
                 # we set the dirstate to emulate a normal checkout
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
                 if f2 == fd: # file not locally copied/moved
                     repo.dirstate.normallookup(fd)
                 if move:
                     repo.dirstate.forget(f)
         elif m == "d": # directory rename
             f2, fd, flag = a[2:]
             if not f2 and f not in repo.dirstate:
                 # untracked file moved
                 continue
             if branchmerge:
                 repo.dirstate.add(fd)
                 if f:
                     repo.dirstate.remove(f)
                     repo.dirstate.copy(f, fd)
                 if f2:
                     repo.dirstate.copy(f2, fd)
             else:
                 repo.dirstate.normal(fd)
                 if f:
                     repo.dirstate.forget(f)
 
 def update(repo, node, branchmerge, force, partial):
     """
     Perform a merge between the working directory and the given node
 
     node = the node to update to, or None if unspecified
     branchmerge = whether to merge between branches
     force = whether to force branch merging or file overwriting
     partial = a function to filter file lists (dirstate not updated)
 
     The table below shows all the behaviors of the update command
     given the -c and -C or no options, whether the working directory
     is dirty, whether a revision is specified, and the relationship of
     the parent rev to the target rev (linear, on the same named
     branch, or on another named branch).
 
     This logic is tested by test-update-branches.
 
     -c  -C  dirty  rev  |  linear   same  cross
      n   n    n     n   |    ok     (1)     x
      n   n    n     y   |    ok     ok     ok
      n   n    y     *   |   merge   (2)    (2)
      n   y    *     *   |    ---  discard  ---
      y   n    y     *   |    ---    (3)    ---
      y   n    n     *   |    ---    ok     ---
      y   y    *     *   |    ---    (4)    ---
 
     x = can't happen
     * = don't-care
     1 = abort: crosses branches (use 'hg merge' or 'hg update -c')
     2 = abort: crosses branches (use 'hg merge' to merge or
                  use 'hg update -C' to discard changes)
     3 = abort: uncommitted local changes
     4 = incompatible options (checked in commands.py)
     """
 
     onode = node
     wlock = repo.wlock()
     try:
         wc = repo[None]
         if node is None:
             # tip of current branch
             try:
                 node = repo.branchtags()[wc.branch()]
             except KeyError:
                 if wc.branch() == "default": # no default branch!
                     node = repo.lookup("tip") # update to tip
                 else:
                     raise util.Abort(_("branch %s not found") % wc.branch())
         overwrite = force and not branchmerge
         pl = wc.parents()
         p1, p2 = pl[0], repo[node]
         pa = p1.ancestor(p2)
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
         fastforward = False
 
         ### check phase
         if not overwrite and len(pl) > 1:
             raise util.Abort(_("outstanding uncommitted merges"))
         if branchmerge:
             if pa == p2:
                 raise util.Abort(_("merging with a working directory ancestor"
                                    " has no effect"))
             elif pa == p1:
                 if p1.branch() != p2.branch():
                     fastforward = True
                 else:
                     raise util.Abort(_("nothing to merge (use 'hg update'"
                                        " or check 'hg heads')"))
             if not force and (wc.files() or wc.deleted()):
                 raise util.Abort(_("outstanding uncommitted changes "
                                    "(use 'hg status' to list changes)"))
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good
             elif wc.files() or wc.deleted():
                 raise util.Abort(_("crosses branches (use 'hg merge' to merge "
                                  "or use 'hg update -C' to discard changes)"))
             elif onode is None:
                 raise util.Abort(_("crosses branches (use 'hg merge' or use "
                                    "'hg update -c')"))
             else:
                 # Allow jumping branches if clean and specific rev given
                 overwrite = True
 
         ### calculate phase
         action = []
         wc.status(unknown=True) # prime cache
         if not force:
             _checkunknown(wc, p2)
         if not util.checkcase(repo.path):
             _checkcollision(p2)
         action += _forgetremoved(wc, p2, branchmerge)
         action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
 
         ### apply phase
         if not branchmerge: # just jump to the new rev
             fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
         if not partial:
             repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
 
         stats = applyupdates(repo, action, wc, p2, pa)
 
         if not partial:
             repo.dirstate.setparents(fp1, fp2)
             recordupdates(repo, action, branchmerge)
             if not branchmerge and not fastforward:
                 repo.dirstate.setbranch(p2.branch())
     finally:
         wlock.release()
 
     if not partial:
         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
     return stats

tests/test-bisect.out

@@ -1,321 +1,321 b''
 % init
 % committing changes
 adding a
 % committed changeset 0
 % committed changeset 1
 % committed changeset 2
 % committed changeset 3
 % committed changeset 4
 % committed changeset 5
 % committed changeset 6
 % committed changeset 7
 % committed changeset 8
 % committed changeset 9
 % committed changeset 10
 % committed changeset 11
 % committed changeset 12
 % committed changeset 13
 % committed changeset 14
 % committed changeset 15
 % committed changeset 16
 % committed changeset 17
 % committed changeset 18
 % committed changeset 19
 % committed changeset 20
 % committed changeset 21
 % committed changeset 22
 % committed changeset 23
 % committed changeset 24
 % committed changeset 25
 % committed changeset 26
 % committed changeset 27
 % committed changeset 28
 % committed changeset 29
 % committed changeset 30
 % committed changeset 31
 % log
 changeset:   31:58c80a7c8a40
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:31 1970 +0000
 summary:     msg 31
 
 changeset:   30:ed2d2f24b11c
 user:        test
 date:        Thu Jan 01 00:00:30 1970 +0000
 summary:     msg 30
 
 changeset:   29:b5bd63375ab9
 user:        test
 date:        Thu Jan 01 00:00:29 1970 +0000
 summary:     msg 29
 
 changeset:   28:8e0c2264c8af
 user:        test
 date:        Thu Jan 01 00:00:28 1970 +0000
 summary:     msg 28
 
 changeset:   27:288867a866e9
 user:        test
 date:        Thu Jan 01 00:00:27 1970 +0000
 summary:     msg 27
 
 changeset:   26:3efc6fd51aeb
 user:        test
 date:        Thu Jan 01 00:00:26 1970 +0000
 summary:     msg 26
 
 changeset:   25:02a84173a97a
 user:        test
 date:        Thu Jan 01 00:00:25 1970 +0000
 summary:     msg 25
 
 changeset:   24:10e0acd3809e
 user:        test
 date:        Thu Jan 01 00:00:24 1970 +0000
 summary:     msg 24
 
 changeset:   23:5ec79163bff4
 user:        test
 date:        Thu Jan 01 00:00:23 1970 +0000
 summary:     msg 23
 
 changeset:   22:06c7993750ce
 user:        test
 date:        Thu Jan 01 00:00:22 1970 +0000
 summary:     msg 22
 
 changeset:   21:e5db6aa3fe2a
 user:        test
 date:        Thu Jan 01 00:00:21 1970 +0000
 summary:     msg 21
 
 changeset:   20:7128fb4fdbc9
 user:        test
 date:        Thu Jan 01 00:00:20 1970 +0000
 summary:     msg 20
 
 changeset:   19:52798545b482
 user:        test
 date:        Thu Jan 01 00:00:19 1970 +0000
 summary:     msg 19
 
 changeset:   18:86977a90077e
 user:        test
 date:        Thu Jan 01 00:00:18 1970 +0000
 summary:     msg 18
 
 changeset:   17:03515f4a9080
 user:        test
 date:        Thu Jan 01 00:00:17 1970 +0000
 summary:     msg 17
 
 changeset:   16:a2e6ea4973e9
 user:        test
 date:        Thu Jan 01 00:00:16 1970 +0000
 summary:     msg 16
 
 changeset:   15:e7fa0811edb0
 user:        test
 date:        Thu Jan 01 00:00:15 1970 +0000
 summary:     msg 15
 
 changeset:   14:ce8f0998e922
 user:        test
 date:        Thu Jan 01 00:00:14 1970 +0000
 summary:     msg 14
 
 changeset:   13:9d7d07bc967c
 user:        test
 date:        Thu Jan 01 00:00:13 1970 +0000
 summary:     msg 13
 
 changeset:   12:1941b52820a5
 user:        test
 date:        Thu Jan 01 00:00:12 1970 +0000
 summary:     msg 12
 
 changeset:   11:7b4cd9578619
 user:        test
 date:        Thu Jan 01 00:00:11 1970 +0000
 summary:     msg 11
 
 changeset:   10:7c5eff49a6b6
 user:        test
 date:        Thu Jan 01 00:00:10 1970 +0000
 summary:     msg 10
 
 changeset:   9:eb44510ef29a
 user:        test
 date:        Thu Jan 01 00:00:09 1970 +0000
 summary:     msg 9
 
 changeset:   8:453eb4dba229
 user:        test
 date:        Thu Jan 01 00:00:08 1970 +0000
 summary:     msg 8
 
 changeset:   7:03750880c6b5
 user:        test
 date:        Thu Jan 01 00:00:07 1970 +0000
 summary:     msg 7
 
 changeset:   6:a3d5c6fdf0d3
 user:        test
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     msg 6
 
 changeset:   5:7874a09ea728
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     msg 5
 
 changeset:   4:9b2ba8336a65
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     msg 4
 
 changeset:   3:b53bea5e2fcb
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     msg 3
 
 changeset:   2:db07c04beaca
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     msg 2
 
 changeset:   1:5cd978ea5149
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     msg 1
 
 changeset:   0:b99c7b9c8e11
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     msg 0
 
 % hg up -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % bisect test
 Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 skip
 Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 The first bad revision is:
 changeset:   29:b5bd63375ab9
 user:        test
 date:        Thu Jan 01 00:00:29 1970 +0000
 summary:     msg 29
 
 % bisect reverse test
 Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 skip
 Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 The first good revision is:
 changeset:   1:5cd978ea5149
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     msg 1
 
-abort: Inconsistent state, 31:58c80a7c8a40 is good and bad
+abort: starting revisions are not directly related
 error
 Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
 5cd978ea5149
 % reproduce AssertionError, issue1228 and issue1182
 Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Due to skipped revisions, the first bad revision could be any of:
 changeset:   1:5cd978ea5149
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     msg 1
 
 changeset:   2:db07c04beaca
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     msg 2
 
 changeset:   3:b53bea5e2fcb
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     msg 3
 
 changeset:   4:9b2ba8336a65
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     msg 4
 
 % reproduce non converging bisect, issue1182
 Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Due to skipped revisions, the first bad revision could be any of:
 changeset:   1:5cd978ea5149
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     msg 1
 
 changeset:   2:db07c04beaca
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     msg 2
 
 % test no action
 abort: cannot bisect (no known good revisions)
 failure
 % reproduce AssertionError, issue1445
 Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 The first bad revision is:
 changeset:   6:a3d5c6fdf0d3
 user:        test
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     msg 6
 
 % test invalid command
 abort: failed to execute exit 127
 % test bisecting command
 Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Changeset 15:e7fa0811edb0: good
 Changeset 7:03750880c6b5: good
 Changeset 3:b53bea5e2fcb: bad
 Changeset 5:7874a09ea728: bad
 Changeset 6:a3d5c6fdf0d3: good
 The first good revision is:
 changeset:   6:a3d5c6fdf0d3
 user:        test
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     msg 6