directaccess: use cached filteredrevs Before this patch we were calling directly repoview.computehidden(repo) to compute the revisions visible with direct access, without going through the caching mechanism for the filtered revisions. There was two issues with that: (1) Performance: We were not leverating the cached values of the 'visible' revs (2) Stability: If there were to be a cache inconsistency with the computation of 'visible' we would crash in the branchmap consistency check partial.validfor. Consider the scenario of rebase with bookmarks: - when we delete a bookmark on an obsolete changeset (like what rebase does when moving the bookmark after rebasing the changesets) - then this changes the value returned by repoview.computehidden(repo) as bookmarks are used as dynamic blockers in repoview.computehidden(repo) - as of now, we don't invalidate the cache in the case of bookmark change - if we have a cached value from before the bookmark change, repoview.filterrevs(repo, 'visible') considers the cached value correct and returns something different than repoview.computehidden(repo) - in turn, if we use repoview.computehidden(repo) in directaccess, the subset relationship is broken and the cache consistency assertion (parial.validfor) fails if branchmap.updatecache is called in this time window This patch leverages the caching infrastructure in place to speed up the computation of the filteredrevs for visible-directaccess-nowarn and visible-directaccess-warn. Incidentally it prevents the bug discussed in (2) from crashing when running a rebase with a bookmark. Note that there still needs to be a fix in core for the case discussed in (2). The test for this side of the fix (not core's fix for (2) is very hard to implement without introducing a lot of dependencies and does not belong here. It is much easier to have the test of the fix for the scenario (2) in core along with the fix.

     1

# Copied from histedit setup.py

     2

# Credit to Augie Fackler <durin42@gmail.com>

     3

     4

import os

     5

from distutils.core import setup

     6

from os.path import dirname, join

     7

     8

def get_version(relpath):

     9

    '''Read version info from a file without importing it'''

    10

    for line in open(join(dirname(__file__), relpath), 'rb'):

    11

        # Decode to a fail-safe string for PY3

    12

        # (gives unicode object in PY2)

    13

        line = line.decode('utf8')

    14

        if '__version__' in line:

    15

          if "'" in line:

    16

            return line.split("'")[1]

    17

    18

py_modules = [

    19

    'hgext.evolve',

    20

]

    21

    22

if os.environ.get('INCLUDE_INHIBIT'):

    23

    py_modules.append('hgext.inhibit')

    24

    py_modules.append('hgext.directaccess')

    25

    26

setup(

    27

    name='hg-evolve',

    28

    version=get_version('hgext/evolve.py'),

    29

    author='Pierre-Yves David',

    30

    maintainer='Pierre-Yves David',

    31

    maintainer_email='pierre-yves.david@ens-lyon.org',

    32

    url='https://bitbucket.org/marmoute/mutable-history',

    33

    description='Flexible evolution of Mercurial history.',

    34

    long_description=open('README').read(),

    35

    keywords='hg mercurial',

    36

    license='GPLv2+',

    37

    py_modules=py_modules

    38

)