mercurial/merge.py

3217:6d98149d70fe

    os.unlink(b)
    os.unlink(c)
    return r

def checkunknown(repo, m2, status):
    """
    check for collisions between unknown files and files in m2
    """
    modified, added, removed, deleted, unknown = status[:5]
    for f in unknown:
        if f in m2:
            if repo.file(f).cmp(m2[f], repo.wread(f)):
                raise util.Abort(_("'%s' already exists in the working"
                                   " dir and differs from remote") % f)

def workingmanifest(repo, man, status):
    """
    Update manifest to correspond to the working directory
    """

    copied = repo.dirstate.copies()
    modified, added, removed, deleted, unknown = status[:5]
    for i,l in (("a", added), ("m", modified), ("u", unknown)):
        for f in l:
            man[f] = man.get(copied.get(f, f), nullid) + i
            man.set(f, util.is_exec(repo.wjoin(f), man.execf(f)))

    for f in deleted + removed:
        del man[f]

    return man

def forgetremoved(m2, status):
    """
    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.
    """

    modified, added, removed, deleted, unknown = status[:5]
    action = []

    for f in deleted + removed:
        if f not in m2:
            action.append((f, "f"))

    return action

    if not wlock:
        wlock = repo.wlock()

    ### check phase

    pl = repo.parents()
    if not overwrite and len(pl) > 1:
        raise util.Abort(_("outstanding uncommitted merges"))

    p1, p2 = pl[0], repo.changectx(node)
    pa = p1.ancestor(p2)

                               "'hg update' or look at 'hg heads'"))
    elif not (overwrite or branchmerge):
        raise util.Abort(_("update spans branches, use 'hg merge' "
                           "or 'hg update -C' to lose changes"))

    status = repo.status()
    modified, added, removed, deleted, unknown = status[:5]
    if branchmerge and not forcemerge:
        if modified or added or removed:
            raise util.Abort(_("outstanding uncommitted changes"))

    m1 = p1.manifest().copy()
    m2 = p2.manifest().copy()
    ma = pa.manifest()

    # resolve the manifest to determine which files
    # we care about merging

    repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))

    action = []
    copy = {}

    m1 = workingmanifest(repo, m1, status)
    filtermanifest(m1, partial)
    filtermanifest(m2, partial)

    if not force:
        checkunknown(repo, m2, status)
    if not branchmerge:
        action += forgetremoved(m2, status)
    if not (backwards or overwrite):
        copy = findcopies(repo, m1, m2, pa.rev())

    action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards)
    del m1, m2, ma

3218:8d4855fd9d7b

    os.unlink(b)
    os.unlink(c)
    return r

def checkunknown(repo, m2, wctx):
    """
    check for collisions between unknown files and files in m2
    """
    for f in wctx.unknown():
        if f in m2:
            if repo.file(f).cmp(m2[f], repo.wread(f)):
                raise util.Abort(_("'%s' already exists in the working"
                                   " dir and differs from remote") % f)

def forgetremoved(m2, wctx):
    """
    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.
    """

    action = []

    for f in wctx.deleted() + wctx.removed():
        if f not in m2:
            action.append((f, "f"))

    return action

    if not wlock:
        wlock = repo.wlock()

    ### check phase

    wc = repo.workingctx()
    pl = wc.parents()
    if not overwrite and len(pl) > 1:
        raise util.Abort(_("outstanding uncommitted merges"))

    p1, p2 = pl[0], repo.changectx(node)
    pa = p1.ancestor(p2)

                               "'hg update' or look at 'hg heads'"))
    elif not (overwrite or branchmerge):
        raise util.Abort(_("update spans branches, use 'hg merge' "
                           "or 'hg update -C' to lose changes"))

    if branchmerge and not forcemerge:
        if wc.modified() or wc.added() or wc.removed():
            raise util.Abort(_("outstanding uncommitted changes"))

    m1 = wc.manifest().copy()
    m2 = p2.manifest().copy()
    ma = pa.manifest()

    # resolve the manifest to determine which files
    # we care about merging

    repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))

    action = []
    copy = {}

    filtermanifest(m1, partial)
    filtermanifest(m2, partial)

    if not force:
        checkunknown(repo, m2, wc)
    if not branchmerge:
        action += forgetremoved(m2, wc)
    if not (backwards or overwrite):
        copy = findcopies(repo, m1, m2, pa.rev())

    action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards)
    del m1, m2, ma