~bzr-pqm/bzr/bzr.dev

5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
1
# Copyright (C) 2007-2010 Canonical Ltd
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
16
17
"""Helper functions for DirState.
18
19
This is the python implementation for DirState functions.
20
"""
21
3696.4.3 by Robert Collins
Some tuning of update_entry.
22
import binascii
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
23
import bisect
24
import errno
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
25
import os
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
26
import stat
3763.1.1 by Benjamin Peterson
fix two small oversights
27
import sys
3696.4.3 by Robert Collins
Some tuning of update_entry.
28
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
29
from bzrlib import cache_utf8, errors, osutils
3696.4.17 by Robert Collins
Review feedback.
30
from bzrlib.dirstate import DirState
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
31
from bzrlib.osutils import parent_directories, pathjoin, splitpath
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
32
33
34
# This is the Windows equivalent of ENOTDIR
35
# It is defined in pywin32.winerror, but we don't want a strong dependency for
36
# just an error code.
37
# XXX: Perhaps we could get it from a windows header ?
38
cdef int ERROR_PATH_NOT_FOUND
39
ERROR_PATH_NOT_FOUND = 3
40
cdef int ERROR_DIRECTORY
41
ERROR_DIRECTORY = 267
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
42
3737.1.3 by John Arbash Meinel
Move more compatibility code into python-compat.h
43
#python2.4 support, and other platform-dependent includes
3731.1.1 by Robert Collins
* The C extensions now build on python 2.4 (Robert Collins, #271939)
44
cdef extern from "python-compat.h":
3737.1.3 by John Arbash Meinel
Move more compatibility code into python-compat.h
45
    unsigned long htonl(unsigned long)
3731.1.1 by Robert Collins
* The C extensions now build on python 2.4 (Robert Collins, #271939)
46
2474.1.72 by John Arbash Meinel
Document a bit more what is going on in _dirstate_helpers_c.pyx, from Martin's comments
47
# Give Pyrex some function definitions for it to understand.
48
# All of these are just hints to Pyrex, so that it can try to convert python
49
# objects into similar C objects. (such as PyInt => int).
50
# In anything defined 'cdef extern from XXX' the real C header will be
51
# imported, and the real definition will be used from there. So these are just
52
# hints, and do not need to match exactly to the C definitions.
53
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
54
cdef extern from *:
2474.1.72 by John Arbash Meinel
Document a bit more what is going on in _dirstate_helpers_c.pyx, from Martin's comments
55
    ctypedef unsigned long size_t
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
56
4459.2.1 by Vincent Ladeuil
Use a consistent scheme for naming pyrex source files.
57
cdef extern from "_dirstate_helpers_pyx.h":
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
58
    ctypedef int intptr_t
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
59
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
60
3696.4.3 by Robert Collins
Some tuning of update_entry.
61
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
62
cdef extern from "stdlib.h":
63
    unsigned long int strtoul(char *nptr, char **endptr, int base)
64
3696.4.3 by Robert Collins
Some tuning of update_entry.
65
66
cdef extern from 'sys/stat.h':
67
    int S_ISDIR(int mode)
68
    int S_ISREG(int mode)
3737.1.3 by John Arbash Meinel
Move more compatibility code into python-compat.h
69
    # On win32, this actually comes from "python-compat.h"
3696.4.3 by Robert Collins
Some tuning of update_entry.
70
    int S_ISLNK(int mode)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
71
    int S_IXUSR
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
72
2474.1.72 by John Arbash Meinel
Document a bit more what is going on in _dirstate_helpers_c.pyx, from Martin's comments
73
# These functions allow us access to a bit of the 'bare metal' of python
74
# objects, rather than going through the object abstraction. (For example,
75
# PyList_Append, rather than getting the 'append' attribute of the object, and
76
# creating a tuple, and then using PyCallObject).
77
# Functions that return (or take) a void* are meant to grab a C PyObject*. This
78
# differs from the Pyrex 'object'. If you declare a variable as 'object' Pyrex
79
# will automatically Py_INCREF and Py_DECREF when appropriate. But for some
80
# inner loops, we don't need to do that at all, as the reference only lasts for
81
# a very short time.
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
82
# Note that the C API GetItem calls borrow references, so pyrex does the wrong
83
# thing if you declare e.g. object PyList_GetItem(object lst, int index) - you
84
# need to manually Py_INCREF yourself.
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
85
cdef extern from "Python.h":
3640.2.6 by John Arbash Meinel
PQM's pyrex needs a Py_ssize_t typedef.
86
    ctypedef int Py_ssize_t
3696.4.3 by Robert Collins
Some tuning of update_entry.
87
    ctypedef struct PyObject:
88
        pass
2474.1.23 by John Arbash Meinel
A C implementation of _fields_to_entry_0_parents drops the time from 400ms to 330ms for a 21k-entry tree
89
    int PyList_Append(object lst, object item) except -1
2474.1.12 by John Arbash Meinel
Clean up bisect_dirstate to not use temporary variables.
90
    void *PyList_GetItem_object_void "PyList_GET_ITEM" (object lst, int index)
3696.4.3 by Robert Collins
Some tuning of update_entry.
91
    void *PyList_GetItem_void_void "PyList_GET_ITEM" (void * lst, int index)
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
92
    object PyList_GET_ITEM(object lst, Py_ssize_t index)
2474.1.10 by John Arbash Meinel
Explicitly calling Py_INCREF makes things happier again.
93
    int PyList_CheckExact(object)
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
94
    Py_ssize_t PyList_GET_SIZE (object p)
2474.1.23 by John Arbash Meinel
A C implementation of _fields_to_entry_0_parents drops the time from 400ms to 330ms for a 21k-entry tree
95
96
    void *PyTuple_GetItem_void_void "PyTuple_GET_ITEM" (void* tpl, int index)
3696.4.3 by Robert Collins
Some tuning of update_entry.
97
    object PyTuple_GetItem_void_object "PyTuple_GET_ITEM" (void* tpl, int index)
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
98
    object PyTuple_GET_ITEM(object tpl, Py_ssize_t index)
99
2474.1.10 by John Arbash Meinel
Explicitly calling Py_INCREF makes things happier again.
100
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
101
    char *PyString_AsString(object p)
3696.4.3 by Robert Collins
Some tuning of update_entry.
102
    char *PyString_AsString_obj "PyString_AsString" (PyObject *string)
2474.1.16 by John Arbash Meinel
Shave off maybe 10% by using the PyString_* macros instead of functions.
103
    char *PyString_AS_STRING_void "PyString_AS_STRING" (void *p)
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
104
    int PyString_AsStringAndSize(object str, char **buffer, Py_ssize_t *length) except -1
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
105
    object PyString_FromString(char *)
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
106
    object PyString_FromStringAndSize(char *, Py_ssize_t)
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
107
    int PyString_Size(object p)
2474.1.16 by John Arbash Meinel
Shave off maybe 10% by using the PyString_* macros instead of functions.
108
    int PyString_GET_SIZE_void "PyString_GET_SIZE" (void *p)
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
109
    int PyString_CheckExact(object p)
3696.4.3 by Robert Collins
Some tuning of update_entry.
110
    void Py_INCREF(object o)
111
    void Py_DECREF(object o)
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
112
2474.1.23 by John Arbash Meinel
A C implementation of _fields_to_entry_0_parents drops the time from 400ms to 330ms for a 21k-entry tree
113
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
114
cdef extern from "string.h":
2474.1.25 by John Arbash Meinel
Refactor into a helper function to make implementation clearer
115
    int strncmp(char *s1, char *s2, int len)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
116
    void *memchr(void *s, int c, size_t len)
117
    int memcmp(void *b1, void *b2, size_t len)
118
    # ??? memrchr is a GNU extension :(
119
    # void *memrchr(void *s, int c, size_t len)
120
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
121
# cimport all of the definitions we will need to access
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
122
from _static_tuple_c cimport import_static_tuple_c, StaticTuple, \
123
    StaticTuple_New, StaticTuple_SET_ITEM
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
124
125
import_static_tuple_c()
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
126
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
127
cdef void* _my_memrchr(void *s, int c, size_t n): # cannot_raise
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
128
    # memrchr seems to be a GNU extension, so we have to implement it ourselves
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
129
    cdef char *pos
130
    cdef char *start
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
131
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
132
    start = <char*>s
133
    pos = start + n - 1
134
    while pos >= start:
135
        if pos[0] == c:
136
            return <void*>pos
137
        pos = pos - 1
138
    return NULL
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
139
140
141
def _py_memrchr(s, c):
142
    """Just to expose _my_memrchr for testing.
143
144
    :param s: The Python string to search
145
    :param c: The character to search for
146
    :return: The offset to the last instance of 'c' in s
147
    """
148
    cdef void *_s
149
    cdef void *found
150
    cdef int length
151
    cdef char *_c
152
153
    _s = PyString_AsString(s)
154
    length = PyString_Size(s)
155
156
    _c = PyString_AsString(c)
157
    assert PyString_Size(c) == 1,\
158
        'Must be a single character string, not %s' % (c,)
159
    found = _my_memrchr(_s, _c[0], length)
160
    if found == NULL:
161
        return None
2668.1.1 by John Arbash Meinel
(Lukáš Lalinský) Add a special header for intptr_t for MSVC which doesn't have it in the standard place
162
    return <char*>found - <char*>_s
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
163
5037.1.1 by Martin Pool
Avoid showing pointer in safe_string_from_size; not helpful and gives compiler warning
164
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
165
cdef object safe_string_from_size(char *s, Py_ssize_t size):
166
    if size < 0:
167
        raise AssertionError(
5037.1.1 by Martin Pool
Avoid showing pointer in safe_string_from_size; not helpful and gives compiler warning
168
            'tried to create a string with an invalid size: %d'
169
            % (size))
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
170
    return PyString_FromStringAndSize(s, size)
171
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
172
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
173
cdef int _is_aligned(void *ptr): # cannot_raise
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
174
    """Is this pointer aligned to an integer size offset?
175
176
    :return: 1 if this pointer is aligned, 0 otherwise.
177
    """
178
    return ((<intptr_t>ptr) & ((sizeof(int))-1)) == 0
179
180
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
181
cdef int _cmp_by_dirs(char *path1, int size1, char *path2, int size2): # cannot_raise
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
182
    cdef unsigned char *cur1
183
    cdef unsigned char *cur2
184
    cdef unsigned char *end1
185
    cdef unsigned char *end2
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
186
    cdef int *cur_int1
187
    cdef int *cur_int2
188
    cdef int *end_int1
189
    cdef int *end_int2
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
190
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
191
    if path1 == path2 and size1 == size2:
2474.1.54 by John Arbash Meinel
Optimize the simple case that the strings are the same object.
192
        return 0
193
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
194
    end1 = <unsigned char*>path1+size1
195
    end2 = <unsigned char*>path2+size2
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
196
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
197
    # Use 32-bit comparisons for the matching portion of the string.
198
    # Almost all CPU's are faster at loading and comparing 32-bit integers,
199
    # than they are at 8-bit integers.
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
200
    # 99% of the time, these will be aligned, but in case they aren't just skip
201
    # this loop
202
    if _is_aligned(path1) and _is_aligned(path2):
203
        cur_int1 = <int*>path1
204
        cur_int2 = <int*>path2
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
205
        end_int1 = <int*>(path1 + size1 - (size1 % sizeof(int)))
206
        end_int2 = <int*>(path2 + size2 - (size2 % sizeof(int)))
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
207
208
        while cur_int1 < end_int1 and cur_int2 < end_int2:
209
            if cur_int1[0] != cur_int2[0]:
210
                break
211
            cur_int1 = cur_int1 + 1
212
            cur_int2 = cur_int2 + 1
213
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
214
        cur1 = <unsigned char*>cur_int1
215
        cur2 = <unsigned char*>cur_int2
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
216
    else:
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
217
        cur1 = <unsigned char*>path1
218
        cur2 = <unsigned char*>path2
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
219
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
220
    while cur1 < end1 and cur2 < end2:
221
        if cur1[0] == cur2[0]:
222
            # This character matches, just go to the next one
223
            cur1 = cur1 + 1
224
            cur2 = cur2 + 1
225
            continue
226
        # The current characters do not match
227
        if cur1[0] == c'/':
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
228
            return -1 # Reached the end of path1 segment first
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
229
        elif cur2[0] == c'/':
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
230
            return 1 # Reached the end of path2 segment first
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
231
        elif cur1[0] < cur2[0]:
232
            return -1
233
        else:
234
            return 1
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
235
236
    # We reached the end of at least one of the strings
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
237
    if cur1 < end1:
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
238
        return 1 # Not at the end of cur1, must be at the end of cur2
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
239
    if cur2 < end2:
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
240
        return -1 # At the end of cur1, but not at cur2
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
241
    # We reached the end of both strings
242
    return 0
243
244
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
245
def cmp_by_dirs(path1, path2):
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
246
    """Compare two paths directory by directory.
247
248
    This is equivalent to doing::
249
250
       cmp(path1.split('/'), path2.split('/'))
251
252
    The idea is that you should compare path components separately. This
253
    differs from plain ``cmp(path1, path2)`` for paths like ``'a-b'`` and
254
    ``a/b``. "a-b" comes after "a" but would come before "a/b" lexically.
255
256
    :param path1: first path
257
    :param path2: second path
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
258
    :return: negative number if ``path1`` comes first,
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
259
        0 if paths are equal,
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
260
        and positive number if ``path2`` sorts first
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
261
    """
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
262
    if not PyString_CheckExact(path1):
263
        raise TypeError("'path1' must be a plain string, not %s: %r"
264
                        % (type(path1), path1))
265
    if not PyString_CheckExact(path2):
266
        raise TypeError("'path2' must be a plain string, not %s: %r"
267
                        % (type(path2), path2))
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
268
    return _cmp_by_dirs(PyString_AsString(path1),
269
                        PyString_Size(path1),
270
                        PyString_AsString(path2),
271
                        PyString_Size(path2))
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
272
273
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
274
def _cmp_path_by_dirblock(path1, path2):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
275
    """Compare two paths based on what directory they are in.
276
277
    This generates a sort order, such that all children of a directory are
278
    sorted together, and grandchildren are in the same order as the
279
    children appear. But all grandchildren come after all children.
280
2474.1.66 by John Arbash Meinel
Some restructuring.
281
    In other words, all entries in a directory are sorted together, and
282
    directorys are sorted in cmp_by_dirs order.
283
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
284
    :param path1: first path
285
    :param path2: the second path
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
286
    :return: negative number if ``path1`` comes first,
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
287
        0 if paths are equal
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
288
        and a positive number if ``path2`` sorts first
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
289
    """
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
290
    if not PyString_CheckExact(path1):
291
        raise TypeError("'path1' must be a plain string, not %s: %r"
292
                        % (type(path1), path1))
293
    if not PyString_CheckExact(path2):
294
        raise TypeError("'path2' must be a plain string, not %s: %r"
295
                        % (type(path2), path2))
4459.2.4 by Vincent Ladeuil
Fixed as per John and Martin reviews.
296
    return _cmp_path_by_dirblock_intern(PyString_AsString(path1),
297
                                        PyString_Size(path1),
298
                                        PyString_AsString(path2),
299
                                        PyString_Size(path2))
300
301
302
cdef int _cmp_path_by_dirblock_intern(char *path1, int path1_len,
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
303
                                      char *path2, int path2_len): # cannot_raise
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
304
    """Compare two paths by what directory they are in.
305
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
306
    see ``_cmp_path_by_dirblock`` for details.
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
307
    """
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
308
    cdef char *dirname1
309
    cdef int dirname1_len
310
    cdef char *dirname2
311
    cdef int dirname2_len
312
    cdef char *basename1
313
    cdef int basename1_len
314
    cdef char *basename2
315
    cdef int basename2_len
316
    cdef int cur_len
317
    cdef int cmp_val
318
319
    if path1_len == 0 and path2_len == 0:
320
        return 0
321
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
322
    if path1 == path2 and path1_len == path2_len:
323
        return 0
324
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
325
    if path1_len == 0:
326
        return -1
327
328
    if path2_len == 0:
329
        return 1
330
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
331
    basename1 = <char*>_my_memrchr(path1, c'/', path1_len)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
332
333
    if basename1 == NULL:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
334
        basename1 = path1
335
        basename1_len = path1_len
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
336
        dirname1 = ''
337
        dirname1_len = 0
338
    else:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
339
        dirname1 = path1
340
        dirname1_len = basename1 - path1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
341
        basename1 = basename1 + 1
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
342
        basename1_len = path1_len - dirname1_len - 1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
343
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
344
    basename2 = <char*>_my_memrchr(path2, c'/', path2_len)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
345
346
    if basename2 == NULL:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
347
        basename2 = path2
348
        basename2_len = path2_len
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
349
        dirname2 = ''
350
        dirname2_len = 0
351
    else:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
352
        dirname2 = path2
353
        dirname2_len = basename2 - path2
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
354
        basename2 = basename2 + 1
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
355
        basename2_len = path2_len - dirname2_len - 1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
356
357
    cmp_val = _cmp_by_dirs(dirname1, dirname1_len,
358
                           dirname2, dirname2_len)
359
    if cmp_val != 0:
360
        return cmp_val
361
362
    cur_len = basename1_len
363
    if basename2_len < basename1_len:
364
        cur_len = basename2_len
365
366
    cmp_val = memcmp(basename1, basename2, cur_len)
367
    if cmp_val != 0:
368
        return cmp_val
369
    if basename1_len == basename2_len:
370
        return 0
371
    if basename1_len < basename2_len:
372
        return -1
373
    return 1
374
375
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
376
def _bisect_path_left(paths, path):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
377
    """Return the index where to insert path into paths.
378
379
    This uses a path-wise comparison so we get::
380
        a
381
        a-b
382
        a=b
383
        a/b
384
    Rather than::
385
        a
386
        a-b
387
        a/b
388
        a=b
389
    :param paths: A list of paths to search through
390
    :param path: A single path to insert
391
    :return: An offset where 'path' can be inserted.
392
    :seealso: bisect.bisect_left
393
    """
394
    cdef int _lo
395
    cdef int _hi
396
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
397
    cdef char *path_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
398
    cdef int path_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
399
    cdef char *cur_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
400
    cdef int cur_size
401
    cdef void *cur
402
403
    if not PyList_CheckExact(paths):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
404
        raise TypeError("you must pass a python list for 'paths' not: %s %r"
405
                        % (type(paths), paths))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
406
    if not PyString_CheckExact(path):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
407
        raise TypeError("you must pass a string for 'path' not: %s %r"
408
                        % (type(path), path))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
409
410
    _hi = len(paths)
411
    _lo = 0
412
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
413
    path_cstr = PyString_AsString(path)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
414
    path_size = PyString_Size(path)
415
416
    while _lo < _hi:
417
        _mid = (_lo + _hi) / 2
418
        cur = PyList_GetItem_object_void(paths, _mid)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
419
        cur_cstr = PyString_AS_STRING_void(cur)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
420
        cur_size = PyString_GET_SIZE_void(cur)
4459.2.4 by Vincent Ladeuil
Fixed as per John and Martin reviews.
421
        if _cmp_path_by_dirblock_intern(cur_cstr, cur_size,
422
                                        path_cstr, path_size) < 0:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
423
            _lo = _mid + 1
424
        else:
425
            _hi = _mid
426
    return _lo
427
428
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
429
def _bisect_path_right(paths, path):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
430
    """Return the index where to insert path into paths.
431
432
    This uses a path-wise comparison so we get::
433
        a
434
        a-b
435
        a=b
436
        a/b
437
    Rather than::
438
        a
439
        a-b
440
        a/b
441
        a=b
442
    :param paths: A list of paths to search through
443
    :param path: A single path to insert
444
    :return: An offset where 'path' can be inserted.
445
    :seealso: bisect.bisect_right
446
    """
447
    cdef int _lo
448
    cdef int _hi
449
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
450
    cdef char *path_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
451
    cdef int path_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
452
    cdef char *cur_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
453
    cdef int cur_size
454
    cdef void *cur
455
456
    if not PyList_CheckExact(paths):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
457
        raise TypeError("you must pass a python list for 'paths' not: %s %r"
458
                        % (type(paths), paths))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
459
    if not PyString_CheckExact(path):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
460
        raise TypeError("you must pass a string for 'path' not: %s %r"
461
                        % (type(path), path))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
462
463
    _hi = len(paths)
464
    _lo = 0
465
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
466
    path_cstr = PyString_AsString(path)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
467
    path_size = PyString_Size(path)
468
469
    while _lo < _hi:
470
        _mid = (_lo + _hi) / 2
471
        cur = PyList_GetItem_object_void(paths, _mid)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
472
        cur_cstr = PyString_AS_STRING_void(cur)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
473
        cur_size = PyString_GET_SIZE_void(cur)
4459.2.4 by Vincent Ladeuil
Fixed as per John and Martin reviews.
474
        if _cmp_path_by_dirblock_intern(path_cstr, path_size,
475
                                        cur_cstr, cur_size) < 0:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
476
            _hi = _mid
477
        else:
478
            _lo = _mid + 1
479
    return _lo
480
481
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
482
def bisect_dirblock(dirblocks, dirname, lo=0, hi=None, cache=None):
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
483
    """Return the index where to insert dirname into the dirblocks.
484
485
    The return value idx is such that all directories blocks in dirblock[:idx]
486
    have names < dirname, and all blocks in dirblock[idx:] have names >=
487
    dirname.
488
489
    Optional args lo (default 0) and hi (default len(dirblocks)) bound the
490
    slice of a to be searched.
491
    """
492
    cdef int _lo
493
    cdef int _hi
494
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
495
    cdef char *dirname_cstr
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
496
    cdef int dirname_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
497
    cdef char *cur_cstr
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
498
    cdef int cur_size
2474.1.12 by John Arbash Meinel
Clean up bisect_dirstate to not use temporary variables.
499
    cdef void *cur
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
500
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
501
    if not PyList_CheckExact(dirblocks):
502
        raise TypeError("you must pass a python list for 'dirblocks' not: %s %r"
503
                        % (type(dirblocks), dirblocks))
504
    if not PyString_CheckExact(dirname):
505
        raise TypeError("you must pass a string for dirname not: %s %r"
506
                        % (type(dirname), dirname))
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
507
    if hi is None:
508
        _hi = len(dirblocks)
509
    else:
510
        _hi = hi
511
512
    _lo = lo
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
513
    dirname_cstr = PyString_AsString(dirname)
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
514
    dirname_size = PyString_Size(dirname)
515
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
516
    while _lo < _hi:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
517
        _mid = (_lo + _hi) / 2
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
518
        # Grab the dirname for the current dirblock
2474.1.12 by John Arbash Meinel
Clean up bisect_dirstate to not use temporary variables.
519
        # cur = dirblocks[_mid][0]
520
        cur = PyTuple_GetItem_void_void(
521
                PyList_GetItem_object_void(dirblocks, _mid), 0)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
522
        cur_cstr = PyString_AS_STRING_void(cur)
2474.1.16 by John Arbash Meinel
Shave off maybe 10% by using the PyString_* macros instead of functions.
523
        cur_size = PyString_GET_SIZE_void(cur)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
524
        if _cmp_by_dirs(cur_cstr, cur_size, dirname_cstr, dirname_size) < 0:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
525
            _lo = _mid + 1
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
526
        else:
527
            _hi = _mid
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
528
    return _lo
529
530
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
531
cdef class Reader:
532
    """Maintain the current location, and return fields as you parse them."""
533
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
534
    cdef object state # The DirState object
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
535
    cdef object text # The overall string object
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
536
    cdef char *text_cstr # Pointer to the beginning of text
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
537
    cdef int text_size # Length of text
538
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
539
    cdef char *end_cstr # End of text
540
    cdef char *cur_cstr # Pointer to the current record
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
541
    cdef char *next # Pointer to the end of this record
542
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
543
    def __init__(self, text, state):
544
        self.state = state
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
545
        self.text = text
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
546
        self.text_cstr = PyString_AsString(text)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
547
        self.text_size = PyString_Size(text)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
548
        self.end_cstr = self.text_cstr + self.text_size
549
        self.cur_cstr = self.text_cstr
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
550
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
551
    cdef char *get_next(self, int *size) except NULL:
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
552
        """Return a pointer to the start of the next field."""
553
        cdef char *next
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
554
        cdef Py_ssize_t extra_len
555
556
        if self.cur_cstr == NULL:
557
            raise AssertionError('get_next() called when cur_str is NULL')
558
        elif self.cur_cstr >= self.end_cstr:
559
            raise AssertionError('get_next() called when there are no chars'
560
                                 ' left')
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
561
        next = self.cur_cstr
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
562
        self.cur_cstr = <char*>memchr(next, c'\0', self.end_cstr - next)
563
        if self.cur_cstr == NULL:
564
            extra_len = self.end_cstr - next
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
565
            raise errors.DirstateCorrupt(self.state,
566
                'failed to find trailing NULL (\\0).'
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
567
                ' Trailing garbage: %r'
568
                % safe_string_from_size(next, extra_len))
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
569
        size[0] = self.cur_cstr - next
570
        self.cur_cstr = self.cur_cstr + 1
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
571
        return next
572
2474.1.53 by John Arbash Meinel
Changing Reader.get_next_str (which returns a Python String)
573
    cdef object get_next_str(self):
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
574
        """Get the next field as a Python string."""
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
575
        cdef int size
576
        cdef char *next
577
        next = self.get_next(&size)
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
578
        return safe_string_from_size(next, size)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
579
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
580
    cdef int _init(self) except -1:
581
        """Get the pointer ready.
582
583
        This assumes that the dirstate header has already been read, and we
584
        already have the dirblock string loaded into memory.
585
        This just initializes our memory pointers, etc for parsing of the
586
        dirblock string.
587
        """
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
588
        cdef char *first
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
589
        cdef int size
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
590
        # The first field should be an empty string left over from the Header
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
591
        first = self.get_next(&size)
592
        if first[0] != c'\0' and size == 0:
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
593
            raise AssertionError('First character should be null not: %s'
594
                                 % (first,))
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
595
        return 0
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
596
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
597
    cdef object _get_entry(self, int num_trees, void **p_current_dirname,
598
                           int *new_block):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
599
        """Extract the next entry.
600
601
        This parses the next entry based on the current location in
602
        ``self.cur_cstr``.
603
        Each entry can be considered a "row" in the total table. And each row
604
        has a fixed number of columns. It is generally broken up into "key"
605
        columns, then "current" columns, and then "parent" columns.
606
607
        :param num_trees: How many parent trees need to be parsed
608
        :param p_current_dirname: A pointer to the current PyString
609
            representing the directory name.
610
            We pass this in as a void * so that pyrex doesn't have to
611
            increment/decrement the PyObject reference counter for each
612
            _get_entry call.
613
            We use a pointer so that _get_entry can update it with the new
614
            value.
615
        :param new_block: This is to let the caller know that it needs to
616
            create a new directory block to store the next entry.
617
        """
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
618
        cdef StaticTuple path_name_file_id_key
619
        cdef StaticTuple tmp
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
620
        cdef char *entry_size_cstr
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
621
        cdef unsigned long int entry_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
622
        cdef char* executable_cstr
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
623
        cdef int is_executable
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
624
        cdef char* dirname_cstr
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
625
        cdef char* trailing
626
        cdef int cur_size
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
627
        cdef int i
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
628
        cdef object minikind
629
        cdef object fingerprint
630
        cdef object info
631
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
632
        # Read the 'key' information (dirname, name, file_id)
633
        dirname_cstr = self.get_next(&cur_size)
634
        # Check to see if we have started a new directory block.
635
        # If so, then we need to create a new dirname PyString, so that it can
636
        # be used in all of the tuples. This saves time and memory, by re-using
637
        # the same object repeatedly.
638
639
        # Do the cheap 'length of string' check first. If the string is a
640
        # different length, then we *have* to be a different directory.
641
        if (cur_size != PyString_GET_SIZE_void(p_current_dirname[0])
642
            or strncmp(dirname_cstr,
643
                       # Extract the char* from our current dirname string.  We
644
                       # know it is a PyString, so we can use
645
                       # PyString_AS_STRING, we use the _void version because
646
                       # we are tricking Pyrex by using a void* rather than an
647
                       # <object>
648
                       PyString_AS_STRING_void(p_current_dirname[0]),
649
                       cur_size+1) != 0):
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
650
            dirname = safe_string_from_size(dirname_cstr, cur_size)
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
651
            p_current_dirname[0] = <void*>dirname
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
652
            new_block[0] = 1
653
        else:
654
            new_block[0] = 0
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
655
656
        # Build up the key that will be used.
657
        # By using <object>(void *) Pyrex will automatically handle the
658
        # Py_INCREF that we need.
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
659
        cur_dirname = <object>p_current_dirname[0]
5361.3.8 by John Arbash Meinel
Per Vincent's request, clean up the code comments.
660
        # Use StaticTuple_New to pre-allocate, rather than creating a regular
661
        # tuple and passing it to the StaticTuple constructor.
662
        # path_name_file_id_key = StaticTuple(<object>p_current_dirname[0],
663
        #                          self.get_next_str(),
664
        #                          self.get_next_str(),
665
        #                         )
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
666
        tmp = StaticTuple_New(3)
667
        Py_INCREF(cur_dirname); StaticTuple_SET_ITEM(tmp, 0, cur_dirname)
5361.3.8 by John Arbash Meinel
Per Vincent's request, clean up the code comments.
668
        cur_basename = self.get_next_str()
669
        cur_file_id = self.get_next_str()
670
        Py_INCREF(cur_basename); StaticTuple_SET_ITEM(tmp, 1, cur_basename)
671
        Py_INCREF(cur_file_id); StaticTuple_SET_ITEM(tmp, 2, cur_file_id)
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
672
        path_name_file_id_key = tmp
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
673
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
674
        # Parse all of the per-tree information. current has the information in
675
        # the same location as parent trees. The only difference is that 'info'
676
        # is a 'packed_stat' for current, while it is a 'revision_id' for
677
        # parent trees.
678
        # minikind, fingerprint, and info will be returned as regular python
679
        # strings
680
        # entry_size and is_executable will be parsed into a python Long and
681
        # python Boolean, respectively.
682
        # TODO: jam 20070718 Consider changin the entry_size conversion to
683
        #       prefer python Int when possible. They are generally faster to
684
        #       work with, and it will be rare that we have a file >2GB.
685
        #       Especially since this code is pretty much fixed at a max of
686
        #       4GB.
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
687
        trees = []
688
        for i from 0 <= i < num_trees:
689
            minikind = self.get_next_str()
690
            fingerprint = self.get_next_str()
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
691
            entry_size_cstr = self.get_next(&cur_size)
692
            entry_size = strtoul(entry_size_cstr, NULL, 10)
693
            executable_cstr = self.get_next(&cur_size)
694
            is_executable = (executable_cstr[0] == c'y')
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
695
            info = self.get_next_str()
5361.3.8 by John Arbash Meinel
Per Vincent's request, clean up the code comments.
696
            # TODO: If we want to use StaticTuple_New here we need to be pretty
697
            #       careful. We are relying on a bit of Pyrex
698
            #       automatic-conversion from 'int' to PyInt, and that doesn't
699
            #       play well with the StaticTuple_SET_ITEM macro.
700
            #       Timing doesn't (yet) show a worthwile improvement in speed
701
            #       versus complexity and maintainability.
5361.3.6 by John Arbash Meinel
Doing the StaticTuple_New dance gets us to 3.37ms. not great.
702
            # tmp = StaticTuple_New(5)
703
            # Py_INCREF(minikind); StaticTuple_SET_ITEM(tmp, 0, minikind)
704
            # Py_INCREF(fingerprint); StaticTuple_SET_ITEM(tmp, 1, fingerprint)
705
            # Py_INCREF(entry_size); StaticTuple_SET_ITEM(tmp, 2, entry_size)
706
            # Py_INCREF(is_executable); StaticTuple_SET_ITEM(tmp, 3, is_executable)
707
            # Py_INCREF(info); StaticTuple_SET_ITEM(tmp, 4, info)
708
            # PyList_Append(trees, tmp)
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
709
            PyList_Append(trees, StaticTuple(
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
710
                minikind,     # minikind
711
                fingerprint,  # fingerprint
712
                entry_size,   # size
713
                is_executable,# executable
714
                info,         # packed_stat or revision_id
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
715
            ))
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
716
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
717
        # The returned tuple is (key, [trees])
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
718
        ret = (path_name_file_id_key, trees)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
719
        # Ignore the trailing newline, but assert that it does exist, this
720
        # ensures that we always finish parsing a line on an end-of-entry
721
        # marker.
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
722
        trailing = self.get_next(&cur_size)
723
        if cur_size != 1 or trailing[0] != c'\n':
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
724
            raise errors.DirstateCorrupt(self.state,
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
725
                'Bad parse, we expected to end on \\n, not: %d %s: %s'
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
726
                % (cur_size, safe_string_from_size(trailing, cur_size),
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
727
                   ret))
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
728
        return ret
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
729
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
730
    def _parse_dirblocks(self):
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
731
        """Parse all dirblocks in the state file."""
732
        cdef int num_trees
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
733
        cdef object current_block
734
        cdef object entry
735
        cdef void * current_dirname
736
        cdef int new_block
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
737
        cdef int expected_entry_count
738
        cdef int entry_count
739
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
740
        num_trees = self.state._num_present_parents() + 1
741
        expected_entry_count = self.state._num_entries
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
742
743
        # Ignore the first record
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
744
        self._init()
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
745
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
746
        current_block = []
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
747
        dirblocks = [('', current_block), ('', [])]
748
        self.state._dirblocks = dirblocks
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
749
        obj = ''
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
750
        current_dirname = <void*>obj
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
751
        new_block = 0
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
752
        entry_count = 0
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
753
2474.1.54 by John Arbash Meinel
Optimize the simple case that the strings are the same object.
754
        # TODO: jam 2007-05-07 Consider pre-allocating some space for the
755
        #       members, and then growing and shrinking from there. If most
756
        #       directories have close to 10 entries in them, it would save a
757
        #       few mallocs if we default our list size to something
758
        #       reasonable. Or we could malloc it to something large (100 or
759
        #       so), and then truncate. That would give us a malloc + realloc,
760
        #       rather than lots of reallocs.
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
761
        while self.cur_cstr < self.end_cstr:
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
762
            entry = self._get_entry(num_trees, &current_dirname, &new_block)
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
763
            if new_block:
764
                # new block - different dirname
765
                current_block = []
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
766
                PyList_Append(dirblocks,
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
767
                              (<object>current_dirname, current_block))
768
            PyList_Append(current_block, entry)
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
769
            entry_count = entry_count + 1
770
        if entry_count != expected_entry_count:
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
771
            raise errors.DirstateCorrupt(self.state,
772
                    'We read the wrong number of entries.'
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
773
                    ' We expected to read %s, but read %s'
774
                    % (expected_entry_count, entry_count))
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
775
        self.state._split_root_dirblock_into_contents()
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
776
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
777
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
778
def _read_dirblocks(state):
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
779
    """Read in the dirblocks for the given DirState object.
780
781
    This is tightly bound to the DirState internal representation. It should be
782
    thought of as a member function, which is only separated out so that we can
783
    re-write it in pyrex.
784
785
    :param state: A DirState object.
786
    :return: None
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
787
    :postcondition: The dirblocks will be loaded into the appropriate fields in
788
        the DirState object.
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
789
    """
790
    state._state_file.seek(state._end_of_header)
791
    text = state._state_file.read()
792
    # TODO: check the crc checksums. crc_measured = zlib.crc32(text)
793
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
794
    reader = Reader(text, state)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
795
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
796
    reader._parse_dirblocks()
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
797
    state._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
798
799
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
800
cdef int minikind_from_mode(int mode): # cannot_raise
3696.4.3 by Robert Collins
Some tuning of update_entry.
801
    # in order of frequency:
802
    if S_ISREG(mode):
803
        return c"f"
804
    if S_ISDIR(mode):
805
        return c"d"
806
    if S_ISLNK(mode):
807
        return c"l"
808
    return 0
809
810
811
_encode = binascii.b2a_base64
812
3696.4.17 by Robert Collins
Review feedback.
813
3696.4.3 by Robert Collins
Some tuning of update_entry.
814
from struct import pack
815
cdef _pack_stat(stat_value):
816
    """return a string representing the stat value's key fields.
817
818
    :param stat_value: A stat oject with st_size, st_mtime, st_ctime, st_dev,
819
        st_ino and st_mode fields.
820
    """
821
    cdef char result[6*4] # 6 long ints
822
    cdef int *aliased
823
    aliased = <int *>result
824
    aliased[0] = htonl(stat_value.st_size)
825
    aliased[1] = htonl(int(stat_value.st_mtime))
826
    aliased[2] = htonl(int(stat_value.st_ctime))
827
    aliased[3] = htonl(stat_value.st_dev)
828
    aliased[4] = htonl(stat_value.st_ino & 0xFFFFFFFF)
829
    aliased[5] = htonl(stat_value.st_mode)
830
    packed = PyString_FromStringAndSize(result, 6*4)
831
    return _encode(packed)[:-1]
832
833
834
def update_entry(self, entry, abspath, stat_value):
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
835
    """Update the entry based on what is actually on disk.
836
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
837
    This function only calculates the sha if it needs to - if the entry is
838
    uncachable, or clearly different to the first parent's entry, no sha
839
    is calculated, and None is returned.
840
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
841
    :param entry: This is the dirblock entry for the file in question.
842
    :param abspath: The path on disk for this file.
843
    :param stat_value: (optional) if we already have done a stat on the
844
        file, re-use it.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
845
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
846
        target of a symlink.
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
847
    """
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
848
    return _update_entry(self, entry, abspath, stat_value)
849
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
850
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
851
cdef _update_entry(self, entry, abspath, stat_value):
852
    """Update the entry based on what is actually on disk.
853
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
854
    This function only calculates the sha if it needs to - if the entry is
855
    uncachable, or clearly different to the first parent's entry, no sha
856
    is calculated, and None is returned.
857
3696.4.17 by Robert Collins
Review feedback.
858
    :param self: The dirstate object this is operating on.
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
859
    :param entry: This is the dirblock entry for the file in question.
860
    :param abspath: The path on disk for this file.
3696.4.17 by Robert Collins
Review feedback.
861
    :param stat_value: The stat value done on the path.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
862
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
863
        target of a symlink.
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
864
    """
3696.4.17 by Robert Collins
Review feedback.
865
    # TODO - require pyrex 0.9.8, then use a pyd file to define access to the
866
    # _st mode of the compiled stat objects.
3696.4.3 by Robert Collins
Some tuning of update_entry.
867
    cdef int minikind, saved_minikind
868
    cdef void * details
869
    minikind = minikind_from_mode(stat_value.st_mode)
870
    if 0 == minikind:
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
871
        return None
872
    packed_stat = _pack_stat(stat_value)
3696.4.3 by Robert Collins
Some tuning of update_entry.
873
    details = PyList_GetItem_void_void(PyTuple_GetItem_void_void(<void *>entry, 1), 0)
874
    saved_minikind = PyString_AsString_obj(<PyObject *>PyTuple_GetItem_void_void(details, 0))[0]
4100.2.5 by Aaron Bentley
Stop resetting minikind to 'd' when comparing.
875
    if minikind == c'd' and saved_minikind == c't':
876
        minikind = c't'
3696.4.3 by Robert Collins
Some tuning of update_entry.
877
    saved_link_or_sha1 = PyTuple_GetItem_void_object(details, 1)
878
    saved_file_size = PyTuple_GetItem_void_object(details, 2)
879
    saved_executable = PyTuple_GetItem_void_object(details, 3)
880
    saved_packed_stat = PyTuple_GetItem_void_object(details, 4)
881
    # Deal with pyrex decrefing the objects
882
    Py_INCREF(saved_link_or_sha1)
883
    Py_INCREF(saved_file_size)
884
    Py_INCREF(saved_executable)
885
    Py_INCREF(saved_packed_stat)
886
    #(saved_minikind, saved_link_or_sha1, saved_file_size,
887
    # saved_executable, saved_packed_stat) = entry[1][0]
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
888
889
    if (minikind == saved_minikind
890
        and packed_stat == saved_packed_stat):
891
        # The stat hasn't changed since we saved, so we can re-use the
892
        # saved sha hash.
3696.4.3 by Robert Collins
Some tuning of update_entry.
893
        if minikind == c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
894
            return None
895
896
        # size should also be in packed_stat
897
        if saved_file_size == stat_value.st_size:
898
            return saved_link_or_sha1
899
900
    # If we have gotten this far, that means that we need to actually
901
    # process this entry.
902
    link_or_sha1 = None
3696.4.3 by Robert Collins
Some tuning of update_entry.
903
    if minikind == c'f':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
904
        executable = self._is_executable(stat_value.st_mode,
905
                                         saved_executable)
906
        if self._cutoff_time is None:
907
            self._sha_cutoff_time()
908
        if (stat_value.st_mtime < self._cutoff_time
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
909
            and stat_value.st_ctime < self._cutoff_time
910
            and len(entry[1]) > 1
911
            and entry[1][1][0] != 'a'):
912
                # Could check for size changes for further optimised
913
                # avoidance of sha1's. However the most prominent case of
914
                # over-shaing is during initial add, which this catches.
915
            link_or_sha1 = self._sha1_file(abspath)
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
916
            entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
917
                           executable, packed_stat)
918
        else:
919
            entry[1][0] = ('f', '', stat_value.st_size,
920
                           executable, DirState.NULLSTAT)
3696.4.3 by Robert Collins
Some tuning of update_entry.
921
    elif minikind == c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
922
        link_or_sha1 = None
923
        entry[1][0] = ('d', '', 0, False, packed_stat)
3696.4.3 by Robert Collins
Some tuning of update_entry.
924
        if saved_minikind != c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
925
            # This changed from something into a directory. Make sure we
926
            # have a directory block for it. This doesn't happen very
927
            # often, so this doesn't have to be super fast.
928
            block_index, entry_index, dir_present, file_present = \
929
                self._get_block_entry_index(entry[0][0], entry[0][1], 0)
930
            self._ensure_block(block_index, entry_index,
3696.4.17 by Robert Collins
Review feedback.
931
                               pathjoin(entry[0][0], entry[0][1]))
3696.4.3 by Robert Collins
Some tuning of update_entry.
932
    elif minikind == c'l':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
933
        link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
934
        if self._cutoff_time is None:
935
            self._sha_cutoff_time()
936
        if (stat_value.st_mtime < self._cutoff_time
937
            and stat_value.st_ctime < self._cutoff_time):
938
            entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
939
                           False, packed_stat)
940
        else:
941
            entry[1][0] = ('l', '', stat_value.st_size,
942
                           False, DirState.NULLSTAT)
943
    self._dirblock_state = DirState.IN_MEMORY_MODIFIED
944
    return link_or_sha1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
945
946
4634.117.6 by John Arbash Meinel
Start going through the test failures.
947
# TODO: Do we want to worry about exceptions here?
948
cdef char _minikind_from_string(object string) except? -1:
3696.4.7 by Robert Collins
More tuning.
949
    """Convert a python string to a char."""
950
    return PyString_AsString(string)[0]
951
952
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
953
cdef object _kind_absent
954
cdef object _kind_file
955
cdef object _kind_directory
956
cdef object _kind_symlink
957
cdef object _kind_relocated
958
cdef object _kind_tree_reference
959
_kind_absent = "absent"
960
_kind_file = "file"
961
_kind_directory = "directory"
962
_kind_symlink = "symlink"
963
_kind_relocated = "relocated"
964
_kind_tree_reference = "tree-reference"
965
966
3696.4.7 by Robert Collins
More tuning.
967
cdef object _minikind_to_kind(char minikind):
968
    """Create a string kind for minikind."""
969
    cdef char _minikind[1]
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
970
    if minikind == c'f':
971
        return _kind_file
972
    elif minikind == c'd':
973
        return _kind_directory
974
    elif minikind == c'a':
975
        return _kind_absent
976
    elif minikind == c'r':
977
        return _kind_relocated
978
    elif minikind == c'l':
979
        return _kind_symlink
980
    elif minikind == c't':
981
        return _kind_tree_reference
3696.4.7 by Robert Collins
More tuning.
982
    _minikind[0] = minikind
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
983
    raise KeyError(PyString_FromStringAndSize(_minikind, 1))
3696.4.7 by Robert Collins
More tuning.
984
985
4634.117.10 by John Arbash Meinel
Change 'no except' to 'cannot_raise'
986
cdef int _versioned_minikind(char minikind): # cannot_raise
3696.4.7 by Robert Collins
More tuning.
987
    """Return non-zero if minikind is in fltd"""
988
    return (minikind == c'f' or
989
            minikind == c'd' or
990
            minikind == c'l' or
991
            minikind == c't')
992
993
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
994
cdef class ProcessEntryC:
995
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
996
    cdef int doing_consistency_expansion
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
997
    cdef object old_dirname_to_file_id # dict
998
    cdef object new_dirname_to_file_id # dict
999
    cdef object last_source_parent
1000
    cdef object last_target_parent
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1001
    cdef int include_unchanged
1002
    cdef int partial
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1003
    cdef object use_filesystem_for_exec
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1004
    cdef object utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1005
    cdef readonly object searched_specific_files
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1006
    cdef readonly object searched_exact_paths
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1007
    cdef object search_specific_files
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1008
    # The parents up to the root of the paths we are searching.
1009
    # After all normal paths are returned, these specific items are returned.
1010
    cdef object search_specific_file_parents
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1011
    cdef object state
1012
    # Current iteration variables:
1013
    cdef object current_root
1014
    cdef object current_root_unicode
1015
    cdef object root_entries
1016
    cdef int root_entries_pos, root_entries_len
1017
    cdef object root_abspath
1018
    cdef int source_index, target_index
1019
    cdef int want_unversioned
1020
    cdef object tree
1021
    cdef object dir_iterator
1022
    cdef int block_index
1023
    cdef object current_block
1024
    cdef int current_block_pos
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1025
    cdef object current_block_list
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1026
    cdef object current_dir_info
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1027
    cdef object current_dir_list
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1028
    cdef object _pending_consistent_entries # list
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1029
    cdef int path_index
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1030
    cdef object root_dir_info
1031
    cdef object bisect_left
3696.4.17 by Robert Collins
Review feedback.
1032
    cdef object pathjoin
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1033
    cdef object fstat
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1034
    # A set of the ids we've output when doing partial output.
1035
    cdef object seen_ids
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1036
    cdef object sha_file
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1037
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1038
    def __init__(self, include_unchanged, use_filesystem_for_exec,
1039
        search_specific_files, state, source_index, target_index,
1040
        want_unversioned, tree):
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1041
        self.doing_consistency_expansion = 0
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1042
        self.old_dirname_to_file_id = {}
1043
        self.new_dirname_to_file_id = {}
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1044
        # Are we doing a partial iter_changes?
1045
        self.partial = set(['']).__ne__(search_specific_files)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1046
        # Using a list so that we can access the values and change them in
1047
        # nested scope. Each one is [path, file_id, entry]
1048
        self.last_source_parent = [None, None]
1049
        self.last_target_parent = [None, None]
4570.2.4 by Robert Collins
Older pyrex compatibility.
1050
        if include_unchanged is None:
1051
            self.include_unchanged = False
1052
        else:
4570.2.9 by Robert Collins
Give a clearer error on bad input to dirstate iter_changes objects.
1053
            self.include_unchanged = int(include_unchanged)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1054
        self.use_filesystem_for_exec = use_filesystem_for_exec
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1055
        self.utf8_decode = cache_utf8._utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1056
        # for all search_indexs in each path at or under each element of
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1057
        # search_specific_files, if the detail is relocated: add the id, and
1058
        # add the relocated path as one to search if its not searched already.
1059
        # If the detail is not relocated, add the id.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1060
        self.searched_specific_files = set()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1061
        # When we search exact paths without expanding downwards, we record
1062
        # that here.
1063
        self.searched_exact_paths = set()
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1064
        self.search_specific_files = search_specific_files
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1065
        # The parents up to the root of the paths we are searching.
1066
        # After all normal paths are returned, these specific items are returned.
1067
        self.search_specific_file_parents = set()
1068
        # The ids we've sent out in the delta.
1069
        self.seen_ids = set()
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1070
        self.state = state
1071
        self.current_root = None
1072
        self.current_root_unicode = None
1073
        self.root_entries = None
1074
        self.root_entries_pos = 0
1075
        self.root_entries_len = 0
1076
        self.root_abspath = None
1077
        if source_index is None:
1078
            self.source_index = -1
1079
        else:
1080
            self.source_index = source_index
1081
        self.target_index = target_index
1082
        self.want_unversioned = want_unversioned
1083
        self.tree = tree
1084
        self.dir_iterator = None
1085
        self.block_index = -1
1086
        self.current_block = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1087
        self.current_block_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1088
        self.current_block_pos = -1
1089
        self.current_dir_info = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1090
        self.current_dir_list = None
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1091
        self._pending_consistent_entries = []
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1092
        self.path_index = 0
1093
        self.root_dir_info = None
1094
        self.bisect_left = bisect.bisect_left
3696.4.17 by Robert Collins
Review feedback.
1095
        self.pathjoin = osutils.pathjoin
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1096
        self.fstat = os.fstat
1097
        self.sha_file = osutils.sha_file
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1098
        if target_index != 0:
1099
            # A lot of code in here depends on target_index == 0
1100
            raise errors.BzrError('unsupported target index')
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1101
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1102
    cdef _process_entry(self, entry, path_info):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1103
        """Compare an entry and real disk to generate delta information.
1104
1105
        :param path_info: top_relpath, basename, kind, lstat, abspath for
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1106
            the path of entry. If None, then the path is considered absent in 
1107
            the target (Perhaps we should pass in a concrete entry for this ?)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1108
            Basename is returned as a utf8 string because we expect this
1109
            tuple will be ignored, and don't want to take the time to
1110
            decode.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1111
        :return: (iter_changes_result, changed). If the entry has not been
1112
            handled then changed is None. Otherwise it is False if no content
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1113
            or metadata changes have occured, and True if any content or
1114
            metadata change has occurred. If self.include_unchanged is True then
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1115
            if changed is not None, iter_changes_result will always be a result
1116
            tuple. Otherwise, iter_changes_result is None unless changed is
1117
            True.
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1118
        """
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1119
        cdef char target_minikind
3696.4.7 by Robert Collins
More tuning.
1120
        cdef char source_minikind
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1121
        cdef object file_id
1122
        cdef int content_change
3696.4.9 by Robert Collins
Reduce lookups in process_entry.
1123
        cdef object details_list
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1124
        file_id = None
3696.4.9 by Robert Collins
Reduce lookups in process_entry.
1125
        details_list = entry[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1126
        if -1 == self.source_index:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1127
            source_details = DirState.NULL_PARENT_DETAILS
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1128
        else:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1129
            source_details = details_list[self.source_index]
1130
        target_details = details_list[self.target_index]
3696.4.7 by Robert Collins
More tuning.
1131
        target_minikind = _minikind_from_string(target_details[0])
1132
        if path_info is not None and _versioned_minikind(target_minikind):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1133
            if self.target_index != 0:
3763.1.1 by Benjamin Peterson
fix two small oversights
1134
                raise AssertionError("Unsupported target index %d" %
1135
                                     self.target_index)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1136
            link_or_sha1 = _update_entry(self.state, entry, path_info[4], path_info[3])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1137
            # The entry may have been modified by update_entry
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1138
            target_details = details_list[self.target_index]
3696.4.7 by Robert Collins
More tuning.
1139
            target_minikind = _minikind_from_string(target_details[0])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1140
        else:
1141
            link_or_sha1 = None
3696.4.7 by Robert Collins
More tuning.
1142
        # the rest of this function is 0.3 seconds on 50K paths, or
1143
        # 0.000006 seconds per call.
1144
        source_minikind = _minikind_from_string(source_details[0])
1145
        if ((_versioned_minikind(source_minikind) or source_minikind == c'r')
1146
            and _versioned_minikind(target_minikind)):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1147
            # claimed content in both: diff
1148
            #   r    | fdlt   |      | add source to search, add id path move and perform
1149
            #        |        |      | diff check on source-target
1150
            #   r    | fdlt   |  a   | dangling file that was present in the basis.
1151
            #        |        |      | ???
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1152
            if source_minikind != c'r':
1153
                old_dirname = entry[0][0]
1154
                old_basename = entry[0][1]
1155
                old_path = path = None
1156
            else:
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1157
                # add the source to the search path to find any children it
1158
                # has.  TODO ? : only add if it is a container ?
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1159
                if (not self.doing_consistency_expansion and 
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1160
                    not osutils.is_inside_any(self.searched_specific_files,
1161
                                             source_details[1])):
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1162
                    self.search_specific_files.add(source_details[1])
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1163
                    # expanding from a user requested path, parent expansion
1164
                    # for delta consistency happens later.
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1165
                # generate the old path; this is needed for stating later
1166
                # as well.
1167
                old_path = source_details[1]
1168
                old_dirname, old_basename = os.path.split(old_path)
3696.4.17 by Robert Collins
Review feedback.
1169
                path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1170
                old_entry = self.state._get_entry(self.source_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1171
                                             path_utf8=old_path)
1172
                # update the source details variable to be the real
1173
                # location.
1174
                if old_entry == (None, None):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1175
                    raise errors.CorruptDirstate(self.state._filename,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1176
                        "entry '%s/%s' is considered renamed from %r"
1177
                        " but source does not exist\n"
1178
                        "entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1179
                source_details = old_entry[1][self.source_index]
3696.4.7 by Robert Collins
More tuning.
1180
                source_minikind = _minikind_from_string(source_details[0])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1181
            if path_info is None:
1182
                # the file is missing on disk, show as removed.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1183
                content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1184
                target_kind = None
1185
                target_exec = False
1186
            else:
1187
                # source and target are both versioned and disk file is present.
1188
                target_kind = path_info[2]
1189
                if target_kind == 'directory':
1190
                    if path is None:
3696.4.17 by Robert Collins
Review feedback.
1191
                        old_path = path = self.pathjoin(old_dirname, old_basename)
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1192
                    file_id = entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1193
                    self.new_dirname_to_file_id[path] = file_id
3696.4.7 by Robert Collins
More tuning.
1194
                    if source_minikind != c'd':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1195
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1196
                    else:
1197
                        # directories have no fingerprint
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1198
                        content_change = 0
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1199
                    target_exec = False
1200
                elif target_kind == 'file':
3696.4.7 by Robert Collins
More tuning.
1201
                    if source_minikind != c'f':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1202
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1203
                    else:
4393.3.2 by Ian Clatworthy
fix pyrex version of _process_entry as well
1204
                        # Check the sha. We can't just rely on the size as
1205
                        # content filtering may mean differ sizes actually
1206
                        # map to the same content
1207
                        if link_or_sha1 is None:
1208
                            # Stat cache miss:
1209
                            statvalue, link_or_sha1 = \
1210
                                self.state._sha1_provider.stat_and_sha1(
1211
                                path_info[4])
1212
                            self.state._observed_sha1(entry, link_or_sha1,
1213
                                statvalue)
1214
                        content_change = (link_or_sha1 != source_details[1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1215
                    # Target details is updated at update_entry time
1216
                    if self.use_filesystem_for_exec:
1217
                        # We don't need S_ISREG here, because we are sure
1218
                        # we are dealing with a file.
1219
                        target_exec = bool(S_IXUSR & path_info[3].st_mode)
1220
                    else:
1221
                        target_exec = target_details[3]
1222
                elif target_kind == 'symlink':
3696.4.7 by Robert Collins
More tuning.
1223
                    if source_minikind != c'l':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1224
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1225
                    else:
1226
                        content_change = (link_or_sha1 != source_details[1])
1227
                    target_exec = False
1228
                elif target_kind == 'tree-reference':
3696.4.7 by Robert Collins
More tuning.
1229
                    if source_minikind != c't':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1230
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1231
                    else:
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1232
                        content_change = 0
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1233
                    target_exec = False
1234
                else:
4634.58.1 by Robert Collins
Show a sensible error when a previously versionable path becomes a FIFO or other unversionable file.
1235
                    if path is None:
1236
                        path = self.pathjoin(old_dirname, old_basename)
1237
                    raise errors.BadFileKindError(path, path_info[2])
3696.4.7 by Robert Collins
More tuning.
1238
            if source_minikind == c'd':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1239
                if path is None:
3696.4.17 by Robert Collins
Review feedback.
1240
                    old_path = path = self.pathjoin(old_dirname, old_basename)
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1241
                if file_id is None:
1242
                    file_id = entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1243
                self.old_dirname_to_file_id[old_path] = file_id
1244
            # parent id is the entry for the path in the target tree
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1245
            if old_basename and old_dirname == self.last_source_parent[0]:
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1246
                # use a cached hit for non-root source entries.
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1247
                source_parent_id = self.last_source_parent[1]
1248
            else:
1249
                try:
1250
                    source_parent_id = self.old_dirname_to_file_id[old_dirname]
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1251
                except KeyError, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1252
                    source_parent_entry = self.state._get_entry(self.source_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1253
                                                           path_utf8=old_dirname)
1254
                    source_parent_id = source_parent_entry[0][2]
1255
                if source_parent_id == entry[0][2]:
1256
                    # This is the root, so the parent is None
1257
                    source_parent_id = None
1258
                else:
1259
                    self.last_source_parent[0] = old_dirname
1260
                    self.last_source_parent[1] = source_parent_id
1261
            new_dirname = entry[0][0]
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1262
            if entry[0][1] and new_dirname == self.last_target_parent[0]:
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1263
                # use a cached hit for non-root target entries.
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1264
                target_parent_id = self.last_target_parent[1]
1265
            else:
1266
                try:
1267
                    target_parent_id = self.new_dirname_to_file_id[new_dirname]
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1268
                except KeyError, _:
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1269
                    # TODO: We don't always need to do the lookup, because the
1270
                    #       parent entry will be the same as the source entry.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1271
                    target_parent_entry = self.state._get_entry(self.target_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1272
                                                           path_utf8=new_dirname)
1273
                    if target_parent_entry == (None, None):
1274
                        raise AssertionError(
1275
                            "Could not find target parent in wt: %s\nparent of: %s"
1276
                            % (new_dirname, entry))
1277
                    target_parent_id = target_parent_entry[0][2]
1278
                if target_parent_id == entry[0][2]:
1279
                    # This is the root, so the parent is None
1280
                    target_parent_id = None
1281
                else:
1282
                    self.last_target_parent[0] = new_dirname
1283
                    self.last_target_parent[1] = target_parent_id
1284
1285
            source_exec = source_details[3]
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1286
            changed = (content_change
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1287
                or source_parent_id != target_parent_id
1288
                or old_basename != entry[0][1]
1289
                or source_exec != target_exec
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1290
                )
1291
            if not changed and not self.include_unchanged:
1292
                return None, False
1293
            else:
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1294
                if old_path is None:
3696.4.17 by Robert Collins
Review feedback.
1295
                    path = self.pathjoin(old_dirname, old_basename)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1296
                    old_path = path
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1297
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1298
                    path_u = old_path_u
1299
                else:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1300
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1301
                    if old_path == path:
1302
                        path_u = old_path_u
1303
                    else:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1304
                        path_u = self.utf8_decode(path)[0]
3696.4.7 by Robert Collins
More tuning.
1305
                source_kind = _minikind_to_kind(source_minikind)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1306
                return (entry[0][2],
1307
                       (old_path_u, path_u),
1308
                       content_change,
1309
                       (True, True),
1310
                       (source_parent_id, target_parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1311
                       (self.utf8_decode(old_basename)[0], self.utf8_decode(entry[0][1])[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1312
                       (source_kind, target_kind),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1313
                       (source_exec, target_exec)), changed
3696.4.7 by Robert Collins
More tuning.
1314
        elif source_minikind == c'a' and _versioned_minikind(target_minikind):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1315
            # looks like a new file
3696.4.17 by Robert Collins
Review feedback.
1316
            path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1317
            # parent id is the entry for the path in the target tree
1318
            # TODO: these are the same for an entire directory: cache em.
4005.1.1 by John Arbash Meinel
Related to bug #328674, give a better error for a corrupt dirstate.
1319
            parent_entry = self.state._get_entry(self.target_index,
1320
                                                 path_utf8=entry[0][0])
1321
            if parent_entry is None:
1322
                raise errors.DirstateCorrupt(self.state,
1323
                    "We could not find the parent entry in index %d"
1324
                    " for the entry: %s"
1325
                    % (self.target_index, entry[0]))
1326
            parent_id = parent_entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1327
            if parent_id == entry[0][2]:
1328
                parent_id = None
1329
            if path_info is not None:
1330
                # Present on disk:
1331
                if self.use_filesystem_for_exec:
1332
                    # We need S_ISREG here, because we aren't sure if this
1333
                    # is a file or not.
1334
                    target_exec = bool(
1335
                        S_ISREG(path_info[3].st_mode)
1336
                        and S_IXUSR & path_info[3].st_mode)
1337
                else:
1338
                    target_exec = target_details[3]
1339
                return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1340
                       (None, self.utf8_decode(path)[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1341
                       True,
1342
                       (False, True),
1343
                       (None, parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1344
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1345
                       (None, path_info[2]),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1346
                       (None, target_exec)), True
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1347
            else:
1348
                # Its a missing file, report it as such.
1349
                return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1350
                       (None, self.utf8_decode(path)[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1351
                       False,
1352
                       (False, True),
1353
                       (None, parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1354
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1355
                       (None, None),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1356
                       (None, False)), True
3696.4.7 by Robert Collins
More tuning.
1357
        elif _versioned_minikind(source_minikind) and target_minikind == c'a':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1358
            # unversioned, possibly, or possibly not deleted: we dont care.
1359
            # if its still on disk, *and* theres no other entry at this
1360
            # path [we dont know this in this routine at the moment -
1361
            # perhaps we should change this - then it would be an unknown.
3696.4.17 by Robert Collins
Review feedback.
1362
            old_path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1363
            # parent id is the entry for the path in the target tree
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1364
            parent_id = self.state._get_entry(self.source_index, path_utf8=entry[0][0])[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1365
            if parent_id == entry[0][2]:
1366
                parent_id = None
1367
            return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1368
                   (self.utf8_decode(old_path)[0], None),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1369
                   True,
1370
                   (True, False),
1371
                   (parent_id, None),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1372
                   (self.utf8_decode(entry[0][1])[0], None),
3696.4.7 by Robert Collins
More tuning.
1373
                   (_minikind_to_kind(source_minikind), None),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1374
                   (source_details[3], None)), True
3696.4.7 by Robert Collins
More tuning.
1375
        elif _versioned_minikind(source_minikind) and target_minikind == c'r':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1376
            # a rename; could be a true rename, or a rename inherited from
1377
            # a renamed parent. TODO: handle this efficiently. Its not
1378
            # common case to rename dirs though, so a correct but slow
1379
            # implementation will do.
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1380
            if (not self.doing_consistency_expansion and 
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1381
                not osutils.is_inside_any(self.searched_specific_files,
1382
                    target_details[1])):
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1383
                self.search_specific_files.add(target_details[1])
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1384
                # We don't expand the specific files parents list here as
1385
                # the path is absent in target and won't create a delta with
1386
                # missing parent.
3696.4.7 by Robert Collins
More tuning.
1387
        elif ((source_minikind == c'r' or source_minikind == c'a') and
1388
              (target_minikind == c'r' or target_minikind == c'a')):
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1389
            # neither of the selected trees contain this path,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1390
            # so skip over it. This is not currently directly tested, but
1391
            # is indirectly via test_too_much.TestCommands.test_conflicts.
1392
            pass
1393
        else:
1394
            raise AssertionError("don't know how to compare "
1395
                "source_minikind=%r, target_minikind=%r"
1396
                % (source_minikind, target_minikind))
1397
            ## import pdb;pdb.set_trace()
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1398
        return None, None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1399
1400
    def __iter__(self):
1401
        return self
1402
1403
    def iter_changes(self):
1404
        return self
1405
4634.117.6 by John Arbash Meinel
Start going through the test failures.
1406
    cdef int _gather_result_for_consistency(self, result) except -1:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1407
        """Check a result we will yield to make sure we are consistent later.
1408
        
1409
        This gathers result's parents into a set to output later.
1410
1411
        :param result: A result tuple.
1412
        """
1413
        if not self.partial or not result[0]:
4634.117.6 by John Arbash Meinel
Start going through the test failures.
1414
            return 0
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1415
        self.seen_ids.add(result[0])
1416
        new_path = result[1][1]
1417
        if new_path:
1418
            # Not the root and not a delete: queue up the parents of the path.
1419
            self.search_specific_file_parents.update(
1420
                osutils.parent_directories(new_path.encode('utf8')))
1421
            # Add the root directory which parent_directories does not
1422
            # provide.
1423
            self.search_specific_file_parents.add('')
4634.117.6 by John Arbash Meinel
Start going through the test failures.
1424
        return 0
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1425
4634.117.1 by John Arbash Meinel
Fix bug #495023, _update_current_block should not supress exceptions.
1426
    cdef int _update_current_block(self) except -1:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1427
        if (self.block_index < len(self.state._dirblocks) and
1428
            osutils.is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):
1429
            self.current_block = self.state._dirblocks[self.block_index]
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1430
            self.current_block_list = self.current_block[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1431
            self.current_block_pos = 0
1432
        else:
1433
            self.current_block = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1434
            self.current_block_list = None
4634.117.1 by John Arbash Meinel
Fix bug #495023, _update_current_block should not supress exceptions.
1435
        return 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1436
1437
    def __next__(self):
1438
        # Simple thunk to allow tail recursion without pyrex confusion
1439
        return self._iter_next()
1440
1441
    cdef _iter_next(self):
1442
        """Iterate over the changes."""
1443
        # This function single steps through an iterator. As such while loops
1444
        # are often exited by 'return' - the code is structured so that the
1445
        # next call into the function will return to the same while loop. Note
1446
        # that all flow control needed to re-reach that step is reexecuted,
1447
        # which can be a performance problem. It has not yet been tuned to
1448
        # minimise this; a state machine is probably the simplest restructuring
1449
        # to both minimise this overhead and make the code considerably more
1450
        # understandable.
1451
1452
        # sketch: 
1453
        # compare source_index and target_index at or under each element of search_specific_files.
1454
        # follow the following comparison table. Note that we only want to do diff operations when
1455
        # the target is fdl because thats when the walkdirs logic will have exposed the pathinfo 
1456
        # for the target.
1457
        # cases:
1458
        # 
1459
        # Source | Target | disk | action
1460
        #   r    | fdlt   |      | add source to search, add id path move and perform
1461
        #        |        |      | diff check on source-target
1462
        #   r    | fdlt   |  a   | dangling file that was present in the basis. 
1463
        #        |        |      | ???
1464
        #   r    |  a     |      | add source to search
1465
        #   r    |  a     |  a   | 
1466
        #   r    |  r     |      | this path is present in a non-examined tree, skip.
1467
        #   r    |  r     |  a   | this path is present in a non-examined tree, skip.
1468
        #   a    | fdlt   |      | add new id
1469
        #   a    | fdlt   |  a   | dangling locally added file, skip
1470
        #   a    |  a     |      | not present in either tree, skip
1471
        #   a    |  a     |  a   | not present in any tree, skip
1472
        #   a    |  r     |      | not present in either tree at this path, skip as it
1473
        #        |        |      | may not be selected by the users list of paths.
1474
        #   a    |  r     |  a   | not present in either tree at this path, skip as it
1475
        #        |        |      | may not be selected by the users list of paths.
1476
        #  fdlt  | fdlt   |      | content in both: diff them
1477
        #  fdlt  | fdlt   |  a   | deleted locally, but not unversioned - show as deleted ?
1478
        #  fdlt  |  a     |      | unversioned: output deleted id for now
1479
        #  fdlt  |  a     |  a   | unversioned and deleted: output deleted id
1480
        #  fdlt  |  r     |      | relocated in this tree, so add target to search.
1481
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
1482
        #        |        |      | this id at the other path.
1483
        #  fdlt  |  r     |  a   | relocated in this tree, so add target to search.
1484
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
1485
        #        |        |      | this id at the other path.
1486
1487
        # TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1488
        #       keeping a cache of directories that we have seen.
1489
        cdef object current_dirname, current_blockname
1490
        cdef char * current_dirname_c, * current_blockname_c
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1491
        cdef int advance_entry, advance_path
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1492
        cdef int path_handled
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1493
        searched_specific_files = self.searched_specific_files
1494
        # Are we walking a root?
1495
        while self.root_entries_pos < self.root_entries_len:
1496
            entry = self.root_entries[self.root_entries_pos]
1497
            self.root_entries_pos = self.root_entries_pos + 1
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1498
            result, changed = self._process_entry(entry, self.root_dir_info)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1499
            if changed is not None:
1500
                if changed:
1501
                    self._gather_result_for_consistency(result)
1502
                if changed or self.include_unchanged:
1503
                    return result
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1504
        # Have we finished the prior root, or never started one ?
1505
        if self.current_root is None:
1506
            # TODO: the pending list should be lexically sorted?  the
1507
            # interface doesn't require it.
1508
            try:
1509
                self.current_root = self.search_specific_files.pop()
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1510
            except KeyError, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1511
                raise StopIteration()
1512
            self.searched_specific_files.add(self.current_root)
1513
            # process the entries for this containing directory: the rest will be
1514
            # found by their parents recursively.
1515
            self.root_entries = self.state._entries_for_path(self.current_root)
1516
            self.root_entries_len = len(self.root_entries)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1517
            self.current_root_unicode = self.current_root.decode('utf8')
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1518
            self.root_abspath = self.tree.abspath(self.current_root_unicode)
1519
            try:
1520
                root_stat = os.lstat(self.root_abspath)
1521
            except OSError, e:
1522
                if e.errno == errno.ENOENT:
1523
                    # the path does not exist: let _process_entry know that.
1524
                    self.root_dir_info = None
1525
                else:
1526
                    # some other random error: hand it up.
1527
                    raise
1528
            else:
1529
                self.root_dir_info = ('', self.current_root,
1530
                    osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1531
                    self.root_abspath)
1532
                if self.root_dir_info[2] == 'directory':
1533
                    if self.tree._directory_is_tree_reference(
1534
                        self.current_root_unicode):
1535
                        self.root_dir_info = self.root_dir_info[:2] + \
1536
                            ('tree-reference',) + self.root_dir_info[3:]
1537
            if not self.root_entries and not self.root_dir_info:
1538
                # this specified path is not present at all, skip it.
1539
                # (tail recursion, can do a loop once the full structure is
1540
                # known).
1541
                return self._iter_next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1542
            path_handled = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1543
            self.root_entries_pos = 0
1544
            # XXX Clarity: This loop is duplicated a out the self.current_root
1545
            # is None guard above: if we return from it, it completes there
1546
            # (and the following if block cannot trigger because
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1547
            # path_handled must be true, so the if block is not # duplicated.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1548
            while self.root_entries_pos < self.root_entries_len:
1549
                entry = self.root_entries[self.root_entries_pos]
1550
                self.root_entries_pos = self.root_entries_pos + 1
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1551
                result, changed = self._process_entry(entry, self.root_dir_info)
1552
                if changed is not None:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1553
                    path_handled = -1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1554
                    if changed:
1555
                        self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1556
                    if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1557
                        return result
1558
            # handle unversioned specified paths:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1559
            if self.want_unversioned and not path_handled and self.root_dir_info:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1560
                new_executable = bool(
1561
                    stat.S_ISREG(self.root_dir_info[3].st_mode)
1562
                    and stat.S_IEXEC & self.root_dir_info[3].st_mode)
1563
                return (None,
1564
                       (None, self.current_root_unicode),
1565
                       True,
1566
                       (False, False),
1567
                       (None, None),
1568
                       (None, splitpath(self.current_root_unicode)[-1]),
1569
                       (None, self.root_dir_info[2]),
1570
                       (None, new_executable)
1571
                      )
1572
            # If we reach here, the outer flow continues, which enters into the
1573
            # per-root setup logic.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1574
        if (self.current_dir_info is None and self.current_block is None and not
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1575
            self.doing_consistency_expansion):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1576
            # setup iteration of this root:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1577
            self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1578
            if self.root_dir_info and self.root_dir_info[2] == 'tree-reference':
1579
                self.current_dir_info = None
1580
            else:
1581
                self.dir_iterator = osutils._walkdirs_utf8(self.root_abspath,
1582
                    prefix=self.current_root)
1583
                self.path_index = 0
1584
                try:
1585
                    self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1586
                    self.current_dir_list = self.current_dir_info[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1587
                except OSError, e:
1588
                    # there may be directories in the inventory even though
1589
                    # this path is not a file on disk: so mark it as end of
1590
                    # iterator
1591
                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
1592
                        self.current_dir_info = None
1593
                    elif sys.platform == 'win32':
1594
                        # on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
1595
                        # python 2.5 has e.errno == EINVAL,
1596
                        #            and e.winerror == ERROR_DIRECTORY
1597
                        try:
1598
                            e_winerror = e.winerror
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1599
                        except AttributeError, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1600
                            e_winerror = None
1601
                        win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
1602
                        if (e.errno in win_errors or e_winerror in win_errors):
1603
                            self.current_dir_info = None
1604
                        else:
1605
                            # Will this really raise the right exception ?
1606
                            raise
1607
                    else:
1608
                        raise
1609
                else:
1610
                    if self.current_dir_info[0][0] == '':
1611
                        # remove .bzr from iteration
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1612
                        bzr_index = self.bisect_left(self.current_dir_list, ('.bzr',))
1613
                        if self.current_dir_list[bzr_index][0] != '.bzr':
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1614
                            raise AssertionError()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1615
                        del self.current_dir_list[bzr_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1616
            initial_key = (self.current_root, '', '')
1617
            self.block_index, _ = self.state._find_block_index_from_key(initial_key)
1618
            if self.block_index == 0:
1619
                # we have processed the total root already, but because the
1620
                # initial key matched it we should skip it here.
1621
                self.block_index = self.block_index + 1
1622
            self._update_current_block()
1623
        # walk until both the directory listing and the versioned metadata
1624
        # are exhausted. 
1625
        while (self.current_dir_info is not None
1626
            or self.current_block is not None):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1627
            # Uncommon case - a missing directory or an unversioned directory:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1628
            if (self.current_dir_info and self.current_block
1629
                and self.current_dir_info[0][0] != self.current_block[0]):
1630
                # Work around pyrex broken heuristic - current_dirname has
1631
                # the same scope as current_dirname_c
1632
                current_dirname = self.current_dir_info[0][0]
1633
                current_dirname_c = PyString_AS_STRING_void(
1634
                    <void *>current_dirname)
1635
                current_blockname = self.current_block[0]
1636
                current_blockname_c = PyString_AS_STRING_void(
1637
                    <void *>current_blockname)
1638
                # In the python generator we evaluate this if block once per
1639
                # dir+block; because we reenter in the pyrex version its being
1640
                # evaluated once per path: we could cache the result before
1641
                # doing the while loop and probably save time.
1642
                if _cmp_by_dirs(current_dirname_c,
1643
                    PyString_Size(current_dirname),
1644
                    current_blockname_c,
1645
                    PyString_Size(current_blockname)) < 0:
1646
                    # filesystem data refers to paths not covered by the
1647
                    # dirblock.  this has two possibilities:
1648
                    # A) it is versioned but empty, so there is no block for it
1649
                    # B) it is not versioned.
1650
1651
                    # if (A) then we need to recurse into it to check for
1652
                    # new unknown files or directories.
1653
                    # if (B) then we should ignore it, because we don't
1654
                    # recurse into unknown directories.
1655
                    # We are doing a loop
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1656
                    while self.path_index < len(self.current_dir_list):
1657
                        current_path_info = self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1658
                        # dont descend into this unversioned path if it is
1659
                        # a dir
1660
                        if current_path_info[2] in ('directory',
1661
                                                    'tree-reference'):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1662
                            del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1663
                            self.path_index = self.path_index - 1
1664
                        self.path_index = self.path_index + 1
1665
                        if self.want_unversioned:
1666
                            if current_path_info[2] == 'directory':
1667
                                if self.tree._directory_is_tree_reference(
1668
                                    self.utf8_decode(current_path_info[0])[0]):
1669
                                    current_path_info = current_path_info[:2] + \
1670
                                        ('tree-reference',) + current_path_info[3:]
1671
                            new_executable = bool(
1672
                                stat.S_ISREG(current_path_info[3].st_mode)
1673
                                and stat.S_IEXEC & current_path_info[3].st_mode)
1674
                            return (None,
1675
                                (None, self.utf8_decode(current_path_info[0])[0]),
1676
                                True,
1677
                                (False, False),
1678
                                (None, None),
1679
                                (None, self.utf8_decode(current_path_info[1])[0]),
1680
                                (None, current_path_info[2]),
1681
                                (None, new_executable))
1682
                    # This dir info has been handled, go to the next
1683
                    self.path_index = 0
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1684
                    self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1685
                    try:
1686
                        self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1687
                        self.current_dir_list = self.current_dir_info[1]
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1688
                    except StopIteration, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1689
                        self.current_dir_info = None
1690
                else: #(dircmp > 0)
1691
                    # We have a dirblock entry for this location, but there
1692
                    # is no filesystem path for this. This is most likely
1693
                    # because a directory was removed from the disk.
1694
                    # We don't have to report the missing directory,
1695
                    # because that should have already been handled, but we
1696
                    # need to handle all of the files that are contained
1697
                    # within.
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1698
                    while self.current_block_pos < len(self.current_block_list):
1699
                        current_entry = self.current_block_list[self.current_block_pos]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1700
                        self.current_block_pos = self.current_block_pos + 1
1701
                        # entry referring to file not present on disk.
1702
                        # advance the entry only, after processing.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1703
                        result, changed = self._process_entry(current_entry, None)
1704
                        if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1705
                            if changed:
1706
                                self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1707
                            if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1708
                                return result
1709
                    self.block_index = self.block_index + 1
1710
                    self._update_current_block()
1711
                continue # next loop-on-block/dir
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1712
            result = self._loop_one_block()
1713
            if result is not None:
1714
                return result
1715
        if len(self.search_specific_files):
1716
            # More supplied paths to process
1717
            self.current_root = None
1718
            return self._iter_next()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1719
        # Start expanding more conservatively, adding paths the user may not
1720
        # have intended but required for consistent deltas.
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1721
        self.doing_consistency_expansion = 1
1722
        if not self._pending_consistent_entries:
1723
            self._pending_consistent_entries = self._next_consistent_entries()
1724
        while self._pending_consistent_entries:
1725
            result, changed = self._pending_consistent_entries.pop()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1726
            if changed is not None:
1727
                return result
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1728
        raise StopIteration()
1729
1730
    cdef object _maybe_tree_ref(self, current_path_info):
1731
        if self.tree._directory_is_tree_reference(
1732
            self.utf8_decode(current_path_info[0])[0]):
1733
            return current_path_info[:2] + \
1734
                ('tree-reference',) + current_path_info[3:]
1735
        else:
1736
            return current_path_info
1737
1738
    cdef object _loop_one_block(self):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1739
            # current_dir_info and current_block refer to the same directory -
1740
            # this is the common case code.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1741
            # Assign local variables for current path and entry:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1742
            cdef object current_entry
1743
            cdef object current_path_info
1744
            cdef int path_handled
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1745
            cdef char minikind
1746
            cdef int cmp_result
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1747
            # cdef char * temp_str
1748
            # cdef Py_ssize_t temp_str_length
1749
            # PyString_AsStringAndSize(disk_kind, &temp_str, &temp_str_length)
1750
            # if not strncmp(temp_str, "directory", temp_str_length):
1751
            if (self.current_block is not None and
1752
                self.current_block_pos < PyList_GET_SIZE(self.current_block_list)):
1753
                current_entry = PyList_GET_ITEM(self.current_block_list,
1754
                    self.current_block_pos)
1755
                # accomodate pyrex
1756
                Py_INCREF(current_entry)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1757
            else:
1758
                current_entry = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1759
            if (self.current_dir_info is not None and
1760
                self.path_index < PyList_GET_SIZE(self.current_dir_list)):
1761
                current_path_info = PyList_GET_ITEM(self.current_dir_list,
1762
                    self.path_index)
1763
                # accomodate pyrex
1764
                Py_INCREF(current_path_info)
1765
                disk_kind = PyTuple_GET_ITEM(current_path_info, 2)
1766
                # accomodate pyrex
1767
                Py_INCREF(disk_kind)
1768
                if disk_kind == "directory":
1769
                    current_path_info = self._maybe_tree_ref(current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1770
            else:
1771
                current_path_info = None
1772
            while (current_entry is not None or current_path_info is not None):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1773
                advance_entry = -1
1774
                advance_path = -1
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1775
                result = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1776
                path_handled = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1777
                if current_entry is None:
1778
                    # unversioned -  the check for path_handled when the path
1779
                    # is advanced will yield this path if needed.
1780
                    pass
1781
                elif current_path_info is None:
1782
                    # no path is fine: the per entry code will handle it.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1783
                    result, changed = self._process_entry(current_entry,
1784
                        current_path_info)
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1785
                else:
1786
                    minikind = _minikind_from_string(
1787
                        current_entry[1][self.target_index][0])
1788
                    cmp_result = cmp(current_path_info[1], current_entry[0][1])
1789
                    if (cmp_result or minikind == c'a' or minikind == c'r'):
1790
                        # The current path on disk doesn't match the dirblock
1791
                        # record. Either the dirblock record is marked as
1792
                        # absent/renamed, or the file on disk is not present at all
1793
                        # in the dirblock. Either way, report about the dirblock
1794
                        # entry, and let other code handle the filesystem one.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1795
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1796
                        # Compare the basename for these files to determine
1797
                        # which comes first
1798
                        if cmp_result < 0:
1799
                            # extra file on disk: pass for now, but only
1800
                            # increment the path, not the entry
1801
                            advance_entry = 0
1802
                        else:
1803
                            # entry referring to file not present on disk.
1804
                            # advance the entry only, after processing.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1805
                            result, changed = self._process_entry(current_entry,
1806
                                None)
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1807
                            advance_path = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1808
                    else:
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1809
                        # paths are the same,and the dirstate entry is not
1810
                        # absent or renamed.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
1811
                        result, changed = self._process_entry(current_entry,
1812
                            current_path_info)
1813
                        if changed is not None:
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1814
                            path_handled = -1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1815
                            if not changed and not self.include_unchanged:
1816
                                changed = None
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1817
                # >- loop control starts here:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1818
                # >- entry
1819
                if advance_entry and current_entry is not None:
1820
                    self.current_block_pos = self.current_block_pos + 1
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1821
                    if self.current_block_pos < PyList_GET_SIZE(self.current_block_list):
1822
                        current_entry = self.current_block_list[self.current_block_pos]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1823
                    else:
1824
                        current_entry = None
1825
                # >- path
1826
                if advance_path and current_path_info is not None:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1827
                    if not path_handled:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1828
                        # unversioned in all regards
1829
                        if self.want_unversioned:
1830
                            new_executable = bool(
1831
                                stat.S_ISREG(current_path_info[3].st_mode)
1832
                                and stat.S_IEXEC & current_path_info[3].st_mode)
1833
                            try:
1834
                                relpath_unicode = self.utf8_decode(current_path_info[0])[0]
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1835
                            except UnicodeDecodeError, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1836
                                raise errors.BadFilenameEncoding(
1837
                                    current_path_info[0], osutils._fs_enc)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1838
                            if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1839
                                raise AssertionError(
1840
                                    "result is not None: %r" % result)
1841
                            result = (None,
1842
                                (None, relpath_unicode),
1843
                                True,
1844
                                (False, False),
1845
                                (None, None),
1846
                                (None, self.utf8_decode(current_path_info[1])[0]),
1847
                                (None, current_path_info[2]),
1848
                                (None, new_executable))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1849
                            changed = True
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1850
                        # dont descend into this unversioned path if it is
1851
                        # a dir
1852
                        if current_path_info[2] in ('directory'):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1853
                            del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1854
                            self.path_index = self.path_index - 1
1855
                    # dont descend the disk iterator into any tree 
1856
                    # paths.
1857
                    if current_path_info[2] == 'tree-reference':
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1858
                        del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1859
                        self.path_index = self.path_index - 1
1860
                    self.path_index = self.path_index + 1
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1861
                    if self.path_index < len(self.current_dir_list):
1862
                        current_path_info = self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1863
                        if current_path_info[2] == 'directory':
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1864
                            current_path_info = self._maybe_tree_ref(
1865
                                current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1866
                    else:
1867
                        current_path_info = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1868
                if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1869
                    # Found a result on this pass, yield it
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1870
                    if changed:
1871
                        self._gather_result_for_consistency(result)
1872
                    if changed or self.include_unchanged:
1873
                        return result
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1874
            if self.current_block is not None:
1875
                self.block_index = self.block_index + 1
1876
                self._update_current_block()
1877
            if self.current_dir_info is not None:
1878
                self.path_index = 0
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1879
                self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1880
                try:
1881
                    self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1882
                    self.current_dir_list = self.current_dir_info[1]
4634.153.1 by John Arbash Meinel
Workaround a bug (#582656) in recent versions of Pyrex.
1883
                except StopIteration, _:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1884
                    self.current_dir_info = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1885
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1886
    cdef object _next_consistent_entries(self):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1887
        """Grabs the next specific file parent case to consider.
1888
        
1889
        :return: A list of the results, each of which is as for _process_entry.
1890
        """
1891
        results = []
1892
        while self.search_specific_file_parents:
1893
            # Process the parent directories for the paths we were iterating.
1894
            # Even in extremely large trees this should be modest, so currently
1895
            # no attempt is made to optimise.
1896
            path_utf8 = self.search_specific_file_parents.pop()
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1897
            if path_utf8 in self.searched_exact_paths:
1898
                # We've examined this path.
1899
                continue
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1900
            if osutils.is_inside_any(self.searched_specific_files, path_utf8):
1901
                # We've examined this path.
1902
                continue
1903
            path_entries = self.state._entries_for_path(path_utf8)
1904
            # We need either one or two entries. If the path in
1905
            # self.target_index has moved (so the entry in source_index is in
1906
            # 'ar') then we need to also look for the entry for this path in
1907
            # self.source_index, to output the appropriate delete-or-rename.
1908
            selected_entries = []
1909
            found_item = False
1910
            for candidate_entry in path_entries:
1911
                # Find entries present in target at this path:
1912
                if candidate_entry[1][self.target_index][0] not in 'ar':
1913
                    found_item = True
1914
                    selected_entries.append(candidate_entry)
1915
                # Find entries present in source at this path:
1916
                elif (self.source_index is not None and
1917
                    candidate_entry[1][self.source_index][0] not in 'ar'):
1918
                    found_item = True
1919
                    if candidate_entry[1][self.target_index][0] == 'a':
1920
                        # Deleted, emit it here.
1921
                        selected_entries.append(candidate_entry)
1922
                    else:
1923
                        # renamed, emit it when we process the directory it
1924
                        # ended up at.
1925
                        self.search_specific_file_parents.add(
1926
                            candidate_entry[1][self.target_index][1])
1927
            if not found_item:
1928
                raise AssertionError(
1929
                    "Missing entry for specific path parent %r, %r" % (
1930
                    path_utf8, path_entries))
1931
            path_info = self._path_info(path_utf8, path_utf8.decode('utf8'))
1932
            for entry in selected_entries:
1933
                if entry[0][2] in self.seen_ids:
1934
                    continue
1935
                result, changed = self._process_entry(entry, path_info)
1936
                if changed is None:
1937
                    raise AssertionError(
1938
                        "Got entry<->path mismatch for specific path "
1939
                        "%r entry %r path_info %r " % (
1940
                        path_utf8, entry, path_info))
1941
                # Only include changes - we're outside the users requested
1942
                # expansion.
1943
                if changed:
1944
                    self._gather_result_for_consistency(result)
1945
                    if (result[6][0] == 'directory' and
1946
                        result[6][1] != 'directory'):
1947
                        # This stopped being a directory, the old children have
1948
                        # to be included.
1949
                        if entry[1][self.source_index][0] == 'r':
1950
                            # renamed, take the source path
1951
                            entry_path_utf8 = entry[1][self.source_index][1]
1952
                        else:
1953
                            entry_path_utf8 = path_utf8
1954
                        initial_key = (entry_path_utf8, '', '')
1955
                        block_index, _ = self.state._find_block_index_from_key(
1956
                            initial_key)
1957
                        if block_index == 0:
1958
                            # The children of the root are in block index 1.
4570.2.4 by Robert Collins
Older pyrex compatibility.
1959
                            block_index = block_index + 1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1960
                        current_block = None
1961
                        if block_index < len(self.state._dirblocks):
1962
                            current_block = self.state._dirblocks[block_index]
1963
                            if not osutils.is_inside(
1964
                                entry_path_utf8, current_block[0]):
1965
                                # No entries for this directory at all.
1966
                                current_block = None
1967
                        if current_block is not None:
1968
                            for entry in current_block[1]:
1969
                                if entry[1][self.source_index][0] in 'ar':
1970
                                    # Not in the source tree, so doesn't have to be
1971
                                    # included.
1972
                                    continue
1973
                                # Path of the entry itself.
1974
                                self.search_specific_file_parents.add(
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1975
                                    self.pathjoin(*entry[0][:2]))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1976
                if changed or self.include_unchanged:
1977
                    results.append((result, changed))
1978
            self.searched_exact_paths.add(path_utf8)
1979
        return results
1980
1981
    cdef object _path_info(self, utf8_path, unicode_path):
1982
        """Generate path_info for unicode_path.
1983
1984
        :return: None if unicode_path does not exist, or a path_info tuple.
1985
        """
1986
        abspath = self.tree.abspath(unicode_path)
1987
        try:
1988
            stat = os.lstat(abspath)
1989
        except OSError, e:
1990
            if e.errno == errno.ENOENT:
1991
                # the path does not exist.
1992
                return None
1993
            else:
1994
                raise
1995
        utf8_basename = utf8_path.rsplit('/', 1)[-1]
1996
        dir_info = (utf8_path, utf8_basename,
1997
            osutils.file_kind_from_stat_mode(stat.st_mode), stat,
1998
            abspath)
1999
        if dir_info[2] == 'directory':
2000
            if self.tree._directory_is_tree_reference(
2001
                unicode_path):
2002
                self.root_dir_info = self.root_dir_info[:2] + \
2003
                    ('tree-reference',) + self.root_dir_info[3:]
2004
        return dir_info