comparison mercurial/commands.py @ 837:a95c9b3fc3bf

Fix performance of hg diff.
commands.walk has been refactored.  commands.walk's behaviour remains as
it was, but there is a new function, commands.makewalk.  This returns
results that can be passed along to other internal code, in our case
dodiff.

823:f0446f6963d2

    while a and b and a[-1] == b[-1]:
        a.pop(), b.pop()
    b.reverse()
    return os.sep.join((['..'] * len(a)) + b)

def walk(repo, pats, opts, head = ''):
    cwd = repo.getcwd()
    files, matchfn = matchpats(cwd, pats, opts, head)
    for src, fn in repo.walk(files = files, match = matchfn):
        yield src, fn, pathto(cwd, fn)

revrangesep = ':'

def revrange(ui, repo, revs, revlog=None):
    if revlog is None:

    if hasattr(pat, 'read') and 'r' in mode:
        return pat
    return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
                mode)

def dodiff(fp, ui, repo, files=None, node1=None, node2=None):
    def date(c):
        return time.asctime(time.gmtime(float(c[2].split(' ')[0])))

    (c, a, d, u) = repo.changes(node1, node2, files)
    if files:
        c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))

    if not c and not a and not d:
        return

    if len(revs) > 2:
        raise Abort("too many revisions to diff")

    files = []
    for src, abs, rel in walk(repo, pats, opts):
        files.append(abs)
    dodiff(sys.stdout, ui, repo, files, *revs)

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
    node = repo.lookup(changeset)
    prev, other = repo.changelog.parents(node)
    change = repo.changelog.read(node)

837:a95c9b3fc3bf

    while a and b and a[-1] == b[-1]:
        a.pop(), b.pop()
    b.reverse()
    return os.sep.join((['..'] * len(a)) + b)

def makewalk(repo, pats, opts, head = ''):
    cwd = repo.getcwd()
    files, matchfn = matchpats(cwd, pats, opts, head)
    def walk():
        for src, fn in repo.walk(files = files, match = matchfn):
            yield src, fn, pathto(cwd, fn)
    return files, matchfn, walk()

def walk(repo, pats, opts, head = ''):
    files, matchfn, results = makewalk(repo, pats, opts, head)
    for r in results: yield r

revrangesep = ':'

def revrange(ui, repo, revs, revlog=None):
    if revlog is None:

    if hasattr(pat, 'read') and 'r' in mode:
        return pat
    return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
                mode)

def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always):
    def date(c):
        return time.asctime(time.gmtime(float(c[2].split(' ')[0])))

    (c, a, d, u) = repo.changes(node1, node2, files, match = match)
    if files:
        c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))

    if not c and not a and not d:
        return

    if len(revs) > 2:
        raise Abort("too many revisions to diff")

    files = []
    roots, match, results = makewalk(repo, pats, opts)
    for src, abs, rel in results:
        files.append(abs)
    dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
    node = repo.lookup(changeset)
    prev, other = repo.changelog.parents(node)
    change = repo.changelog.read(node)