~bzr-pqm/bzr/bzr.dev

3640.2.4 by John Arbash Meinel
Copyright updates
1
# Copyright (C) 2007, 2008 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
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
31
from bzrlib.osutils import pathjoin, splitpath
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
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
57
cdef extern from "_dirstate_helpers_c.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
121
122
cdef void* _my_memrchr(void *s, int c, size_t n):
123
    # 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
124
    cdef char *pos
125
    cdef char *start
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
126
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
127
    start = <char*>s
128
    pos = start + n - 1
129
    while pos >= start:
130
        if pos[0] == c:
131
            return <void*>pos
132
        pos = pos - 1
133
    return NULL
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
134
135
136
def _py_memrchr(s, c):
137
    """Just to expose _my_memrchr for testing.
138
139
    :param s: The Python string to search
140
    :param c: The character to search for
141
    :return: The offset to the last instance of 'c' in s
142
    """
143
    cdef void *_s
144
    cdef void *found
145
    cdef int length
146
    cdef char *_c
147
148
    _s = PyString_AsString(s)
149
    length = PyString_Size(s)
150
151
    _c = PyString_AsString(c)
152
    assert PyString_Size(c) == 1,\
153
        'Must be a single character string, not %s' % (c,)
154
    found = _my_memrchr(_s, _c[0], length)
155
    if found == NULL:
156
        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
157
    return <char*>found - <char*>_s
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
158
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
159
cdef object safe_string_from_size(char *s, Py_ssize_t size):
160
    if size < 0:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
161
        # XXX: On 64-bit machines the <int> cast causes a C compiler warning.
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
162
        raise AssertionError(
163
            'tried to create a string with an invalid size: %d @0x%x'
164
            % (size, <int>s))
165
    return PyString_FromStringAndSize(s, size)
166
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
167
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
168
cdef int _is_aligned(void *ptr):
169
    """Is this pointer aligned to an integer size offset?
170
171
    :return: 1 if this pointer is aligned, 0 otherwise.
172
    """
173
    return ((<intptr_t>ptr) & ((sizeof(int))-1)) == 0
174
175
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
176
cdef int _cmp_by_dirs(char *path1, int size1, char *path2, int size2):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
177
    cdef unsigned char *cur1
178
    cdef unsigned char *cur2
179
    cdef unsigned char *end1
180
    cdef unsigned char *end2
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
181
    cdef int *cur_int1
182
    cdef int *cur_int2
183
    cdef int *end_int1
184
    cdef int *end_int2
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
185
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
186
    if path1 == path2 and size1 == size2:
2474.1.54 by John Arbash Meinel
Optimize the simple case that the strings are the same object.
187
        return 0
188
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
189
    end1 = <unsigned char*>path1+size1
190
    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
191
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
192
    # Use 32-bit comparisons for the matching portion of the string.
193
    # Almost all CPU's are faster at loading and comparing 32-bit integers,
194
    # than they are at 8-bit integers.
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
195
    # 99% of the time, these will be aligned, but in case they aren't just skip
196
    # this loop
197
    if _is_aligned(path1) and _is_aligned(path2):
198
        cur_int1 = <int*>path1
199
        cur_int2 = <int*>path2
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
200
        end_int1 = <int*>(path1 + size1 - (size1 % sizeof(int)))
201
        end_int2 = <int*>(path2 + size2 - (size2 % sizeof(int)))
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
202
203
        while cur_int1 < end_int1 and cur_int2 < end_int2:
204
            if cur_int1[0] != cur_int2[0]:
205
                break
206
            cur_int1 = cur_int1 + 1
207
            cur_int2 = cur_int2 + 1
208
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
209
        cur1 = <unsigned char*>cur_int1
210
        cur2 = <unsigned char*>cur_int2
2474.1.69 by John Arbash Meinel
Thanks to Jan 'RedBully' Seiffert, some review cleanups
211
    else:
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
212
        cur1 = <unsigned char*>path1
213
        cur2 = <unsigned char*>path2
2474.1.18 by John Arbash Meinel
Add an integer-size comparison loop at the begining, and
214
2474.1.17 by John Arbash Meinel
Using a custom loop seems to be the same speed, but is probably
215
    while cur1 < end1 and cur2 < end2:
216
        if cur1[0] == cur2[0]:
217
            # This character matches, just go to the next one
218
            cur1 = cur1 + 1
219
            cur2 = cur2 + 1
220
            continue
221
        # The current characters do not match
222
        if cur1[0] == c'/':
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
223
            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
224
        elif cur2[0] == c'/':
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
225
            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
226
        elif cur1[0] < cur2[0]:
227
            return -1
228
        else:
229
            return 1
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
230
231
    # 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
232
    if cur1 < end1:
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
233
        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
234
    if cur2 < end2:
2474.1.19 by John Arbash Meinel
Clean up _cmp_dirblock_strings_alt to make it the default.
235
        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
236
    # We reached the end of both strings
237
    return 0
238
239
2474.1.47 by John Arbash Meinel
Change the names of the functions from c_foo and py_foo to foo_c and foo_py
240
def cmp_by_dirs_c(path1, path2):
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
241
    """Compare two paths directory by directory.
242
243
    This is equivalent to doing::
244
245
       cmp(path1.split('/'), path2.split('/'))
246
247
    The idea is that you should compare path components separately. This
248
    differs from plain ``cmp(path1, path2)`` for paths like ``'a-b'`` and
249
    ``a/b``. "a-b" comes after "a" but would come before "a/b" lexically.
250
251
    :param path1: first path
252
    :param path2: second path
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
253
    :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
254
        0 if paths are equal,
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
255
        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
256
    """
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
257
    if not PyString_CheckExact(path1):
258
        raise TypeError("'path1' must be a plain string, not %s: %r"
259
                        % (type(path1), path1))
260
    if not PyString_CheckExact(path2):
261
        raise TypeError("'path2' must be a plain string, not %s: %r"
262
                        % (type(path2), path2))
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
263
    return _cmp_by_dirs(PyString_AsString(path1),
264
                        PyString_Size(path1),
265
                        PyString_AsString(path2),
266
                        PyString_Size(path2))
2474.1.13 by John Arbash Meinel
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
267
268
2474.1.66 by John Arbash Meinel
Some restructuring.
269
def _cmp_path_by_dirblock_c(path1, path2):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
270
    """Compare two paths based on what directory they are in.
271
272
    This generates a sort order, such that all children of a directory are
273
    sorted together, and grandchildren are in the same order as the
274
    children appear. But all grandchildren come after all children.
275
2474.1.66 by John Arbash Meinel
Some restructuring.
276
    In other words, all entries in a directory are sorted together, and
277
    directorys are sorted in cmp_by_dirs order.
278
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
279
    :param path1: first path
280
    :param path2: the second path
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
281
    :return: negative number if ``path1`` comes first,
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
282
        0 if paths are equal
2872.4.10 by Martin Pool
docstrings for cmp_ functions seem to be backwards
283
        and a positive number if ``path2`` sorts first
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
284
    """
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
285
    if not PyString_CheckExact(path1):
286
        raise TypeError("'path1' must be a plain string, not %s: %r"
287
                        % (type(path1), path1))
288
    if not PyString_CheckExact(path2):
289
        raise TypeError("'path2' must be a plain string, not %s: %r"
290
                        % (type(path2), path2))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
291
    return _cmp_path_by_dirblock(PyString_AsString(path1),
292
                                 PyString_Size(path1),
293
                                 PyString_AsString(path2),
294
                                 PyString_Size(path2))
295
296
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
297
cdef int _cmp_path_by_dirblock(char *path1, int path1_len,
298
                               char *path2, int path2_len):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
299
    """Compare two paths by what directory they are in.
300
301
    see ``_cmp_path_by_dirblock_c`` for details.
302
    """
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
303
    cdef char *dirname1
304
    cdef int dirname1_len
305
    cdef char *dirname2
306
    cdef int dirname2_len
307
    cdef char *basename1
308
    cdef int basename1_len
309
    cdef char *basename2
310
    cdef int basename2_len
311
    cdef int cur_len
312
    cdef int cmp_val
313
314
    if path1_len == 0 and path2_len == 0:
315
        return 0
316
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
317
    if path1 == path2 and path1_len == path2_len:
318
        return 0
319
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
320
    if path1_len == 0:
321
        return -1
322
323
    if path2_len == 0:
324
        return 1
325
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
326
    basename1 = <char*>_my_memrchr(path1, c'/', path1_len)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
327
328
    if basename1 == NULL:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
329
        basename1 = path1
330
        basename1_len = path1_len
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
331
        dirname1 = ''
332
        dirname1_len = 0
333
    else:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
334
        dirname1 = path1
335
        dirname1_len = basename1 - path1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
336
        basename1 = basename1 + 1
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
337
        basename1_len = path1_len - dirname1_len - 1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
338
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
339
    basename2 = <char*>_my_memrchr(path2, c'/', path2_len)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
340
341
    if basename2 == NULL:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
342
        basename2 = path2
343
        basename2_len = path2_len
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
344
        dirname2 = ''
345
        dirname2_len = 0
346
    else:
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
347
        dirname2 = path2
348
        dirname2_len = basename2 - path2
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
349
        basename2 = basename2 + 1
2474.1.59 by John Arbash Meinel
Make sure to set basename_len. With that patch, the tests pass.
350
        basename2_len = path2_len - dirname2_len - 1
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
351
352
    cmp_val = _cmp_by_dirs(dirname1, dirname1_len,
353
                           dirname2, dirname2_len)
354
    if cmp_val != 0:
355
        return cmp_val
356
357
    cur_len = basename1_len
358
    if basename2_len < basename1_len:
359
        cur_len = basename2_len
360
361
    cmp_val = memcmp(basename1, basename2, cur_len)
362
    if cmp_val != 0:
363
        return cmp_val
364
    if basename1_len == basename2_len:
365
        return 0
366
    if basename1_len < basename2_len:
367
        return -1
368
    return 1
369
370
2474.1.66 by John Arbash Meinel
Some restructuring.
371
def _bisect_path_left_c(paths, path):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
372
    """Return the index where to insert path into paths.
373
374
    This uses a path-wise comparison so we get::
375
        a
376
        a-b
377
        a=b
378
        a/b
379
    Rather than::
380
        a
381
        a-b
382
        a/b
383
        a=b
384
    :param paths: A list of paths to search through
385
    :param path: A single path to insert
386
    :return: An offset where 'path' can be inserted.
387
    :seealso: bisect.bisect_left
388
    """
389
    cdef int _lo
390
    cdef int _hi
391
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
392
    cdef char *path_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
393
    cdef int path_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
394
    cdef char *cur_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
395
    cdef int cur_size
396
    cdef void *cur
397
398
    if not PyList_CheckExact(paths):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
399
        raise TypeError("you must pass a python list for 'paths' not: %s %r"
400
                        % (type(paths), paths))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
401
    if not PyString_CheckExact(path):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
402
        raise TypeError("you must pass a string for 'path' not: %s %r"
403
                        % (type(path), path))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
404
405
    _hi = len(paths)
406
    _lo = 0
407
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
408
    path_cstr = PyString_AsString(path)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
409
    path_size = PyString_Size(path)
410
411
    while _lo < _hi:
412
        _mid = (_lo + _hi) / 2
413
        cur = PyList_GetItem_object_void(paths, _mid)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
414
        cur_cstr = PyString_AS_STRING_void(cur)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
415
        cur_size = PyString_GET_SIZE_void(cur)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
416
        if _cmp_path_by_dirblock(cur_cstr, cur_size, path_cstr, path_size) < 0:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
417
            _lo = _mid + 1
418
        else:
419
            _hi = _mid
420
    return _lo
421
422
2474.1.66 by John Arbash Meinel
Some restructuring.
423
def _bisect_path_right_c(paths, path):
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
424
    """Return the index where to insert path into paths.
425
426
    This uses a path-wise comparison so we get::
427
        a
428
        a-b
429
        a=b
430
        a/b
431
    Rather than::
432
        a
433
        a-b
434
        a/b
435
        a=b
436
    :param paths: A list of paths to search through
437
    :param path: A single path to insert
438
    :return: An offset where 'path' can be inserted.
439
    :seealso: bisect.bisect_right
440
    """
441
    cdef int _lo
442
    cdef int _hi
443
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
444
    cdef char *path_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
445
    cdef int path_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
446
    cdef char *cur_cstr
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
447
    cdef int cur_size
448
    cdef void *cur
449
450
    if not PyList_CheckExact(paths):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
451
        raise TypeError("you must pass a python list for 'paths' not: %s %r"
452
                        % (type(paths), paths))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
453
    if not PyString_CheckExact(path):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
454
        raise TypeError("you must pass a string for 'path' not: %s %r"
455
                        % (type(path), path))
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
456
457
    _hi = len(paths)
458
    _lo = 0
459
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
460
    path_cstr = PyString_AsString(path)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
461
    path_size = PyString_Size(path)
462
463
    while _lo < _hi:
464
        _mid = (_lo + _hi) / 2
465
        cur = PyList_GetItem_object_void(paths, _mid)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
466
        cur_cstr = PyString_AS_STRING_void(cur)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
467
        cur_size = PyString_GET_SIZE_void(cur)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
468
        if _cmp_path_by_dirblock(path_cstr, path_size, cur_cstr, cur_size) < 0:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
469
            _hi = _mid
470
        else:
471
            _lo = _mid + 1
472
    return _lo
473
474
2474.1.47 by John Arbash Meinel
Change the names of the functions from c_foo and py_foo to foo_c and foo_py
475
def bisect_dirblock_c(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.
476
    """Return the index where to insert dirname into the dirblocks.
477
478
    The return value idx is such that all directories blocks in dirblock[:idx]
479
    have names < dirname, and all blocks in dirblock[idx:] have names >=
480
    dirname.
481
482
    Optional args lo (default 0) and hi (default len(dirblocks)) bound the
483
    slice of a to be searched.
484
    """
485
    cdef int _lo
486
    cdef int _hi
487
    cdef int _mid
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
488
    cdef char *dirname_cstr
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
489
    cdef int dirname_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
490
    cdef char *cur_cstr
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
491
    cdef int cur_size
2474.1.12 by John Arbash Meinel
Clean up bisect_dirstate to not use temporary variables.
492
    cdef void *cur
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
493
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
494
    if not PyList_CheckExact(dirblocks):
495
        raise TypeError("you must pass a python list for 'dirblocks' not: %s %r"
496
                        % (type(dirblocks), dirblocks))
497
    if not PyString_CheckExact(dirname):
498
        raise TypeError("you must pass a string for dirname not: %s %r"
499
                        % (type(dirname), dirname))
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
500
    if hi is None:
501
        _hi = len(dirblocks)
502
    else:
503
        _hi = hi
504
505
    _lo = lo
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
506
    dirname_cstr = PyString_AsString(dirname)
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
507
    dirname_size = PyString_Size(dirname)
508
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
509
    while _lo < _hi:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
510
        _mid = (_lo + _hi) / 2
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
511
        # Grab the dirname for the current dirblock
2474.1.12 by John Arbash Meinel
Clean up bisect_dirstate to not use temporary variables.
512
        # cur = dirblocks[_mid][0]
513
        cur = PyTuple_GetItem_void_void(
514
                PyList_GetItem_object_void(dirblocks, _mid), 0)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
515
        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.
516
        cur_size = PyString_GET_SIZE_void(cur)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
517
        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*
518
            _lo = _mid + 1
2474.1.14 by John Arbash Meinel
Switching bisect_dirblocks remove the extra .split('/')
519
        else:
520
            _hi = _mid
2474.1.4 by John Arbash Meinel
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
521
    return _lo
522
523
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
524
cdef class Reader:
525
    """Maintain the current location, and return fields as you parse them."""
526
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
527
    cdef object state # The DirState object
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
528
    cdef object text # The overall string object
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
529
    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)
530
    cdef int text_size # Length of text
531
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
532
    cdef char *end_cstr # End of text
533
    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)
534
    cdef char *next # Pointer to the end of this record
535
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
536
    def __init__(self, text, state):
537
        self.state = state
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
538
        self.text = text
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
539
        self.text_cstr = PyString_AsString(text)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
540
        self.text_size = PyString_Size(text)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
541
        self.end_cstr = self.text_cstr + self.text_size
542
        self.cur_cstr = self.text_cstr
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
543
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
544
    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)
545
        """Return a pointer to the start of the next field."""
546
        cdef char *next
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
547
        cdef Py_ssize_t extra_len
548
549
        if self.cur_cstr == NULL:
550
            raise AssertionError('get_next() called when cur_str is NULL')
551
        elif self.cur_cstr >= self.end_cstr:
552
            raise AssertionError('get_next() called when there are no chars'
553
                                 ' left')
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
554
        next = self.cur_cstr
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
555
        self.cur_cstr = <char*>memchr(next, c'\0', self.end_cstr - next)
556
        if self.cur_cstr == NULL:
557
            extra_len = self.end_cstr - next
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
558
            raise errors.DirstateCorrupt(self.state,
559
                'failed to find trailing NULL (\\0).'
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
560
                ' Trailing garbage: %r'
561
                % safe_string_from_size(next, extra_len))
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
562
        size[0] = self.cur_cstr - next
563
        self.cur_cstr = self.cur_cstr + 1
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
564
        return next
565
2474.1.53 by John Arbash Meinel
Changing Reader.get_next_str (which returns a Python String)
566
    cdef object get_next_str(self):
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
567
        """Get the next field as a Python string."""
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
568
        cdef int size
569
        cdef char *next
570
        next = self.get_next(&size)
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
571
        return safe_string_from_size(next, size)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
572
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
573
    cdef int _init(self) except -1:
574
        """Get the pointer ready.
575
576
        This assumes that the dirstate header has already been read, and we
577
        already have the dirblock string loaded into memory.
578
        This just initializes our memory pointers, etc for parsing of the
579
        dirblock string.
580
        """
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
581
        cdef char *first
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
582
        cdef int size
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
583
        # 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,
584
        first = self.get_next(&size)
585
        if first[0] != c'\0' and size == 0:
2474.1.32 by John Arbash Meinel
Skip past the first entry while reading,
586
            raise AssertionError('First character should be null not: %s'
587
                                 % (first,))
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
588
        return 0
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
589
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
590
    cdef object _get_entry(self, int num_trees, void **p_current_dirname,
591
                           int *new_block):
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
592
        """Extract the next entry.
593
594
        This parses the next entry based on the current location in
595
        ``self.cur_cstr``.
596
        Each entry can be considered a "row" in the total table. And each row
597
        has a fixed number of columns. It is generally broken up into "key"
598
        columns, then "current" columns, and then "parent" columns.
599
600
        :param num_trees: How many parent trees need to be parsed
601
        :param p_current_dirname: A pointer to the current PyString
602
            representing the directory name.
603
            We pass this in as a void * so that pyrex doesn't have to
604
            increment/decrement the PyObject reference counter for each
605
            _get_entry call.
606
            We use a pointer so that _get_entry can update it with the new
607
            value.
608
        :param new_block: This is to let the caller know that it needs to
609
            create a new directory block to store the next entry.
610
        """
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
611
        cdef object path_name_file_id_key
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
612
        cdef char *entry_size_cstr
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
613
        cdef unsigned long int entry_size
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
614
        cdef char* executable_cstr
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
615
        cdef int is_executable
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
616
        cdef char* dirname_cstr
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
617
        cdef char* trailing
618
        cdef int cur_size
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
619
        cdef int i
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
620
        cdef object minikind
621
        cdef object fingerprint
622
        cdef object info
623
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
624
        # Read the 'key' information (dirname, name, file_id)
625
        dirname_cstr = self.get_next(&cur_size)
626
        # Check to see if we have started a new directory block.
627
        # If so, then we need to create a new dirname PyString, so that it can
628
        # be used in all of the tuples. This saves time and memory, by re-using
629
        # the same object repeatedly.
630
631
        # Do the cheap 'length of string' check first. If the string is a
632
        # different length, then we *have* to be a different directory.
633
        if (cur_size != PyString_GET_SIZE_void(p_current_dirname[0])
634
            or strncmp(dirname_cstr,
635
                       # Extract the char* from our current dirname string.  We
636
                       # know it is a PyString, so we can use
637
                       # PyString_AS_STRING, we use the _void version because
638
                       # we are tricking Pyrex by using a void* rather than an
639
                       # <object>
640
                       PyString_AS_STRING_void(p_current_dirname[0]),
641
                       cur_size+1) != 0):
3640.2.1 by John Arbash Meinel
More safety checks around PyString_FromStringAndSize,
642
            dirname = safe_string_from_size(dirname_cstr, cur_size)
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
643
            p_current_dirname[0] = <void*>dirname
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
644
            new_block[0] = 1
645
        else:
646
            new_block[0] = 0
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
647
648
        # Build up the key that will be used.
649
        # By using <object>(void *) Pyrex will automatically handle the
650
        # Py_INCREF that we need.
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
651
        path_name_file_id_key = (<object>p_current_dirname[0],
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
652
                                 self.get_next_str(),
653
                                 self.get_next_str(),
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
654
                                )
655
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
656
        # Parse all of the per-tree information. current has the information in
657
        # the same location as parent trees. The only difference is that 'info'
658
        # is a 'packed_stat' for current, while it is a 'revision_id' for
659
        # parent trees.
660
        # minikind, fingerprint, and info will be returned as regular python
661
        # strings
662
        # entry_size and is_executable will be parsed into a python Long and
663
        # python Boolean, respectively.
664
        # TODO: jam 20070718 Consider changin the entry_size conversion to
665
        #       prefer python Int when possible. They are generally faster to
666
        #       work with, and it will be rare that we have a file >2GB.
667
        #       Especially since this code is pretty much fixed at a max of
668
        #       4GB.
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
669
        trees = []
670
        for i from 0 <= i < num_trees:
671
            minikind = self.get_next_str()
672
            fingerprint = self.get_next_str()
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
673
            entry_size_cstr = self.get_next(&cur_size)
674
            entry_size = strtoul(entry_size_cstr, NULL, 10)
675
            executable_cstr = self.get_next(&cur_size)
676
            is_executable = (executable_cstr[0] == c'y')
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
677
            info = self.get_next_str()
678
            PyList_Append(trees, (
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
679
                minikind,     # minikind
680
                fingerprint,  # fingerprint
681
                entry_size,   # size
682
                is_executable,# executable
683
                info,         # packed_stat or revision_id
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
684
            ))
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
685
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
686
        # The returned tuple is (key, [trees])
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
687
        ret = (path_name_file_id_key, trees)
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
688
        # Ignore the trailing newline, but assert that it does exist, this
689
        # ensures that we always finish parsing a line on an end-of-entry
690
        # marker.
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
691
        trailing = self.get_next(&cur_size)
692
        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
693
            raise errors.DirstateCorrupt(self.state,
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
694
                '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,
695
                % (cur_size, safe_string_from_size(trailing, cur_size),
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
696
                   ret))
2474.1.38 by John Arbash Meinel
Finally, faster than text.split() (156ms)
697
        return ret
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
698
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
699
    def _parse_dirblocks(self):
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
700
        """Parse all dirblocks in the state file."""
701
        cdef int num_trees
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
702
        cdef object current_block
703
        cdef object entry
704
        cdef void * current_dirname
705
        cdef int new_block
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
706
        cdef int expected_entry_count
707
        cdef int entry_count
708
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
709
        num_trees = self.state._num_present_parents() + 1
710
        expected_entry_count = self.state._num_entries
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
711
712
        # Ignore the first record
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
713
        self._init()
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
714
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
715
        current_block = []
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
716
        dirblocks = [('', current_block), ('', [])]
717
        self.state._dirblocks = dirblocks
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
718
        obj = ''
2474.1.37 by John Arbash Meinel
get_next() returns the length of the string,
719
        current_dirname = <void*>obj
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
720
        new_block = 0
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
721
        entry_count = 0
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
722
2474.1.54 by John Arbash Meinel
Optimize the simple case that the strings are the same object.
723
        # TODO: jam 2007-05-07 Consider pre-allocating some space for the
724
        #       members, and then growing and shrinking from there. If most
725
        #       directories have close to 10 entries in them, it would save a
726
        #       few mallocs if we default our list size to something
727
        #       reasonable. Or we could malloc it to something large (100 or
728
        #       so), and then truncate. That would give us a malloc + realloc,
729
        #       rather than lots of reallocs.
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
730
        while self.cur_cstr < self.end_cstr:
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
731
            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.
732
            if new_block:
733
                # new block - different dirname
734
                current_block = []
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
735
                PyList_Append(dirblocks,
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
736
                              (<object>current_dirname, current_block))
737
            PyList_Append(current_block, entry)
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
738
            entry_count = entry_count + 1
739
        if entry_count != expected_entry_count:
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
740
            raise errors.DirstateCorrupt(self.state,
741
                    'We read the wrong number of entries.'
2474.1.46 by John Arbash Meinel
Finish implementing _c_read_dirblocks for any number of parents.
742
                    ' We expected to read %s, but read %s'
743
                    % (expected_entry_count, entry_count))
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
744
        self.state._split_root_dirblock_into_contents()
2474.1.36 by John Arbash Meinel
Move functions into member functions on reader() class.
745
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
746
2474.1.47 by John Arbash Meinel
Change the names of the functions from c_foo and py_foo to foo_c and foo_py
747
def _read_dirblocks_c(state):
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
748
    """Read in the dirblocks for the given DirState object.
749
750
    This is tightly bound to the DirState internal representation. It should be
751
    thought of as a member function, which is only separated out so that we can
752
    re-write it in pyrex.
753
754
    :param state: A DirState object.
755
    :return: None
2474.1.70 by John Arbash Meinel
Lot's of fixes from Martin's comments.
756
    :postcondition: The dirblocks will be loaded into the appropriate fields in
757
        the DirState object.
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
758
    """
759
    state._state_file.seek(state._end_of_header)
760
    text = state._state_file.read()
761
    # TODO: check the crc checksums. crc_measured = zlib.crc32(text)
762
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
763
    reader = Reader(text, state)
2474.1.30 by John Arbash Meinel
Start working towards a parser which uses a Reader (producer)
764
3640.2.5 by John Arbash Meinel
Change from using AssertionError to using DirstateCorrupt in a few places
765
    reader._parse_dirblocks()
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
766
    state._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
767
768
3696.4.3 by Robert Collins
Some tuning of update_entry.
769
cdef int minikind_from_mode(int mode):
770
    # in order of frequency:
771
    if S_ISREG(mode):
772
        return c"f"
773
    if S_ISDIR(mode):
774
        return c"d"
775
    if S_ISLNK(mode):
776
        return c"l"
777
    return 0
778
779
780
_encode = binascii.b2a_base64
781
3696.4.17 by Robert Collins
Review feedback.
782
3696.4.3 by Robert Collins
Some tuning of update_entry.
783
from struct import pack
784
cdef _pack_stat(stat_value):
785
    """return a string representing the stat value's key fields.
786
787
    :param stat_value: A stat oject with st_size, st_mtime, st_ctime, st_dev,
788
        st_ino and st_mode fields.
789
    """
790
    cdef char result[6*4] # 6 long ints
791
    cdef int *aliased
792
    aliased = <int *>result
793
    aliased[0] = htonl(stat_value.st_size)
794
    aliased[1] = htonl(int(stat_value.st_mtime))
795
    aliased[2] = htonl(int(stat_value.st_ctime))
796
    aliased[3] = htonl(stat_value.st_dev)
797
    aliased[4] = htonl(stat_value.st_ino & 0xFFFFFFFF)
798
    aliased[5] = htonl(stat_value.st_mode)
799
    packed = PyString_FromStringAndSize(result, 6*4)
800
    return _encode(packed)[:-1]
801
802
803
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.
804
    """Update the entry based on what is actually on disk.
805
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
806
    This function only calculates the sha if it needs to - if the entry is
807
    uncachable, or clearly different to the first parent's entry, no sha
808
    is calculated, and None is returned.
809
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
810
    :param entry: This is the dirblock entry for the file in question.
811
    :param abspath: The path on disk for this file.
812
    :param stat_value: (optional) if we already have done a stat on the
813
        file, re-use it.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
814
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
815
        target of a symlink.
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
816
    """
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
817
    return _update_entry(self, entry, abspath, stat_value)
818
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
819
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
820
cdef _update_entry(self, entry, abspath, stat_value):
821
    """Update the entry based on what is actually on disk.
822
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
823
    This function only calculates the sha if it needs to - if the entry is
824
    uncachable, or clearly different to the first parent's entry, no sha
825
    is calculated, and None is returned.
826
3696.4.17 by Robert Collins
Review feedback.
827
    :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.
828
    :param entry: This is the dirblock entry for the file in question.
829
    :param abspath: The path on disk for this file.
3696.4.17 by Robert Collins
Review feedback.
830
    :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.
831
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
832
        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.
833
    """
3696.4.17 by Robert Collins
Review feedback.
834
    # TODO - require pyrex 0.9.8, then use a pyd file to define access to the
835
    # _st mode of the compiled stat objects.
3696.4.3 by Robert Collins
Some tuning of update_entry.
836
    cdef int minikind, saved_minikind
837
    cdef void * details
838
    minikind = minikind_from_mode(stat_value.st_mode)
839
    if 0 == minikind:
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
840
        return None
841
    packed_stat = _pack_stat(stat_value)
3696.4.3 by Robert Collins
Some tuning of update_entry.
842
    details = PyList_GetItem_void_void(PyTuple_GetItem_void_void(<void *>entry, 1), 0)
843
    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.
844
    if minikind == c'd' and saved_minikind == c't':
845
        minikind = c't'
3696.4.3 by Robert Collins
Some tuning of update_entry.
846
    saved_link_or_sha1 = PyTuple_GetItem_void_object(details, 1)
847
    saved_file_size = PyTuple_GetItem_void_object(details, 2)
848
    saved_executable = PyTuple_GetItem_void_object(details, 3)
849
    saved_packed_stat = PyTuple_GetItem_void_object(details, 4)
850
    # Deal with pyrex decrefing the objects
851
    Py_INCREF(saved_link_or_sha1)
852
    Py_INCREF(saved_file_size)
853
    Py_INCREF(saved_executable)
854
    Py_INCREF(saved_packed_stat)
855
    #(saved_minikind, saved_link_or_sha1, saved_file_size,
856
    # 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.
857
858
    if (minikind == saved_minikind
859
        and packed_stat == saved_packed_stat):
860
        # The stat hasn't changed since we saved, so we can re-use the
861
        # saved sha hash.
3696.4.3 by Robert Collins
Some tuning of update_entry.
862
        if minikind == c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
863
            return None
864
865
        # size should also be in packed_stat
866
        if saved_file_size == stat_value.st_size:
867
            return saved_link_or_sha1
868
869
    # If we have gotten this far, that means that we need to actually
870
    # process this entry.
871
    link_or_sha1 = None
3696.4.3 by Robert Collins
Some tuning of update_entry.
872
    if minikind == c'f':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
873
        executable = self._is_executable(stat_value.st_mode,
874
                                         saved_executable)
875
        if self._cutoff_time is None:
876
            self._sha_cutoff_time()
877
        if (stat_value.st_mtime < self._cutoff_time
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
878
            and stat_value.st_ctime < self._cutoff_time
879
            and len(entry[1]) > 1
880
            and entry[1][1][0] != 'a'):
881
                # Could check for size changes for further optimised
882
                # avoidance of sha1's. However the most prominent case of
883
                # over-shaing is during initial add, which this catches.
884
            link_or_sha1 = self._sha1_file(abspath)
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
885
            entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
886
                           executable, packed_stat)
887
        else:
888
            entry[1][0] = ('f', '', stat_value.st_size,
889
                           executable, DirState.NULLSTAT)
3696.4.3 by Robert Collins
Some tuning of update_entry.
890
    elif minikind == c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
891
        link_or_sha1 = None
892
        entry[1][0] = ('d', '', 0, False, packed_stat)
3696.4.3 by Robert Collins
Some tuning of update_entry.
893
        if saved_minikind != c'd':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
894
            # This changed from something into a directory. Make sure we
895
            # have a directory block for it. This doesn't happen very
896
            # often, so this doesn't have to be super fast.
897
            block_index, entry_index, dir_present, file_present = \
898
                self._get_block_entry_index(entry[0][0], entry[0][1], 0)
899
            self._ensure_block(block_index, entry_index,
3696.4.17 by Robert Collins
Review feedback.
900
                               pathjoin(entry[0][0], entry[0][1]))
3696.4.3 by Robert Collins
Some tuning of update_entry.
901
    elif minikind == c'l':
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
902
        link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
903
        if self._cutoff_time is None:
904
            self._sha_cutoff_time()
905
        if (stat_value.st_mtime < self._cutoff_time
906
            and stat_value.st_ctime < self._cutoff_time):
907
            entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
908
                           False, packed_stat)
909
        else:
910
            entry[1][0] = ('l', '', stat_value.st_size,
911
                           False, DirState.NULLSTAT)
912
    self._dirblock_state = DirState.IN_MEMORY_MODIFIED
913
    return link_or_sha1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
914
915
3696.4.7 by Robert Collins
More tuning.
916
cdef char _minikind_from_string(object string):
917
    """Convert a python string to a char."""
918
    return PyString_AsString(string)[0]
919
920
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
921
cdef object _kind_absent
922
cdef object _kind_file
923
cdef object _kind_directory
924
cdef object _kind_symlink
925
cdef object _kind_relocated
926
cdef object _kind_tree_reference
927
_kind_absent = "absent"
928
_kind_file = "file"
929
_kind_directory = "directory"
930
_kind_symlink = "symlink"
931
_kind_relocated = "relocated"
932
_kind_tree_reference = "tree-reference"
933
934
3696.4.7 by Robert Collins
More tuning.
935
cdef object _minikind_to_kind(char minikind):
936
    """Create a string kind for minikind."""
937
    cdef char _minikind[1]
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
938
    if minikind == c'f':
939
        return _kind_file
940
    elif minikind == c'd':
941
        return _kind_directory
942
    elif minikind == c'a':
943
        return _kind_absent
944
    elif minikind == c'r':
945
        return _kind_relocated
946
    elif minikind == c'l':
947
        return _kind_symlink
948
    elif minikind == c't':
949
        return _kind_tree_reference
3696.4.7 by Robert Collins
More tuning.
950
    _minikind[0] = minikind
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
951
    raise KeyError(PyString_FromStringAndSize(_minikind, 1))
3696.4.7 by Robert Collins
More tuning.
952
953
954
cdef int _versioned_minikind(char minikind):
955
    """Return non-zero if minikind is in fltd"""
956
    return (minikind == c'f' or
957
            minikind == c'd' or
958
            minikind == c'l' or
959
            minikind == c't')
960
961
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
962
cdef class ProcessEntryC:
963
964
    cdef object old_dirname_to_file_id # dict
965
    cdef object new_dirname_to_file_id # dict
966
    cdef readonly object uninteresting
967
    cdef object last_source_parent
968
    cdef object last_target_parent
969
    cdef object include_unchanged
970
    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.
971
    cdef object utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
972
    cdef readonly object searched_specific_files
973
    cdef object search_specific_files
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
974
    cdef object state
975
    # Current iteration variables:
976
    cdef object current_root
977
    cdef object current_root_unicode
978
    cdef object root_entries
979
    cdef int root_entries_pos, root_entries_len
980
    cdef object root_abspath
981
    cdef int source_index, target_index
982
    cdef int want_unversioned
983
    cdef object tree
984
    cdef object dir_iterator
985
    cdef int block_index
986
    cdef object current_block
987
    cdef int current_block_pos
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
988
    cdef object current_block_list
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
989
    cdef object current_dir_info
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
990
    cdef object current_dir_list
991
    cdef int path_index
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
992
    cdef object root_dir_info
993
    cdef object bisect_left
3696.4.17 by Robert Collins
Review feedback.
994
    cdef object pathjoin
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
995
    cdef object fstat
996
    cdef object sha_file
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
997
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
998
    def __init__(self, include_unchanged, use_filesystem_for_exec,
999
        search_specific_files, state, source_index, target_index,
1000
        want_unversioned, tree):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1001
        self.old_dirname_to_file_id = {}
1002
        self.new_dirname_to_file_id = {}
1003
        # Just a sentry, so that _process_entry can say that this
1004
        # record is handled, but isn't interesting to process (unchanged)
1005
        self.uninteresting = object()
1006
        # Using a list so that we can access the values and change them in
1007
        # nested scope. Each one is [path, file_id, entry]
1008
        self.last_source_parent = [None, None]
1009
        self.last_target_parent = [None, None]
1010
        self.include_unchanged = include_unchanged
1011
        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.
1012
        self.utf8_decode = cache_utf8._utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1013
        # for all search_indexs in each path at or under each element of
1014
        # search_specific_files, if the detail is relocated: add the id, and add the
1015
        # relocated path as one to search if its not searched already. If the
1016
        # detail is not relocated, add the id.
1017
        self.searched_specific_files = set()
1018
        self.search_specific_files = search_specific_files
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1019
        self.state = state
1020
        self.current_root = None
1021
        self.current_root_unicode = None
1022
        self.root_entries = None
1023
        self.root_entries_pos = 0
1024
        self.root_entries_len = 0
1025
        self.root_abspath = None
1026
        if source_index is None:
1027
            self.source_index = -1
1028
        else:
1029
            self.source_index = source_index
1030
        self.target_index = target_index
1031
        self.want_unversioned = want_unversioned
1032
        self.tree = tree
1033
        self.dir_iterator = None
1034
        self.block_index = -1
1035
        self.current_block = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1036
        self.current_block_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1037
        self.current_block_pos = -1
1038
        self.current_dir_info = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1039
        self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1040
        self.path_index = 0
1041
        self.root_dir_info = None
1042
        self.bisect_left = bisect.bisect_left
3696.4.17 by Robert Collins
Review feedback.
1043
        self.pathjoin = osutils.pathjoin
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1044
        self.fstat = os.fstat
1045
        self.sha_file = osutils.sha_file
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1046
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1047
    cdef _process_entry(self, entry, path_info):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1048
        """Compare an entry and real disk to generate delta information.
1049
1050
        :param path_info: top_relpath, basename, kind, lstat, abspath for
1051
            the path of entry. If None, then the path is considered absent.
1052
            (Perhaps we should pass in a concrete entry for this ?)
1053
            Basename is returned as a utf8 string because we expect this
1054
            tuple will be ignored, and don't want to take the time to
1055
            decode.
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1056
        :return: None if the these don't match
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1057
                 A tuple of information about the change, or
1058
                 the object 'uninteresting' if these match, but are
1059
                 basically identical.
1060
        """
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
1061
        cdef char target_minikind
3696.4.7 by Robert Collins
More tuning.
1062
        cdef char source_minikind
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1063
        cdef object file_id
1064
        cdef int content_change
3696.4.9 by Robert Collins
Reduce lookups in process_entry.
1065
        cdef object details_list
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1066
        file_id = None
3696.4.9 by Robert Collins
Reduce lookups in process_entry.
1067
        details_list = entry[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1068
        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.
1069
            source_details = DirState.NULL_PARENT_DETAILS
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1070
        else:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1071
            source_details = details_list[self.source_index]
1072
        target_details = details_list[self.target_index]
3696.4.7 by Robert Collins
More tuning.
1073
        target_minikind = _minikind_from_string(target_details[0])
1074
        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.
1075
            if self.target_index != 0:
3763.1.1 by Benjamin Peterson
fix two small oversights
1076
                raise AssertionError("Unsupported target index %d" %
1077
                                     self.target_index)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1078
            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.
1079
            # The entry may have been modified by update_entry
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1080
            target_details = details_list[self.target_index]
3696.4.7 by Robert Collins
More tuning.
1081
            target_minikind = _minikind_from_string(target_details[0])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1082
        else:
1083
            link_or_sha1 = None
3696.4.7 by Robert Collins
More tuning.
1084
        # the rest of this function is 0.3 seconds on 50K paths, or
1085
        # 0.000006 seconds per call.
1086
        source_minikind = _minikind_from_string(source_details[0])
1087
        if ((_versioned_minikind(source_minikind) or source_minikind == c'r')
1088
            and _versioned_minikind(target_minikind)):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1089
            # claimed content in both: diff
1090
            #   r    | fdlt   |      | add source to search, add id path move and perform
1091
            #        |        |      | diff check on source-target
1092
            #   r    | fdlt   |  a   | dangling file that was present in the basis.
1093
            #        |        |      | ???
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1094
            if source_minikind != c'r':
1095
                old_dirname = entry[0][0]
1096
                old_basename = entry[0][1]
1097
                old_path = path = None
1098
            else:
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1099
                # add the source to the search path to find any children it
1100
                # has.  TODO ? : only add if it is a container ?
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1101
                if not osutils.is_inside_any(self.searched_specific_files,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1102
                                             source_details[1]):
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1103
                    self.search_specific_files.add(source_details[1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1104
                # generate the old path; this is needed for stating later
1105
                # as well.
1106
                old_path = source_details[1]
1107
                old_dirname, old_basename = os.path.split(old_path)
3696.4.17 by Robert Collins
Review feedback.
1108
                path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1109
                old_entry = self.state._get_entry(self.source_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1110
                                             path_utf8=old_path)
1111
                # update the source details variable to be the real
1112
                # location.
1113
                if old_entry == (None, None):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1114
                    raise errors.CorruptDirstate(self.state._filename,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1115
                        "entry '%s/%s' is considered renamed from %r"
1116
                        " but source does not exist\n"
1117
                        "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.
1118
                source_details = old_entry[1][self.source_index]
3696.4.7 by Robert Collins
More tuning.
1119
                source_minikind = _minikind_from_string(source_details[0])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1120
            if path_info is None:
1121
                # 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.
1122
                content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1123
                target_kind = None
1124
                target_exec = False
1125
            else:
1126
                # source and target are both versioned and disk file is present.
1127
                target_kind = path_info[2]
1128
                if target_kind == 'directory':
1129
                    if path is None:
3696.4.17 by Robert Collins
Review feedback.
1130
                        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.
1131
                    file_id = entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1132
                    self.new_dirname_to_file_id[path] = file_id
3696.4.7 by Robert Collins
More tuning.
1133
                    if source_minikind != c'd':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1134
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1135
                    else:
1136
                        # directories have no fingerprint
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1137
                        content_change = 0
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1138
                    target_exec = False
1139
                elif target_kind == 'file':
3696.4.7 by Robert Collins
More tuning.
1140
                    if source_minikind != c'f':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1141
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1142
                    else:
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1143
                        # If the size is the same, check the sha:
1144
                        if target_details[2] == source_details[2]:
1145
                            if link_or_sha1 is None:
1146
                                # Stat cache miss:
4132.2.4 by Ian Clatworthy
John's enhancements/fixes to the tests
1147
                                statvalue, link_or_sha1 = \
1148
                                    self.state._sha1_provider.stat_and_sha1(
1149
                                    path_info[4])
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
1150
                                self.state._observed_sha1(entry, link_or_sha1,
1151
                                    statvalue)
1152
                            content_change = (link_or_sha1 != source_details[1])
1153
                        else:
1154
                            # Size changed, so must be different
1155
                            content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1156
                    # Target details is updated at update_entry time
1157
                    if self.use_filesystem_for_exec:
1158
                        # We don't need S_ISREG here, because we are sure
1159
                        # we are dealing with a file.
1160
                        target_exec = bool(S_IXUSR & path_info[3].st_mode)
1161
                    else:
1162
                        target_exec = target_details[3]
1163
                elif target_kind == 'symlink':
3696.4.7 by Robert Collins
More tuning.
1164
                    if source_minikind != c'l':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1165
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1166
                    else:
1167
                        content_change = (link_or_sha1 != source_details[1])
1168
                    target_exec = False
1169
                elif target_kind == 'tree-reference':
3696.4.7 by Robert Collins
More tuning.
1170
                    if source_minikind != c't':
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1171
                        content_change = 1
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1172
                    else:
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1173
                        content_change = 0
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1174
                    target_exec = False
1175
                else:
1176
                    raise Exception, "unknown kind %s" % path_info[2]
3696.4.7 by Robert Collins
More tuning.
1177
            if source_minikind == c'd':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1178
                if path is None:
3696.4.17 by Robert Collins
Review feedback.
1179
                    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.
1180
                if file_id is None:
1181
                    file_id = entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1182
                self.old_dirname_to_file_id[old_path] = file_id
1183
            # parent id is the entry for the path in the target tree
1184
            if old_dirname == self.last_source_parent[0]:
1185
                source_parent_id = self.last_source_parent[1]
1186
            else:
1187
                try:
1188
                    source_parent_id = self.old_dirname_to_file_id[old_dirname]
1189
                except KeyError:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1190
                    source_parent_entry = self.state._get_entry(self.source_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1191
                                                           path_utf8=old_dirname)
1192
                    source_parent_id = source_parent_entry[0][2]
1193
                if source_parent_id == entry[0][2]:
1194
                    # This is the root, so the parent is None
1195
                    source_parent_id = None
1196
                else:
1197
                    self.last_source_parent[0] = old_dirname
1198
                    self.last_source_parent[1] = source_parent_id
1199
            new_dirname = entry[0][0]
1200
            if new_dirname == self.last_target_parent[0]:
1201
                target_parent_id = self.last_target_parent[1]
1202
            else:
1203
                try:
1204
                    target_parent_id = self.new_dirname_to_file_id[new_dirname]
1205
                except KeyError:
1206
                    # TODO: We don't always need to do the lookup, because the
1207
                    #       parent entry will be the same as the source entry.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1208
                    target_parent_entry = self.state._get_entry(self.target_index,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1209
                                                           path_utf8=new_dirname)
1210
                    if target_parent_entry == (None, None):
1211
                        raise AssertionError(
1212
                            "Could not find target parent in wt: %s\nparent of: %s"
1213
                            % (new_dirname, entry))
1214
                    target_parent_id = target_parent_entry[0][2]
1215
                if target_parent_id == entry[0][2]:
1216
                    # This is the root, so the parent is None
1217
                    target_parent_id = None
1218
                else:
1219
                    self.last_target_parent[0] = new_dirname
1220
                    self.last_target_parent[1] = target_parent_id
1221
1222
            source_exec = source_details[3]
1223
            if (self.include_unchanged
1224
                or content_change
1225
                or source_parent_id != target_parent_id
1226
                or old_basename != entry[0][1]
1227
                or source_exec != target_exec
1228
                ):
1229
                if old_path is None:
3696.4.17 by Robert Collins
Review feedback.
1230
                    path = self.pathjoin(old_dirname, old_basename)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1231
                    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.
1232
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1233
                    path_u = old_path_u
1234
                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.
1235
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1236
                    if old_path == path:
1237
                        path_u = old_path_u
1238
                    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.
1239
                        path_u = self.utf8_decode(path)[0]
3696.4.7 by Robert Collins
More tuning.
1240
                source_kind = _minikind_to_kind(source_minikind)
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1241
                return (entry[0][2],
1242
                       (old_path_u, path_u),
1243
                       content_change,
1244
                       (True, True),
1245
                       (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.
1246
                       (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.
1247
                       (source_kind, target_kind),
1248
                       (source_exec, target_exec))
1249
            else:
1250
                return self.uninteresting
3696.4.7 by Robert Collins
More tuning.
1251
        elif source_minikind == c'a' and _versioned_minikind(target_minikind):
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1252
            # looks like a new file
3696.4.17 by Robert Collins
Review feedback.
1253
            path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1254
            # parent id is the entry for the path in the target tree
1255
            # 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.
1256
            parent_entry = self.state._get_entry(self.target_index,
1257
                                                 path_utf8=entry[0][0])
1258
            if parent_entry is None:
1259
                raise errors.DirstateCorrupt(self.state,
1260
                    "We could not find the parent entry in index %d"
1261
                    " for the entry: %s"
1262
                    % (self.target_index, entry[0]))
1263
            parent_id = parent_entry[0][2]
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1264
            if parent_id == entry[0][2]:
1265
                parent_id = None
1266
            if path_info is not None:
1267
                # Present on disk:
1268
                if self.use_filesystem_for_exec:
1269
                    # We need S_ISREG here, because we aren't sure if this
1270
                    # is a file or not.
1271
                    target_exec = bool(
1272
                        S_ISREG(path_info[3].st_mode)
1273
                        and S_IXUSR & path_info[3].st_mode)
1274
                else:
1275
                    target_exec = target_details[3]
1276
                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.
1277
                       (None, self.utf8_decode(path)[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1278
                       True,
1279
                       (False, True),
1280
                       (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.
1281
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1282
                       (None, path_info[2]),
1283
                       (None, target_exec))
1284
            else:
1285
                # Its a missing file, report it as such.
1286
                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.
1287
                       (None, self.utf8_decode(path)[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1288
                       False,
1289
                       (False, True),
1290
                       (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.
1291
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1292
                       (None, None),
1293
                       (None, False))
3696.4.7 by Robert Collins
More tuning.
1294
        elif _versioned_minikind(source_minikind) and target_minikind == c'a':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1295
            # unversioned, possibly, or possibly not deleted: we dont care.
1296
            # if its still on disk, *and* theres no other entry at this
1297
            # path [we dont know this in this routine at the moment -
1298
            # perhaps we should change this - then it would be an unknown.
3696.4.17 by Robert Collins
Review feedback.
1299
            old_path = self.pathjoin(entry[0][0], entry[0][1])
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1300
            # 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.
1301
            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.
1302
            if parent_id == entry[0][2]:
1303
                parent_id = None
1304
            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.
1305
                   (self.utf8_decode(old_path)[0], None),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1306
                   True,
1307
                   (True, False),
1308
                   (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.
1309
                   (self.utf8_decode(entry[0][1])[0], None),
3696.4.7 by Robert Collins
More tuning.
1310
                   (_minikind_to_kind(source_minikind), None),
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1311
                   (source_details[3], None))
3696.4.7 by Robert Collins
More tuning.
1312
        elif _versioned_minikind(source_minikind) and target_minikind == c'r':
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1313
            # a rename; could be a true rename, or a rename inherited from
1314
            # a renamed parent. TODO: handle this efficiently. Its not
1315
            # common case to rename dirs though, so a correct but slow
1316
            # implementation will do.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1317
            if not osutils.is_inside_any(self.searched_specific_files, target_details[1]):
1318
                self.search_specific_files.add(target_details[1])
3696.4.7 by Robert Collins
More tuning.
1319
        elif ((source_minikind == c'r' or source_minikind == c'a') and
1320
              (target_minikind == c'r' or target_minikind == c'a')):
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1321
            # neither of the selected trees contain this path,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
1322
            # so skip over it. This is not currently directly tested, but
1323
            # is indirectly via test_too_much.TestCommands.test_conflicts.
1324
            pass
1325
        else:
1326
            raise AssertionError("don't know how to compare "
1327
                "source_minikind=%r, target_minikind=%r"
1328
                % (source_minikind, target_minikind))
1329
            ## import pdb;pdb.set_trace()
1330
        return None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1331
1332
    def __iter__(self):
1333
        return self
1334
1335
    def iter_changes(self):
1336
        return self
1337
1338
    cdef void _update_current_block(self):
1339
        if (self.block_index < len(self.state._dirblocks) and
1340
            osutils.is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):
1341
            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.
1342
            self.current_block_list = self.current_block[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1343
            self.current_block_pos = 0
1344
        else:
1345
            self.current_block = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1346
            self.current_block_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1347
1348
    def __next__(self):
1349
        # Simple thunk to allow tail recursion without pyrex confusion
1350
        return self._iter_next()
1351
1352
    cdef _iter_next(self):
1353
        """Iterate over the changes."""
1354
        # This function single steps through an iterator. As such while loops
1355
        # are often exited by 'return' - the code is structured so that the
1356
        # next call into the function will return to the same while loop. Note
1357
        # that all flow control needed to re-reach that step is reexecuted,
1358
        # which can be a performance problem. It has not yet been tuned to
1359
        # minimise this; a state machine is probably the simplest restructuring
1360
        # to both minimise this overhead and make the code considerably more
1361
        # understandable.
1362
1363
        # sketch: 
1364
        # compare source_index and target_index at or under each element of search_specific_files.
1365
        # follow the following comparison table. Note that we only want to do diff operations when
1366
        # the target is fdl because thats when the walkdirs logic will have exposed the pathinfo 
1367
        # for the target.
1368
        # cases:
1369
        # 
1370
        # Source | Target | disk | action
1371
        #   r    | fdlt   |      | add source to search, add id path move and perform
1372
        #        |        |      | diff check on source-target
1373
        #   r    | fdlt   |  a   | dangling file that was present in the basis. 
1374
        #        |        |      | ???
1375
        #   r    |  a     |      | add source to search
1376
        #   r    |  a     |  a   | 
1377
        #   r    |  r     |      | this path is present in a non-examined tree, skip.
1378
        #   r    |  r     |  a   | this path is present in a non-examined tree, skip.
1379
        #   a    | fdlt   |      | add new id
1380
        #   a    | fdlt   |  a   | dangling locally added file, skip
1381
        #   a    |  a     |      | not present in either tree, skip
1382
        #   a    |  a     |  a   | not present in any tree, skip
1383
        #   a    |  r     |      | not present in either tree at this path, skip as it
1384
        #        |        |      | may not be selected by the users list of paths.
1385
        #   a    |  r     |  a   | not present in either tree at this path, skip as it
1386
        #        |        |      | may not be selected by the users list of paths.
1387
        #  fdlt  | fdlt   |      | content in both: diff them
1388
        #  fdlt  | fdlt   |  a   | deleted locally, but not unversioned - show as deleted ?
1389
        #  fdlt  |  a     |      | unversioned: output deleted id for now
1390
        #  fdlt  |  a     |  a   | unversioned and deleted: output deleted id
1391
        #  fdlt  |  r     |      | relocated in this tree, so add target to search.
1392
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
1393
        #        |        |      | this id at the other path.
1394
        #  fdlt  |  r     |  a   | relocated in this tree, so add target to search.
1395
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
1396
        #        |        |      | this id at the other path.
1397
1398
        # TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1399
        #       keeping a cache of directories that we have seen.
1400
        cdef object current_dirname, current_blockname
1401
        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.
1402
        cdef int advance_entry, advance_path
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1403
        cdef int path_handled
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1404
        uninteresting = self.uninteresting
1405
        searched_specific_files = self.searched_specific_files
1406
        # Are we walking a root?
1407
        while self.root_entries_pos < self.root_entries_len:
1408
            entry = self.root_entries[self.root_entries_pos]
1409
            self.root_entries_pos = self.root_entries_pos + 1
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1410
            result = self._process_entry(entry, self.root_dir_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1411
            if result is not None and result is not self.uninteresting:
1412
                return result
1413
        # Have we finished the prior root, or never started one ?
1414
        if self.current_root is None:
1415
            # TODO: the pending list should be lexically sorted?  the
1416
            # interface doesn't require it.
1417
            try:
1418
                self.current_root = self.search_specific_files.pop()
1419
            except KeyError:
1420
                raise StopIteration()
1421
            self.current_root_unicode = self.current_root.decode('utf8')
1422
            self.searched_specific_files.add(self.current_root)
1423
            # process the entries for this containing directory: the rest will be
1424
            # found by their parents recursively.
1425
            self.root_entries = self.state._entries_for_path(self.current_root)
1426
            self.root_entries_len = len(self.root_entries)
1427
            self.root_abspath = self.tree.abspath(self.current_root_unicode)
1428
            try:
1429
                root_stat = os.lstat(self.root_abspath)
1430
            except OSError, e:
1431
                if e.errno == errno.ENOENT:
1432
                    # the path does not exist: let _process_entry know that.
1433
                    self.root_dir_info = None
1434
                else:
1435
                    # some other random error: hand it up.
1436
                    raise
1437
            else:
1438
                self.root_dir_info = ('', self.current_root,
1439
                    osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1440
                    self.root_abspath)
1441
                if self.root_dir_info[2] == 'directory':
1442
                    if self.tree._directory_is_tree_reference(
1443
                        self.current_root_unicode):
1444
                        self.root_dir_info = self.root_dir_info[:2] + \
1445
                            ('tree-reference',) + self.root_dir_info[3:]
1446
            if not self.root_entries and not self.root_dir_info:
1447
                # this specified path is not present at all, skip it.
1448
                # (tail recursion, can do a loop once the full structure is
1449
                # known).
1450
                return self._iter_next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1451
            path_handled = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1452
            self.root_entries_pos = 0
1453
            # XXX Clarity: This loop is duplicated a out the self.current_root
1454
            # is None guard above: if we return from it, it completes there
1455
            # (and the following if block cannot trigger because
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1456
            # 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.
1457
            while self.root_entries_pos < self.root_entries_len:
1458
                entry = self.root_entries[self.root_entries_pos]
1459
                self.root_entries_pos = self.root_entries_pos + 1
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1460
                result = self._process_entry(entry, self.root_dir_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1461
                if result is not None:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1462
                    path_handled = -1
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1463
                    if result is not self.uninteresting:
1464
                        return result
1465
            # handle unversioned specified paths:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1466
            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.
1467
                new_executable = bool(
1468
                    stat.S_ISREG(self.root_dir_info[3].st_mode)
1469
                    and stat.S_IEXEC & self.root_dir_info[3].st_mode)
1470
                return (None,
1471
                       (None, self.current_root_unicode),
1472
                       True,
1473
                       (False, False),
1474
                       (None, None),
1475
                       (None, splitpath(self.current_root_unicode)[-1]),
1476
                       (None, self.root_dir_info[2]),
1477
                       (None, new_executable)
1478
                      )
1479
            # If we reach here, the outer flow continues, which enters into the
1480
            # per-root setup logic.
1481
        if self.current_dir_info is None and self.current_block is None:
1482
            # setup iteration of this root:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1483
            self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1484
            if self.root_dir_info and self.root_dir_info[2] == 'tree-reference':
1485
                self.current_dir_info = None
1486
            else:
1487
                self.dir_iterator = osutils._walkdirs_utf8(self.root_abspath,
1488
                    prefix=self.current_root)
1489
                self.path_index = 0
1490
                try:
1491
                    self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1492
                    self.current_dir_list = self.current_dir_info[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1493
                except OSError, e:
1494
                    # there may be directories in the inventory even though
1495
                    # this path is not a file on disk: so mark it as end of
1496
                    # iterator
1497
                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
1498
                        self.current_dir_info = None
1499
                    elif sys.platform == 'win32':
1500
                        # on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
1501
                        # python 2.5 has e.errno == EINVAL,
1502
                        #            and e.winerror == ERROR_DIRECTORY
1503
                        try:
1504
                            e_winerror = e.winerror
1505
                        except AttributeError:
1506
                            e_winerror = None
1507
                        win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
1508
                        if (e.errno in win_errors or e_winerror in win_errors):
1509
                            self.current_dir_info = None
1510
                        else:
1511
                            # Will this really raise the right exception ?
1512
                            raise
1513
                    else:
1514
                        raise
1515
                else:
1516
                    if self.current_dir_info[0][0] == '':
1517
                        # remove .bzr from iteration
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1518
                        bzr_index = self.bisect_left(self.current_dir_list, ('.bzr',))
1519
                        if self.current_dir_list[bzr_index][0] != '.bzr':
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1520
                            raise AssertionError()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1521
                        del self.current_dir_list[bzr_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1522
            initial_key = (self.current_root, '', '')
1523
            self.block_index, _ = self.state._find_block_index_from_key(initial_key)
1524
            if self.block_index == 0:
1525
                # we have processed the total root already, but because the
1526
                # initial key matched it we should skip it here.
1527
                self.block_index = self.block_index + 1
1528
            self._update_current_block()
1529
        # walk until both the directory listing and the versioned metadata
1530
        # are exhausted. 
1531
        while (self.current_dir_info is not None
1532
            or self.current_block is not None):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1533
            # Uncommon case - a missing directory or an unversioned directory:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1534
            if (self.current_dir_info and self.current_block
1535
                and self.current_dir_info[0][0] != self.current_block[0]):
1536
                # Work around pyrex broken heuristic - current_dirname has
1537
                # the same scope as current_dirname_c
1538
                current_dirname = self.current_dir_info[0][0]
1539
                current_dirname_c = PyString_AS_STRING_void(
1540
                    <void *>current_dirname)
1541
                current_blockname = self.current_block[0]
1542
                current_blockname_c = PyString_AS_STRING_void(
1543
                    <void *>current_blockname)
1544
                # In the python generator we evaluate this if block once per
1545
                # dir+block; because we reenter in the pyrex version its being
1546
                # evaluated once per path: we could cache the result before
1547
                # doing the while loop and probably save time.
1548
                if _cmp_by_dirs(current_dirname_c,
1549
                    PyString_Size(current_dirname),
1550
                    current_blockname_c,
1551
                    PyString_Size(current_blockname)) < 0:
1552
                    # filesystem data refers to paths not covered by the
1553
                    # dirblock.  this has two possibilities:
1554
                    # A) it is versioned but empty, so there is no block for it
1555
                    # B) it is not versioned.
1556
1557
                    # if (A) then we need to recurse into it to check for
1558
                    # new unknown files or directories.
1559
                    # if (B) then we should ignore it, because we don't
1560
                    # recurse into unknown directories.
1561
                    # We are doing a loop
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1562
                    while self.path_index < len(self.current_dir_list):
1563
                        current_path_info = self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1564
                        # dont descend into this unversioned path if it is
1565
                        # a dir
1566
                        if current_path_info[2] in ('directory',
1567
                                                    'tree-reference'):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1568
                            del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1569
                            self.path_index = self.path_index - 1
1570
                        self.path_index = self.path_index + 1
1571
                        if self.want_unversioned:
1572
                            if current_path_info[2] == 'directory':
1573
                                if self.tree._directory_is_tree_reference(
1574
                                    self.utf8_decode(current_path_info[0])[0]):
1575
                                    current_path_info = current_path_info[:2] + \
1576
                                        ('tree-reference',) + current_path_info[3:]
1577
                            new_executable = bool(
1578
                                stat.S_ISREG(current_path_info[3].st_mode)
1579
                                and stat.S_IEXEC & current_path_info[3].st_mode)
1580
                            return (None,
1581
                                (None, self.utf8_decode(current_path_info[0])[0]),
1582
                                True,
1583
                                (False, False),
1584
                                (None, None),
1585
                                (None, self.utf8_decode(current_path_info[1])[0]),
1586
                                (None, current_path_info[2]),
1587
                                (None, new_executable))
1588
                    # This dir info has been handled, go to the next
1589
                    self.path_index = 0
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1590
                    self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1591
                    try:
1592
                        self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1593
                        self.current_dir_list = self.current_dir_info[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1594
                    except StopIteration:
1595
                        self.current_dir_info = None
1596
                else: #(dircmp > 0)
1597
                    # We have a dirblock entry for this location, but there
1598
                    # is no filesystem path for this. This is most likely
1599
                    # because a directory was removed from the disk.
1600
                    # We don't have to report the missing directory,
1601
                    # because that should have already been handled, but we
1602
                    # need to handle all of the files that are contained
1603
                    # within.
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1604
                    while self.current_block_pos < len(self.current_block_list):
1605
                        current_entry = self.current_block_list[self.current_block_pos]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1606
                        self.current_block_pos = self.current_block_pos + 1
1607
                        # entry referring to file not present on disk.
1608
                        # advance the entry only, after processing.
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1609
                        result = self._process_entry(current_entry, None)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1610
                        if result is not None:
1611
                            if result is not self.uninteresting:
1612
                                return result
1613
                    self.block_index = self.block_index + 1
1614
                    self._update_current_block()
1615
                continue # next loop-on-block/dir
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1616
            result = self._loop_one_block()
1617
            if result is not None:
1618
                return result
1619
        if len(self.search_specific_files):
1620
            # More supplied paths to process
1621
            self.current_root = None
1622
            return self._iter_next()
1623
        raise StopIteration()
1624
1625
    cdef object _maybe_tree_ref(self, current_path_info):
1626
        if self.tree._directory_is_tree_reference(
1627
            self.utf8_decode(current_path_info[0])[0]):
1628
            return current_path_info[:2] + \
1629
                ('tree-reference',) + current_path_info[3:]
1630
        else:
1631
            return current_path_info
1632
1633
    cdef object _loop_one_block(self):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1634
            # current_dir_info and current_block refer to the same directory -
1635
            # this is the common case code.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1636
            # Assign local variables for current path and entry:
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1637
            cdef object current_entry
1638
            cdef object current_path_info
1639
            cdef int path_handled
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1640
            cdef char minikind
1641
            cdef int cmp_result
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1642
            # cdef char * temp_str
1643
            # cdef Py_ssize_t temp_str_length
1644
            # PyString_AsStringAndSize(disk_kind, &temp_str, &temp_str_length)
1645
            # if not strncmp(temp_str, "directory", temp_str_length):
1646
            if (self.current_block is not None and
1647
                self.current_block_pos < PyList_GET_SIZE(self.current_block_list)):
1648
                current_entry = PyList_GET_ITEM(self.current_block_list,
1649
                    self.current_block_pos)
1650
                # accomodate pyrex
1651
                Py_INCREF(current_entry)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1652
            else:
1653
                current_entry = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1654
            if (self.current_dir_info is not None and
1655
                self.path_index < PyList_GET_SIZE(self.current_dir_list)):
1656
                current_path_info = PyList_GET_ITEM(self.current_dir_list,
1657
                    self.path_index)
1658
                # accomodate pyrex
1659
                Py_INCREF(current_path_info)
1660
                disk_kind = PyTuple_GET_ITEM(current_path_info, 2)
1661
                # accomodate pyrex
1662
                Py_INCREF(disk_kind)
1663
                if disk_kind == "directory":
1664
                    current_path_info = self._maybe_tree_ref(current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1665
            else:
1666
                current_path_info = None
1667
            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.
1668
                advance_entry = -1
1669
                advance_path = -1
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1670
                result = None
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1671
                path_handled = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1672
                if current_entry is None:
1673
                    # unversioned -  the check for path_handled when the path
1674
                    # is advanced will yield this path if needed.
1675
                    pass
1676
                elif current_path_info is None:
1677
                    # no path is fine: the per entry code will handle it.
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1678
                    result = self._process_entry(current_entry, current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1679
                    if result is not None:
1680
                        if result is self.uninteresting:
1681
                            result = None
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1682
                else:
1683
                    minikind = _minikind_from_string(
1684
                        current_entry[1][self.target_index][0])
1685
                    cmp_result = cmp(current_path_info[1], current_entry[0][1])
1686
                    if (cmp_result or minikind == c'a' or minikind == c'r'):
1687
                        # The current path on disk doesn't match the dirblock
1688
                        # record. Either the dirblock record is marked as
1689
                        # absent/renamed, or the file on disk is not present at all
1690
                        # in the dirblock. Either way, report about the dirblock
1691
                        # entry, and let other code handle the filesystem one.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1692
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1693
                        # Compare the basename for these files to determine
1694
                        # which comes first
1695
                        if cmp_result < 0:
1696
                            # extra file on disk: pass for now, but only
1697
                            # increment the path, not the entry
1698
                            advance_entry = 0
1699
                        else:
1700
                            # entry referring to file not present on disk.
1701
                            # advance the entry only, after processing.
1702
                            result = self._process_entry(current_entry, None)
1703
                            if result is not None:
1704
                                if result is self.uninteresting:
1705
                                    result = None
1706
                            advance_path = 0
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1707
                    else:
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1708
                        # paths are the same,and the dirstate entry is not
1709
                        # absent or renamed.
1710
                        result = self._process_entry(current_entry, current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1711
                        if result is not None:
3696.4.13 by Robert Collins
More Cification, removing redundant string comparisons
1712
                            path_handled = -1
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1713
                            if result is self.uninteresting:
1714
                                result = None
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
1715
                # >- loop control starts here:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1716
                # >- entry
1717
                if advance_entry and current_entry is not None:
1718
                    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.
1719
                    if self.current_block_pos < PyList_GET_SIZE(self.current_block_list):
1720
                        current_entry = self.current_block_list[self.current_block_pos]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1721
                    else:
1722
                        current_entry = None
1723
                # >- path
1724
                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.
1725
                    if not path_handled:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1726
                        # unversioned in all regards
1727
                        if self.want_unversioned:
1728
                            new_executable = bool(
1729
                                stat.S_ISREG(current_path_info[3].st_mode)
1730
                                and stat.S_IEXEC & current_path_info[3].st_mode)
1731
                            try:
1732
                                relpath_unicode = self.utf8_decode(current_path_info[0])[0]
1733
                            except UnicodeDecodeError:
1734
                                raise errors.BadFilenameEncoding(
1735
                                    current_path_info[0], osutils._fs_enc)
1736
                            if result is not None:
1737
                                raise AssertionError(
1738
                                    "result is not None: %r" % result)
1739
                            result = (None,
1740
                                (None, relpath_unicode),
1741
                                True,
1742
                                (False, False),
1743
                                (None, None),
1744
                                (None, self.utf8_decode(current_path_info[1])[0]),
1745
                                (None, current_path_info[2]),
1746
                                (None, new_executable))
1747
                        # dont descend into this unversioned path if it is
1748
                        # a dir
1749
                        if current_path_info[2] in ('directory'):
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1750
                            del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1751
                            self.path_index = self.path_index - 1
1752
                    # dont descend the disk iterator into any tree 
1753
                    # paths.
1754
                    if current_path_info[2] == 'tree-reference':
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1755
                        del self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1756
                        self.path_index = self.path_index - 1
1757
                    self.path_index = self.path_index + 1
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1758
                    if self.path_index < len(self.current_dir_list):
1759
                        current_path_info = self.current_dir_list[self.path_index]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1760
                        if current_path_info[2] == 'directory':
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1761
                            current_path_info = self._maybe_tree_ref(
1762
                                current_path_info)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1763
                    else:
1764
                        current_path_info = None
1765
                if result is not None:
1766
                    # Found a result on this pass, yield it
1767
                    return result
1768
            if self.current_block is not None:
1769
                self.block_index = self.block_index + 1
1770
                self._update_current_block()
1771
            if self.current_dir_info is not None:
1772
                self.path_index = 0
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1773
                self.current_dir_list = None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1774
                try:
1775
                    self.current_dir_info = self.dir_iterator.next()
3696.4.12 by Robert Collins
More Cification of iter_changes, smaller functions, explicit type usage.
1776
                    self.current_dir_list = self.current_dir_info[1]
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1777
                except StopIteration:
1778
                    self.current_dir_info = None