/brz/remove-bazaar

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