comparison mercurial/commands.py @ 34682:7e3001b74ab3

tersestatus: re-implement the functionality to terse the status

The previous terse status implementation was hacking around os.listdir() and was
flaky. There have been a lot of instances of mercurial buildbots failing
and google's internal builds failing because of the
hacky implementation of terse status. Even though I wrote the last
implementation but it was hard for me to find the reason for the flake.

The new implementation can be slower than the old one but is clean and easy to
understand.

In this we create a node object for each directory and create a tree
like structure starting from the root of the working copy. While building the
tree like structure we store some information on the nodes which will be helpful
for deciding later whether we can terse the dir or not.
Once the whole tree is build we traverse and built the list of files for each
status with required tersing.

There is no behaviour change as the old test, test-status-terse.t passes with
the new implementation.

Differential Revision: https://phab.mercurial-scm.org/D985

34681:4dc8a2ee0f4f

            show = states[:4]
        else:
            show = states[:5]

    m = scmutil.match(repo[node2], pats, opts)
    stat = repo.status(node1, node2, m,
                       'ignored' in show, 'clean' in show, 'unknown' in show,
                       opts.get('subrepos'))
    if terse:
        stat = cmdutil.tersestatus(repo.root, stat, terse,
                                    repo.dirstate._ignore, opts.get('ignored'))
    changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)

    if (opts.get('all') or opts.get('copies')
        or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
        copy = copies.pathcopies(repo[node1], repo[node2], m)

34682:7e3001b74ab3

            show = states[:4]
        else:
            show = states[:5]

    m = scmutil.match(repo[node2], pats, opts)
    if terse:
        # we need to compute clean and unknown to terse
        stat = repo.status(node1, node2, m,
                           'ignored' in show or 'i' in terse,
                            True, True, opts.get('subrepos'))

        stat = cmdutil.tersedir(stat, terse)
    else:
        stat = repo.status(node1, node2, m,
                           'ignored' in show, 'clean' in show,
                           'unknown' in show, opts.get('subrepos'))

    changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)

    if (opts.get('all') or opts.get('copies')
        or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
        copy = copies.pathcopies(repo[node1], repo[node2], m)