comparison mercurial/copies.py @ 24185:3a3806fe3ddf

copies: replace _nonoverlap() by calls to manifestdict.filesnotin()

Now that we have manifestdict.filesnotin(), we can write _nonoverlap()
in terms of that method instead, enabling future speedups when
filesnotin() gets optimized, and perhaps making the code a little
clearer at the same time.

24184:cd66080ef6d4

# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

import util
import heapq

def _nonoverlap(d1, d2, d3):
    "Return list of elements in d1 not in d2 or d3"
    return sorted([d for d in d1 if d not in d3 and d not in d2])

def _dirname(f):
    s = f.rfind("/")
    if s == -1:
        return ""

def _computenonoverlap(repo, m1, m2, ma):
    """Computes the files exclusive to m1 and m2.
    This is its own function so extensions can easily wrap this call to see what
    files mergecopies is about to process.
    """
    u1 = _nonoverlap(m1, m2, ma)
    u2 = _nonoverlap(m2, m1, ma)

    if u1:
        repo.ui.debug("  unmatched files in local:\n   %s\n"
                      % "\n   ".join(u1))
    if u2:

24185:3a3806fe3ddf

# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

import util
import heapq

def _dirname(f):
    s = f.rfind("/")
    if s == -1:
        return ""

def _computenonoverlap(repo, m1, m2, ma):
    """Computes the files exclusive to m1 and m2.
    This is its own function so extensions can easily wrap this call to see what
    files mergecopies is about to process.
    """
    addedinm1 = m1.filesnotin(ma)
    addedinm2 = m2.filesnotin(ma)
    u1 = sorted(addedinm1 - addedinm2)
    u2 = sorted(addedinm2 - addedinm1)

    if u1:
        repo.ui.debug("  unmatched files in local:\n   %s\n"
                      % "\n   ".join(u1))
    if u2: