comparison hgext/fsmonitor/__init__.py @ 34564:b79f59425964

fsmonitor: change the distance calculation

Change the distance calculation in the fsmonitor extension. It is done
in a method since anticipated changes will need to use this logic as well.

Test Plan:
Tested on development server.

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

34563:1faa34347b24

            # Swallow any errors; fire and forget
            self.repo.ui.log(
                'watchman', 'Exception %s while running %s\n', e, cmd)
            return False

# Bracket working copy updates with calls to the watchman state-enter
# and state-leave commands.  This allows clients to perform more intelligent
# settling during bulk file change scenarios
# https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling
def wrapupdate(orig, repo, node, branchmerge, force, ancestor=None,

    distance = 0
    partial = True
    if matcher is None or matcher.always():
        partial = False
        wc = repo[None]
        parents = wc.parents()
        if len(parents) == 2:
            anc = repo.changelog.ancestor(parents[0].node(), parents[1].node())
            ancrev = repo[anc].rev()
            distance = abs(repo[node].rev() - ancrev)
        elif len(parents) == 1:
            distance = abs(repo[node].rev() - parents[0].rev())

    with state_update(repo, node, distance, partial):
        return orig(
            repo, node, branchmerge, force, ancestor, mergeancestor,
            labels, matcher, **kwargs)

34564:b79f59425964

            # Swallow any errors; fire and forget
            self.repo.ui.log(
                'watchman', 'Exception %s while running %s\n', e, cmd)
            return False

# Estimate the distance between two nodes
def calcdistance(repo, oldnode, newnode):
    anc = repo.changelog.ancestor(oldnode, newnode)
    ancrev = repo[anc].rev()
    distance = (abs(repo[oldnode].rev() - ancrev)
        + abs(repo[newnode].rev() - ancrev))
    return distance

# Bracket working copy updates with calls to the watchman state-enter
# and state-leave commands.  This allows clients to perform more intelligent
# settling during bulk file change scenarios
# https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling
def wrapupdate(orig, repo, node, branchmerge, force, ancestor=None,

    distance = 0
    partial = True
    if matcher is None or matcher.always():
        partial = False
        distance = calcdistance(repo.unfiltered(), repo['.'].node(),
                                repo[node].node())

    with state_update(repo, node, distance, partial):
        return orig(
            repo, node, branchmerge, force, ancestor, mergeancestor,
            labels, matcher, **kwargs)