comparison mercurial/commands.py @ 3645:b984dcb1df71

Refactor log ui buffering and patch display

3644:b7547efe78fb

        for n in o:
            parents = [p for p in other.changelog.parents(n) if p != nullid]
            if opts['no_merges'] and len(parents) == 2:
                continue
            displayer.show(changenode=n)
            if opts['patch']:
                prev = (parents and parents[0]) or nullid
                patch.diff(other, prev, n, fp=repo.ui)
                ui.write("\n")
    finally:
        if hasattr(other, 'close'):
            other.close()
        if cleanup:
            os.unlink(cleanup)

    By default this command outputs: changeset id and hash, tags,
    non-trivial parents, user, date and time, and a summary for each
    commit. When the -v/--verbose switch is used, the list of changed
    files and full commit message is shown.
    """
    class dui(object):
        # Implement and delegate some ui protocol.  Save hunks of
        # output for later display in the desired order.
        def __init__(self, ui):
            self.ui = ui
            self.hunk = {}
            self.header = {}
            self.quiet = ui.quiet
            self.verbose = ui.verbose
            self.debugflag = ui.debugflag
        def bump(self, rev):
            self.rev = rev
            self.hunk[rev] = []
            self.header[rev] = []
        def note(self, *args):
            if self.verbose:
                self.write(*args)
        def status(self, *args):
            if not self.quiet:
                self.write(*args)
        def write(self, *args):
            self.hunk[self.rev].extend(args)
        def write_header(self, *args):
            self.header[self.rev].extend(args)
        def debug(self, *args):
            if self.debugflag:
                self.write(*args)
        def __getattr__(self, key):
            return getattr(self.ui, key)

    getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
    changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)

    if opts['branches']:

            dcache[:] = [man, repo.manifest.readdelta(man)]
        if fn in dcache[1]:
            return ncache[fn].get(dcache[1][fn])
        return None

    displayer = cmdutil.show_changeset(ui, repo, opts)
    for st, rev, fns in changeiter:
        if st == 'window':
            du = dui(ui)
            displayer.ui = du
        elif st == 'add':
            du.bump(rev)
            changenode = repo.changelog.node(rev)
            parents = [p for p in repo.changelog.parentrevs(rev)
                       if p != nullrev]
            if opts['no_merges'] and len(parents) == 2:
                continue

                for fn in getchange(rev)[3]:
                    rename = getrenamed(fn, rev, mf)
                    if rename:
                        copies.append((fn, rename[0]))
            displayer.show(rev, changenode, brinfo=br, copies=copies)
            if opts['patch']:
                if parents:
                    prev = parents[0]
                else:
                    prev = nullrev
                prev = repo.changelog.node(prev)
                patch.diff(repo, prev, changenode, match=matchfn, fp=du)
                du.write("\n\n")
        elif st == 'iter':
            if count == limit: break
            if du.header[rev]:
                ui.write_header(*du.header[rev])
            if du.hunk[rev]:
                count += 1
                ui.write(*du.hunk[rev])

def manifest(ui, repo, rev=None):
    """output the latest or given revision of the project manifest

    Print a list of version controlled files for the given revision.

    for n in o:
        parents = [p for p in repo.changelog.parents(n) if p != nullid]
        if opts['no_merges'] and len(parents) == 2:
            continue
        displayer.show(changenode=n)
        if opts['patch']:
            prev = (parents and parents[0]) or nullid
            patch.diff(repo, prev, n)
            ui.write("\n")

def parents(ui, repo, file_=None, rev=None, branches=None, **opts):
    """show the parents of the working dir or revision

    Print the working directory's parent revisions.

    if opts['branches']:
        ui.warn(_("the --branches option is deprecated, "
                  "please use 'hg branches' instead\n"))
        br = repo.branchlookup([n])
    cmdutil.show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
    if opts['patch']:
        patch.diff(repo, repo.changelog.parents(n)[0], n)

def unbundle(ui, repo, fname, **opts):
    """apply a changegroup file

    Apply a compressed changegroup file generated by the bundle

3645:b984dcb1df71

        for n in o:
            parents = [p for p in other.changelog.parents(n) if p != nullid]
            if opts['no_merges'] and len(parents) == 2:
                continue
            displayer.show(changenode=n)
    finally:
        if hasattr(other, 'close'):
            other.close()
        if cleanup:
            os.unlink(cleanup)

    By default this command outputs: changeset id and hash, tags,
    non-trivial parents, user, date and time, and a summary for each
    commit. When the -v/--verbose switch is used, the list of changed
    files and full commit message is shown.
    """

    getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
    changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)

    if opts['branches']:

            dcache[:] = [man, repo.manifest.readdelta(man)]
        if fn in dcache[1]:
            return ncache[fn].get(dcache[1][fn])
        return None

    displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
    for st, rev, fns in changeiter:
        if st == 'add':
            changenode = repo.changelog.node(rev)
            parents = [p for p in repo.changelog.parentrevs(rev)
                       if p != nullrev]
            if opts['no_merges'] and len(parents) == 2:
                continue

                for fn in getchange(rev)[3]:
                    rename = getrenamed(fn, rev, mf)
                    if rename:
                        copies.append((fn, rename[0]))
            displayer.show(rev, changenode, brinfo=br, copies=copies)
        elif st == 'iter':
            if count == limit: break
            if displayer.flush(rev):
                count += 1

def manifest(ui, repo, rev=None):
    """output the latest or given revision of the project manifest

    Print a list of version controlled files for the given revision.

    for n in o:
        parents = [p for p in repo.changelog.parents(n) if p != nullid]
        if opts['no_merges'] and len(parents) == 2:
            continue
        displayer.show(changenode=n)

def parents(ui, repo, file_=None, rev=None, branches=None, **opts):
    """show the parents of the working dir or revision

    Print the working directory's parent revisions.

    if opts['branches']:
        ui.warn(_("the --branches option is deprecated, "
                  "please use 'hg branches' instead\n"))
        br = repo.branchlookup([n])
    cmdutil.show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)

def unbundle(ui, repo, fname, **opts):
    """apply a changegroup file

    Apply a compressed changegroup file generated by the bundle