This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5582

ancestor: incrementalmissingancestors.basesheads()
ClosedPublic

Authored by gracinet on Jan 14 2019, 9:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4856c9b8cbaf: ancestor: incrementalmissingancestors.basesheads()
Summary

This new method will avoid the need to access the bases attribute directly
in setdiscovery, and to prefilter nullrev before passing it to the
heads() revset.

Being a method, it can transparently be reimplemented in a Rust (or any native)
version.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.Jan 14 2019, 9:14 PM
Closed by commit rHG4856c9b8cbaf: ancestor: incrementalmissingancestors.basesheads() (authored by gracinet). · Explain WhyJan 16 2019, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ancestor.py (4 lines)

Diff 13254

mercurial/ancestor.py

# ancestor.py - generic DAG ancestor algorithm for mercurial # ancestor.py - generic DAG ancestor algorithm for mercurial
# #
# Copyright 2006 Matt Mackall <mpm@selenic.com> # Copyright 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import heapq import heapq
from .node import nullrev from .node import nullrev
from . import ( from . import (
dagop,
policy, policy,
pycompat, pycompat,
) )
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
def commonancestorsheads(pfunc, *nodes): def commonancestorsheads(pfunc, *nodes):
"""Returns a set with the heads of all common ancestors of all nodes, """Returns a set with the heads of all common ancestors of all nodes,
def hasbases(self): def hasbases(self):
'''whether the common set has any non-trivial bases''' '''whether the common set has any non-trivial bases'''
return self.bases and self.bases != {nullrev} return self.bases and self.bases != {nullrev}
def addbases(self, newbases): def addbases(self, newbases):
'''grow the ancestor set by adding new bases''' '''grow the ancestor set by adding new bases'''
self.bases.update(newbases) self.bases.update(newbases)
def basesheads(self):
return dagop.headrevs(self.bases, self.pfunc)
def removeancestorsfrom(self, revs): def removeancestorsfrom(self, revs):
'''remove all ancestors of bases from the set revs (in place)''' '''remove all ancestors of bases from the set revs (in place)'''
bases = self.bases bases = self.bases
pfunc = self.pfunc pfunc = self.pfunc
revs.difference_update(bases) revs.difference_update(bases)
# nullrev is always an ancestor # nullrev is always an ancestor
revs.discard(nullrev) revs.discard(nullrev)
if not revs: if not revs: