comparison hgext/largefiles/overrides.py @ 27344:43c00ca887d1

merge: have merge.update use a matcher instead of partial fn

This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.

27343:c59647c6694d

            fpin.close()
        fp.close()
        err = 0
    return err

def mergeupdate(orig, repo, node, branchmerge, force, partial,
                *args, **kwargs):
    wlock = repo.wlock()
    try:
        # branch |       |         |
        #  merge | force | partial | action
        # -------+-------+---------+--------------

            lfutil.updatestandin(repo, lfutil.standin(lfile))
        lfdirstate.write()

        oldstandins = lfutil.getstandinsstate(repo)

        result = orig(repo, node, branchmerge, force, partial, *args, **kwargs)

        newstandins = lfutil.getstandinsstate(repo)
        filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
        if branchmerge or force or partial:
            filelist.extend(s.deleted + s.removed)

27344:43c00ca887d1

            fpin.close()
        fp.close()
        err = 0
    return err

def mergeupdate(orig, repo, node, branchmerge, force,
                *args, **kwargs):
    matcher = kwargs.get('matcher', None)
    # note if this is a partial update
    partial = matcher and not matcher.always()
    wlock = repo.wlock()
    try:
        # branch |       |         |
        #  merge | force | partial | action
        # -------+-------+---------+--------------

            lfutil.updatestandin(repo, lfutil.standin(lfile))
        lfdirstate.write()

        oldstandins = lfutil.getstandinsstate(repo)

        result = orig(repo, node, branchmerge, force, *args, **kwargs)

        newstandins = lfutil.getstandinsstate(repo)
        filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
        if branchmerge or force or partial:
            filelist.extend(s.deleted + s.removed)