This provides a massive speedup on wide repository with many heads. For example
on mozilla-try, this move from un-usable slow to fairly instant.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| from mercurial import ( | from mercurial import ( | ||||
| registrar, | registrar, | ||||
| revset, | revset, | ||||
| revsetlang, | revsetlang, | ||||
| smartset, | smartset, | ||||
| ) | ) | ||||
| import sortedcontainers | |||||
| SortedSet = sortedcontainers.SortedSet | |||||
| revsetpredicate = registrar.revsetpredicate() | revsetpredicate = registrar.revsetpredicate() | ||||
| @revsetpredicate(b'subsetspec("<spec>")') | @revsetpredicate(b'subsetspec("<spec>")') | ||||
| def subsetmarkerspec(repo, subset, x): | def subsetmarkerspec(repo, subset, x): | ||||
| """use a shorthand spec as used by search-discovery-case | """use a shorthand spec as used by search-discovery-case | ||||
| Supported format are: | Supported format are: | ||||
| seed = revsetlang.getinteger(seed, _(b"seed should be a number")) | seed = revsetlang.getinteger(seed, _(b"seed should be a number")) | ||||
| rand = random.Random(seed) | rand = random.Random(seed) | ||||
| else: | else: | ||||
| assert False | assert False | ||||
| n = revsetlang.getinteger(n, _(b"scratch expects a number")) | n = revsetlang.getinteger(n, _(b"scratch expects a number")) | ||||
| selected = set() | selected = set() | ||||
| heads = set() | heads = SortedSet() | ||||
| children_count = collections.defaultdict(lambda: 0) | children_count = collections.defaultdict(lambda: 0) | ||||
| parents = repo.changelog._uncheckedparentrevs | parents = repo.changelog._uncheckedparentrevs | ||||
| baseset = revset.getset(repo, smartset.fullreposet(repo), x) | baseset = revset.getset(repo, smartset.fullreposet(repo), x) | ||||
| baseset.sort() | baseset.sort() | ||||
| for r in baseset: | for r in baseset: | ||||
| heads.add(r) | heads.add(r) | ||||
| p1, p2 = parents(r) | p1, p2 = parents(r) | ||||
| if p1 >= 0: | if p1 >= 0: | ||||
| heads.discard(p1) | heads.discard(p1) | ||||
| children_count[p1] += 1 | children_count[p1] += 1 | ||||
| if p2 >= 0: | if p2 >= 0: | ||||
| heads.discard(p2) | heads.discard(p2) | ||||
| children_count[p2] += 1 | children_count[p2] += 1 | ||||
| for h in heads: | for h in heads: | ||||
| assert children_count[h] == 0 | assert children_count[h] == 0 | ||||
| selected = set() | selected = set() | ||||
| for x in range(n): | for x in range(n): | ||||
| if not heads: | if not heads: | ||||
| break | break | ||||
| pickable = list(heads) | pick = rand.choice(heads) | ||||
| pickable.sort() | |||||
| pick = rand.choice(pickable) | |||||
| heads.remove(pick) | heads.remove(pick) | ||||
| assert pick not in selected | assert pick not in selected | ||||
| selected.add(pick) | selected.add(pick) | ||||
| p1, p2 = parents(pick) | p1, p2 = parents(pick) | ||||
| if p1 in children_count: | if p1 in children_count: | ||||
| assert p1 in children_count | assert p1 in children_count | ||||
| children_count[p1] -= 1 | children_count[p1] -= 1 | ||||
| assert children_count[p1] >= 0 | assert children_count[p1] >= 0 | ||||