| quark |
| hg-reviewers |
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.
Tested on development server.
| Lint Skipped |
| Unit Tests Skipped |
| }}) | }}) | ||||
| return True | return True | ||||
| except Exception as e: | except Exception as e: | ||||
| # Swallow any errors; fire and forget | # Swallow any errors; fire and forget | ||||
| self.repo.ui.log( | self.repo.ui.log( | ||||
| 'watchman', 'Exception %s while running %s\n', e, cmd) | 'watchman', 'Exception %s while running %s\n', e, cmd) | ||||
| return False | 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 | # Bracket working copy updates with calls to the watchman state-enter | ||||
| # and state-leave commands. This allows clients to perform more intelligent | # and state-leave commands. This allows clients to perform more intelligent | ||||
| # settling during bulk file change scenarios | # settling during bulk file change scenarios | ||||
| # https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling | # https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling | ||||
| def wrapupdate(orig, repo, node, branchmerge, force, ancestor=None, | def wrapupdate(orig, repo, node, branchmerge, force, ancestor=None, | ||||
| mergeancestor=False, labels=None, matcher=None, **kwargs): | mergeancestor=False, labels=None, matcher=None, **kwargs): | ||||
| distance = 0 | distance = 0 | ||||
| partial = True | partial = True | ||||
| if matcher is None or matcher.always(): | if matcher is None or matcher.always(): | ||||
| partial = False | partial = False | ||||
| wc = repo[None] | distance = calcdistance(repo.unfiltered(), repo['.'].node(), | ||||
| parents = wc.parents() | repo[node].node()) | ||||
| 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): | with state_update(repo, node, distance, partial): | ||||
| return orig( | return orig( | ||||
| repo, node, branchmerge, force, ancestor, mergeancestor, | repo, node, branchmerge, force, ancestor, mergeancestor, | ||||
| labels, matcher, **kwargs) | labels, matcher, **kwargs) | ||||
| def reposetup(ui, repo): | def reposetup(ui, repo): | ||||
| # We don't work with largefiles or inotify | # We don't work with largefiles or inotify | ||||