rust-cpython: using rustext.dagop.headrevs in revlog As with the previous oxidation series, revlog plays the role of the factory, either using its parents function, or passing the index. We include below results of revsetbenchmarks.py taken on the PyPy repository on those of contrib/all-revsets.tx that involve `heads()`. In most of the cases, this seems to be either neutral or an improvement. In the cases where it's actually a bit slower, we suspect that differences in `heads()` performance is actually burried in variance on the incoming revset (probably several orders of magnitude slower). The precheck for filtered revisions of parent changeset has a significative performance benefit, too. Result by revset ================ Revision: 0) 0c7b353ce100; rust-cpython: binding for headrevs() 1) Parent of this changeset; changelog: prefilter in headrevs() 2) This changeset revset #0: heads(commonancestors(last(head(), 2))) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 0.001379 0.001361 0.001381 0.001410 0.001393 0.001372 0.001414 0.001387 0.001411 0.001429 0.001415 1) 0.001351 0.001373 0.001383 0.001392 0.001401 0.001385 0.001405 0.001406 0.001385 0.001424 0.001399 2) 0.001365 0.001362 0.001375 0.001393 0.001370 0.001365 0.001413 0.001386 0.001377 0.001415 0.001411 revset #1: heads(commonancestors(head())) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 0.047578 0.048578 0.047764 0.048065 0.047289 0.047305 0.047729 0.047370 0.047611 0.048005 0.047755 1) 0.048072 0.047471 0.048351 0.048193 0.048380 0.047968 0.047683 0.047355 0.048587 0.047044 0.048299 2) 0.047124 0.046699 0.046896 0.047250 0.046920 0.047379 0.046855 0.047753 0.047289 0.047219 0.046991 revset #2: heads(all()) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 0.037654 0.037814 0.037149 0.037457 0.037609 0.037053 0.036825 0.037054 0.037739 0.036816 0.037604 1) 0.021845 58% 0.022172 58% 0.022148 59% 0.022059 58% 0.022261 59% 0.022246 60% 0.021691 58% 0.021967 59% 0.022156 58% 0.021820 59% 0.023141 61% 2) 0.014459 66% 0.014470 65% 0.014420 65% 0.014413 65% 0.014421 64% 0.014492 65% 0.014512 66% 0.014579 66% 0.014500 65% 0.014501 66% 0.014537 62% revset #3: heads(-10000:-1) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 0.003696 0.003681 0.003719 0.003746 0.003725 0.003750 0.003692 0.003747 0.003712 0.003754 0.003763 1) 0.002131 57% 0.002142 58% 0.002147 57% 0.002203 58% 0.002143 57% 0.002208 58% 0.002158 58% 0.002182 58% 0.002169 58% 0.002209 58% 0.002201 58% 2) 0.001490 69% 0.001524 71% 0.001515 70% 0.001528 69% 0.001531 71% 0.001520 68% 0.001549 71% 0.001542 70% 0.001560 71% 0.001559 70% 0.001544 70% revset #4: (-5000:-1000) and heads(-10000:-1) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 0.003832 0.003816 0.003747 0.003814 0.003749 0.003894 0.003784 0.003796 0.003915 0.003829 0.003795 1) 0.002282 59% 0.002208 57% 0.002220 59% 0.002240 58% 0.002210 58% 0.002276 58% 0.002250 59% 0.002250 59% 0.002311 59% 0.002230 58% 0.002241 59% 2) 0.001658 72% 0.001662 75% 0.001568 70% 0.001599 71% 0.001588 71% 0.001696 74% 0.001615 71% 0.001593 70% 0.001710 73% 0.001622 72% 0.001616 72% revset #5: heads(matching(tip, "author")) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 7.826449 7.563260 7.581034 7.688493 7.634001 7.777860 7.768228 8.026097 7.767422 7.565254 7.938643 1) 7.750766 7.562555 7.660426 7.574089 7.492220 7.438582 7.562015 7.530635 93% 7.636343 7.636712 7.645113 2) 7.617941 7.519601 7.584922 7.507653 7.547440 7.524436 7.575291 7.883991 7.792142 7.709622 7.868595 revset #6: heads(matching(tip, "author")) and -10000:-1 plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 7.744489 7.728684 7.734065 7.928513 7.875949 7.883727 7.815492 7.791335 7.784793 7.761218 7.815731 1) 7.808956 7.480446 7.618759 7.920270 7.676343 7.803613 7.770210 7.713100 7.584420 7.767335 7.825140 2) 7.519987 7.938748 106% 7.805328 7.694162 7.750129 7.714229 7.603825 7.580734 7.555291 7.524207 7.504580 revset #7: (-10000:-1) and heads(matching(tip, "author")) plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast 0) 7.909321 7.694357 7.666021 7.538686 7.771821 7.876217 7.852103 7.812727 7.545919 7.788860 7.764585 1) 7.749232 7.683715 7.968393 7.895257 7.764160 8.314884 105% 7.921697 7.882613 7.867209 7.684707 7.544501 2) 7.824903 7.784605 7.727846 7.566613 7.581994 7.539205 90% 7.555316 7.535572 7.581786 7.901795 7.662832

     1

# This software may be used and distributed according to the terms of the

     2

# GNU General Public License version 2 or any later version.

     3

     4

# based on bundleheads extension by Gregory Szorc <gps@mozilla.com>

     5

     6

from __future__ import absolute_import

     7

     8

import abc

     9

import hashlib

    10

import os

    11

import subprocess

    12

import tempfile

    13

    14

from mercurial import (

    15

    node,

    16

    pycompat,

    17

)

    18

from mercurial.utils import (

    19

    procutil,

    20

)

    21

    22

NamedTemporaryFile = tempfile.NamedTemporaryFile

    23

    24

class BundleWriteException(Exception):

    25

    pass

    26

    27

class BundleReadException(Exception):

    28

    pass

    29

    30

class abstractbundlestore(object):

    31

    """Defines the interface for bundle stores.

    32

    33

    A bundle store is an entity that stores raw bundle data. It is a simple

    34

    key-value store. However, the keys are chosen by the store. The keys can

    35

    be any Python object understood by the corresponding bundle index (see

    36

    ``abstractbundleindex`` below).

    37

    """

    38

    __metaclass__ = abc.ABCMeta

    39

    40

    @abc.abstractmethod

    41

    def write(self, data):

    42

        """Write bundle data to the store.

    43

    44

        This function receives the raw data to be written as a str.

    45

        Throws BundleWriteException

    46

        The key of the written data MUST be returned.

    47

        """

    48

    49

    @abc.abstractmethod

    50

    def read(self, key):

    51

        """Obtain bundle data for a key.

    52

    53

        Returns None if the bundle isn't known.

    54

        Throws BundleReadException

    55

        The returned object should be a file object supporting read()

    56

        and close().

    57

        """

    58

    59

class filebundlestore(object):

    60

    """bundle store in filesystem

    61

    62

    meant for storing bundles somewhere on disk and on network filesystems

    63

    """

    64

    def __init__(self, ui, repo):

    65

        self.ui = ui

    66

        self.repo = repo

    67

        self.storepath = ui.configpath('scratchbranch', 'storepath')

    68

        if not self.storepath:

    69

            self.storepath = self.repo.vfs.join("scratchbranches",

    70

                                                "filebundlestore")

    71

        if not os.path.exists(self.storepath):

    72

            os.makedirs(self.storepath)

    73

    74

    def _dirpath(self, hashvalue):

    75

        """First two bytes of the hash are the name of the upper

    76

        level directory, next two bytes are the name of the

    77

        next level directory"""

    78

        return os.path.join(self.storepath, hashvalue[0:2], hashvalue[2:4])

    79

    80

    def _filepath(self, filename):

    81

        return os.path.join(self._dirpath(filename), filename)

    82

    83

    def write(self, data):

    84

        filename = node.hex(hashlib.sha1(data).digest())

    85

        dirpath = self._dirpath(filename)

    86

    87

        if not os.path.exists(dirpath):

    88

            os.makedirs(dirpath)

    89

    90

        with open(self._filepath(filename), 'wb') as f:

    91

            f.write(data)

    92

    93

        return filename

    94

    95

    def read(self, key):

    96

        try:

    97

            with open(self._filepath(key), 'rb') as f:

    98

                return f.read()

    99

        except IOError:

   100

            return None

   101

   102

class externalbundlestore(abstractbundlestore):

   103

    def __init__(self, put_binary, put_args, get_binary, get_args):

   104

        """

   105

        `put_binary` - path to binary file which uploads bundle to external

   106

            storage and prints key to stdout

   107

        `put_args` - format string with additional args to `put_binary`

   108

                     {filename} replacement field can be used.

   109

        `get_binary` - path to binary file which accepts filename and key

   110

            (in that order), downloads bundle from store and saves it to file

   111

        `get_args` - format string with additional args to `get_binary`.

   112

                     {filename} and {handle} replacement field can be used.

   113

        """

   114

   115

        self.put_args = put_args

   116

        self.get_args = get_args

   117

        self.put_binary = put_binary

   118

        self.get_binary = get_binary

   119

   120

    def _call_binary(self, args):

   121

        p = subprocess.Popen(

   122

            pycompat.rapply(procutil.tonativestr, args),

   123

            stdout=subprocess.PIPE, stderr=subprocess.PIPE,

   124

            close_fds=True)

   125

        stdout, stderr = p.communicate()

   126

        returncode = p.returncode

   127

        return returncode, stdout, stderr

   128

   129

    def write(self, data):

   130

        # Won't work on windows because you can't open file second time without

   131

        # closing it

   132

        # TODO: rewrite without str.format() and replace NamedTemporaryFile()

   133

        # with pycompat.namedtempfile()

   134

        with NamedTemporaryFile() as temp:

   135

            temp.write(data)

   136

            temp.flush()

   137

            temp.seek(0)

   138

            formatted_args = [arg.format(filename=temp.name)

   139

                              for arg in self.put_args]

   140

            returncode, stdout, stderr = self._call_binary(

   141

                [self.put_binary] + formatted_args)

   142

   143

            if returncode != 0:

   144

                raise BundleWriteException(

   145

                    'Failed to upload to external store: %s' % stderr)

   146

            stdout_lines = stdout.splitlines()

   147

            if len(stdout_lines) == 1:

   148

                return stdout_lines[0]

   149

            else:

   150

                raise BundleWriteException(

   151

                    'Bad output from %s: %s' % (self.put_binary, stdout))

   152

   153

    def read(self, handle):

   154

        # Won't work on windows because you can't open file second time without

   155

        # closing it

   156

        # TODO: rewrite without str.format() and replace NamedTemporaryFile()

   157

        # with pycompat.namedtempfile()

   158

        with NamedTemporaryFile() as temp:

   159

            formatted_args = [arg.format(filename=temp.name, handle=handle)

   160

                              for arg in self.get_args]

   161

            returncode, stdout, stderr = self._call_binary(

   162

                [self.get_binary] + formatted_args)

   163

   164

            if returncode != 0:

   165

                raise BundleReadException(

   166

                    'Failed to download from external store: %s' % stderr)

   167

            return temp.read()