# merge.py - directory-level update/merge handling for Mercurial

#

# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>

#

# 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 error, 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._dirty = False

        self._read()

    def reset(self, node=None):

        self._state = {}

        if node:

            self._local = node

        shutil.rmtree(self._repo.join("merge"), True)

        self._dirty = False

    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:]

            f.close()

        except IOError, err:

            if err.errno != errno.ENOENT:

                raise

        self._dirty = False

    def commit(self):

        if self._dirty:

            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")

            f.close()

            self._dirty = False

    def add(self, fcl, fco, fca, fd):

        hash = util.sha1(fcl.path()).hexdigest()

        self._repo.opener.write("merge/" + hash, fcl.data())

        self._state[fd] = ['u', hash, fcl.path(), fca.path(),

                           hex(fca.filenode()), fco.path(), fcl.flags()]

        self._dirty = True

    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._dirty = True

    def resolve(self, dfile, wctx, octx):

        if self[dfile] == 'r':

            return 0

        state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]

        fcd = wctx[dfile]

        fco = octx[ofile]

        fca = self._repo.filectx(afile, fileid=anode)

        # "premerge" x flags

        flo = fco.flags()

        fla = fca.flags()

        if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:

            if fca.node() == nullid:

                self._repo.ui.warn(_('warning: cannot merge flags for %s\n') %

                                   afile)

            elif flags == fla:

                flags = flo

        # restore local

        f = self._repo.opener("merge/" + hash)

        self._repo.wwrite(dfile, f.read(), flags)

        f.close()

        r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)

        if r is None:

            # no real conflict

            del self._state[dfile]

        elif not r:

            self.mark(dfile, 'r')

        return r

def _checkunknownfile(repo, wctx, mctx, f):

    return (not repo.dirstate._ignore(f)

        and os.path.isfile(repo.wjoin(f))

        and repo.dirstate.normalize(f) not in repo.dirstate

        and mctx[f].cmp(wctx[f]))

def _checkunknown(repo, wctx, mctx):

    "check for collisions between unknown files and files in mctx"

    error = False

    for f in mctx:

        if f not in wctx and _checkunknownfile(repo, wctx, mctx, f):

            error = True

            wctx._repo.ui.warn(_("%s: untracked file differs\n") % f)

    if error:

        raise util.Abort(_("untracked files in working directory differ "

                           "from files in requested revision"))

def _remains(f, m, ma, workingctx=False):

    """check whether specified file remains after merge.

    It is assumed that specified file is not contained in the manifest

    of the other context.

    """

    if f in ma:

        n = m[f]

        if n != ma[f]:

            return True # because it is changed locally

            # even though it doesn't remain, if "remote deleted" is

            # chosen in manifestmerge()

        elif workingctx and n[20:] == "a":

            return True # because it is added locally (linear merge specific)

        else:

            return False # because it is removed remotely

    else:

        return True # because it is added locally

def _checkcollision(mctx, extractxs):

    "check for case folding collisions in the destination context"

    folded = {}

    for fn in mctx:

        fold = util.normcase(fn)

        if fold in folded:

            raise util.Abort(_("case-folding collision between %s and %s")

                             % (fn, folded[fold]))

        folded[fold] = fn

    if extractxs:

        wctx, actx = extractxs

        # class to delay looking up copy mapping

        class pathcopies(object):

            @util.propertycache

            def map(self):

                # {dst@mctx: src@wctx} copy mapping

                return copies.pathcopies(wctx, mctx)

        pc = pathcopies()

        for fn in wctx:

            fold = util.normcase(fn)

            mfn = folded.get(fold, None)

            if (mfn and mfn != fn and pc.map.get(mfn) != fn and

                _remains(fn, wctx.manifest(), actx.manifest(), True) and

                _remains(mfn, mctx.manifest(), actx.manifest())):

                raise util.Abort(_("case-folding collision between %s and %s")

                                 % (mfn, 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.

    """

    actions = []

    state = branchmerge and 'r' or 'f'

    for f in wctx.deleted():

        if f not in mctx:

    if not branchmerge:

        for f in wctx.removed():

            if f not in mctx:

    return actions

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 act(msg, m, f, *args):

    actions, copy, movewithdir = [], {}, {}

    if overwrite:

        pa = p1

    elif pa == p2: # backwards

        pa = p1.p1()

    elif pa and repo.ui.configbool("merge", "followcopies", True):

        ret = copies.mergecopies(repo, p1, p2, pa)

        copy, movewithdir, diverge, renamedelete = ret

        for of, fl in diverge.iteritems():

            act("divergent renames", "dr", of, fl)

        for of, fl in renamedelete.iteritems():

            act("rename and delete", "rd", of, fl)

    repo.ui.note(_("resolving manifests\n"))

    repo.ui.debug(" overwrite: %s, partial: %s\n"

                  % (bool(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())

    copied.update(movewithdir.values())

    if '.hgsubstate' in m1:

        # check whether sub state is modified

        for s in sorted(p1.substate):

            if p1.sub(s).dirty():

                m1['.hgsubstate'] += "+"

                break

    prompts = []

    # Compare manifests

    visit = m1.iteritems()

    if repo.ui.debugflag:

        visit = sorted(visit)

    for f, n in visit:

        if partial and not partial(f):

            continue

        if f in m2:

            n2 = m2[f]

            fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f)

            nol = 'l' not in fl1 + fl2 + fla

            a = ma.get(f, nullid)

            if n == n2 and fl1 == fl2:

                pass # same - keep local

            elif n2 == a and fl2 == fla:

                pass # remote unchanged - keep local

            elif n == a and fl1 == fla: # local unchanged - use remote

                if n == n2: # optimization: keep local content

                    act("update permissions", "e", f, fl2)

                else:

                    act("remote is newer", "g", f, fl2)

            elif nol and n2 == a: # remote only changed 'x'

                act("update permissions", "e", f, fl2)

            elif nol and n == a: # local only changed 'x'

                act("remote is newer", "g", f, fl1)

            else: # both changed something

                act("versions differ", "m", f, f, f, False)

        elif f in copied: # files we'll deal with on m2 side

            pass

        elif f in movewithdir: # directory rename

            f2 = movewithdir[f]

            act("remote renamed directory to " + f2, "d", f, None, f2,

                m1.flags(f))

        elif f in copy:

            f2 = copy[f]

            act("local copied/moved to " + f2, "m", f, f2, f, False)

        elif f in ma: # clean, a different, no remote

            if n != ma[f]:

                prompts.append((f, "cd")) # prompt changed/deleted

            elif n[20:] == "a": # added, no remote

                act("remote deleted", "f", f)

            else:

                act("other deleted", "r", f)

    visit = m2.iteritems()

    if repo.ui.debugflag:

        visit = sorted(visit)

    for f, n in visit:

        if partial and not partial(f):

            continue

        if f in m1 or f in copied: # files already visited

            continue

        if f in movewithdir:

            f2 = movewithdir[f]

            act("local renamed directory to " + f2, "d", None, f, f2,

                m2.flags(f))

        elif f in copy:

            f2 = copy[f]

            if f2 in m2:

                act("remote copied to " + f, "m",

                    f2, f, f, False)

            else:

                act("remote moved to " + f, "m",

                    f2, f, f, True)

        elif f not in ma:

            if (not overwrite

                and _checkunknownfile(repo, p1, p2, f)):

                act("remote differs from untracked local",

                    "m", f, f, f, False)

            else:

                act("remote created", "g", f, m2.flags(f))

        elif n != ma[f]:

            prompts.append((f, "dc")) # prompt deleted/changed

    for f, m in sorted(prompts):

        if m == "cd":

            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 m == "dc":

            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))

        else: assert False, m

    return actions

def actionkey(a):

    return a[1] == "r" and -1 or 0, a

def applyupdates(repo, actions, wctx, mctx, actx, overwrite):

    """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

    Return a tuple of counts (updated, merged, removed, unresolved) that

    describes how many files were affected by the update.

    """

    updated, merged, removed, unresolved = 0, 0, 0, 0

    ms = mergestate(repo)

    ms.reset(wctx.p1().node())

    moves = []

    actions.sort(key=actionkey)

    # prescan for merges

    for a in actions:

        if m == "m": # merge

            f2, fd, move = args

            if fd == '.hgsubstate': # merged internally

                continue