~bzr-pqm/bzr/bzr.dev

5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 Canonical Ltd
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
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
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
16
17
"""Tests of the dirstate functionality being built for WorkingTreeFormat4."""
18
1852.13.20 by Robert Collins
Steps toward an object model.
19
import os
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
20
import tempfile
1852.13.20 by Robert Collins
Steps toward an object model.
21
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
22
from bzrlib import (
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
23
    controldir,
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
24
    dirstate,
25
    errors,
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
26
    inventory,
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
27
    memorytree,
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
28
    osutils,
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
29
    revision as _mod_revision,
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
30
    revisiontree,
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
31
    tests,
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
32
    workingtree_4,
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
33
    )
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
34
from bzrlib.tests import (
35
    features,
36
    test_osutils,
37
    )
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
38
from bzrlib.tests.scenarios import load_tests_apply_scenarios
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
39
40
41
# TODO:
2255.2.4 by Robert Collins
Snapshot dirstate development
42
# TESTS to write:
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
43
# general checks for NOT_IN_MEMORY error conditions.
44
# set_path_id on a NOT_IN_MEMORY dirstate
2255.2.4 by Robert Collins
Snapshot dirstate development
45
# set_path_id  unicode support
46
# set_path_id  setting id of a path not root
47
# set_path_id  setting id when there are parents without the id in the parents
48
# set_path_id  setting id when there are parents with the id in the parents
49
# set_path_id  setting id when state is not in memory
50
# set_path_id  setting id when state is in memory unmodified
51
# set_path_id  setting id when state is in memory modified
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
52
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
53
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
54
load_tests = load_tests_apply_scenarios
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
55
56
57
class TestCaseWithDirState(tests.TestCaseWithTransport):
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
58
    """Helper functions for creating DirState objects with various content."""
59
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
60
    scenarios = test_osutils.dir_reader_scenarios()
61
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
62
    # Set by load_tests
63
    _dir_reader_class = None
64
    _native_to_unicode = None # Not used yet
65
66
    def setUp(self):
6552.1.4 by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super().
67
        super(TestCaseWithDirState, self).setUp()
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
68
        self.overrideAttr(osutils,
69
                          '_selected_dir_reader', self._dir_reader_class())
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
70
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
71
    def create_empty_dirstate(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
72
        """Return a locked but empty dirstate"""
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
73
        state = dirstate.DirState.initialize('dirstate')
74
        return state
75
76
    def create_dirstate_with_root(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
77
        """Return a write-locked state with a single root entry."""
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
78
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
79
        root_entry_direntry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
80
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
81
            ]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
82
        dirblocks = []
83
        dirblocks.append(('', [root_entry_direntry]))
84
        dirblocks.append(('', []))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
85
        state = self.create_empty_dirstate()
86
        try:
87
            state._set_data([], dirblocks)
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
88
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
89
        except:
90
            state.unlock()
91
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
92
        return state
93
94
    def create_dirstate_with_root_and_subdir(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
95
        """Return a locked DirState with a root and a subdir"""
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
96
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
97
        subdir_entry = ('', 'subdir', 'subdir-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
98
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
99
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
100
        state = self.create_dirstate_with_root()
101
        try:
102
            dirblocks = list(state._dirblocks)
103
            dirblocks[1][1].append(subdir_entry)
104
            state._set_data([], dirblocks)
105
        except:
106
            state.unlock()
107
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
108
        return state
109
110
    def create_complex_dirstate(self):
111
        """This dirstate contains multiple files and directories.
112
113
         /        a-root-value
114
         a/       a-dir
115
         b/       b-dir
116
         c        c-file
117
         d        d-file
118
         a/e/     e-dir
119
         a/f      f-file
120
         b/g      g-file
121
         b/h\xc3\xa5  h-\xc3\xa5-file  #This is u'\xe5' encoded into utf-8
122
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
123
        Notice that a/e is an empty directory.
124
125
        :return: The dirstate, still write-locked.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
126
        """
127
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
128
        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
129
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
130
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
131
            ]
132
        a_entry = ('', 'a', 'a-dir'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
133
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
134
            ]
135
        b_entry = ('', 'b', 'b-dir'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
136
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
137
            ]
138
        c_entry = ('', 'c', 'c-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
139
            ('f', null_sha, 10, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
140
            ]
141
        d_entry = ('', 'd', 'd-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
142
            ('f', null_sha, 20, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
143
            ]
144
        e_entry = ('a', 'e', 'e-dir'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
145
            ('d', '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
146
            ]
147
        f_entry = ('a', 'f', 'f-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
148
            ('f', null_sha, 30, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
149
            ]
150
        g_entry = ('b', 'g', 'g-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
151
            ('f', null_sha, 30, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
152
            ]
153
        h_entry = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
154
            ('f', null_sha, 40, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
155
            ]
156
        dirblocks = []
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
157
        dirblocks.append(('', [root_entry]))
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
158
        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
159
        dirblocks.append(('a', [e_entry, f_entry]))
160
        dirblocks.append(('b', [g_entry, h_entry]))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
161
        state = dirstate.DirState.initialize('dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
162
        state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
163
        try:
164
            state._set_data([], dirblocks)
165
        except:
166
            state.unlock()
167
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
168
        return state
169
170
    def check_state_with_reopen(self, expected_result, state):
171
        """Check that state has current state expected_result.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
172
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
173
        This will check the current state, open the file anew and check it
174
        again.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
175
        This function expects the current state to be locked for writing, and
176
        will unlock it before re-opening.
177
        This is required because we can't open a lock_read() while something
178
        else has a lock_write().
179
            write => mutually exclusive lock
180
            read => shared lock
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
181
        """
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
182
        # The state should already be write locked, since we just had to do
183
        # some operation to get here.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
184
        self.assertTrue(state._lock_token is not None)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
185
        try:
186
            self.assertEqual(expected_result[0],  state.get_parent_ids())
187
            # there should be no ghosts in this tree.
188
            self.assertEqual([], state.get_ghosts())
189
            # there should be one fileid in this tree - the root of the tree.
190
            self.assertEqual(expected_result[1], list(state._iter_entries()))
191
            state.save()
192
        finally:
193
            state.unlock()
2425.3.1 by John Arbash Meinel
Change the DirState.test_initialize test so that we don't try to read a locked file.
194
        del state
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
195
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
196
        state.lock_read()
197
        try:
198
            self.assertEqual(expected_result[1], list(state._iter_entries()))
199
        finally:
200
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
201
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
202
    def create_basic_dirstate(self):
203
        """Create a dirstate with a few files and directories.
204
205
            a
206
            b/
207
              c
208
              d/
209
                e
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
210
            b-c
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
211
            f
212
        """
213
        tree = self.make_branch_and_tree('tree')
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
214
        paths = ['a', 'b/', 'b/c', 'b/d/', 'b/d/e', 'b-c', 'f']
215
        file_ids = ['a-id', 'b-id', 'c-id', 'd-id', 'e-id', 'b-c-id', 'f-id']
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
216
        self.build_tree(['tree/' + p for p in paths])
217
        tree.set_root_id('TREE_ROOT')
218
        tree.add([p.rstrip('/') for p in paths], file_ids)
219
        tree.commit('initial', rev_id='rev-1')
220
        revision_id = 'rev-1'
221
        # a_packed_stat = dirstate.pack_stat(os.stat('tree/a'))
2520.3.1 by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport.
222
        t = self.get_transport('tree')
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
223
        a_text = t.get_bytes('a')
224
        a_sha = osutils.sha_string(a_text)
225
        a_len = len(a_text)
226
        # b_packed_stat = dirstate.pack_stat(os.stat('tree/b'))
227
        # c_packed_stat = dirstate.pack_stat(os.stat('tree/b/c'))
228
        c_text = t.get_bytes('b/c')
229
        c_sha = osutils.sha_string(c_text)
230
        c_len = len(c_text)
231
        # d_packed_stat = dirstate.pack_stat(os.stat('tree/b/d'))
232
        # e_packed_stat = dirstate.pack_stat(os.stat('tree/b/d/e'))
233
        e_text = t.get_bytes('b/d/e')
234
        e_sha = osutils.sha_string(e_text)
235
        e_len = len(e_text)
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
236
        b_c_text = t.get_bytes('b-c')
237
        b_c_sha = osutils.sha_string(b_c_text)
238
        b_c_len = len(b_c_text)
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
239
        # f_packed_stat = dirstate.pack_stat(os.stat('tree/f'))
240
        f_text = t.get_bytes('f')
241
        f_sha = osutils.sha_string(f_text)
242
        f_len = len(f_text)
243
        null_stat = dirstate.DirState.NULLSTAT
244
        expected = {
245
            '':(('', '', 'TREE_ROOT'), [
246
                  ('d', '', 0, False, null_stat),
247
                  ('d', '', 0, False, revision_id),
248
                ]),
249
            'a':(('', 'a', 'a-id'), [
250
                   ('f', '', 0, False, null_stat),
251
                   ('f', a_sha, a_len, False, revision_id),
252
                 ]),
253
            'b':(('', 'b', 'b-id'), [
254
                  ('d', '', 0, False, null_stat),
255
                  ('d', '', 0, False, revision_id),
256
                 ]),
257
            'b/c':(('b', 'c', 'c-id'), [
258
                    ('f', '', 0, False, null_stat),
259
                    ('f', c_sha, c_len, False, revision_id),
260
                   ]),
261
            'b/d':(('b', 'd', 'd-id'), [
262
                    ('d', '', 0, False, null_stat),
263
                    ('d', '', 0, False, revision_id),
264
                   ]),
265
            'b/d/e':(('b/d', 'e', 'e-id'), [
266
                      ('f', '', 0, False, null_stat),
267
                      ('f', e_sha, e_len, False, revision_id),
268
                     ]),
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
269
            'b-c':(('', 'b-c', 'b-c-id'), [
270
                      ('f', '', 0, False, null_stat),
271
                      ('f', b_c_sha, b_c_len, False, revision_id),
272
                     ]),
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
273
            'f':(('', 'f', 'f-id'), [
274
                  ('f', '', 0, False, null_stat),
275
                  ('f', f_sha, f_len, False, revision_id),
276
                 ]),
277
        }
278
        state = dirstate.DirState.from_tree(tree, 'dirstate')
279
        try:
280
            state.save()
281
        finally:
282
            state.unlock()
283
        # Use a different object, to make sure nothing is pre-cached in memory.
284
        state = dirstate.DirState.on_file('dirstate')
285
        state.lock_read()
286
        self.addCleanup(state.unlock)
287
        self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
288
                         state._dirblock_state)
289
        # This is code is only really tested if we actually have to make more
290
        # than one read, so set the page size to something smaller.
291
        # We want it to contain about 2.2 records, so that we have a couple
292
        # records that we can read per attempt
293
        state._bisect_page_size = 200
294
        return tree, state, expected
295
296
    def create_duplicated_dirstate(self):
297
        """Create a dirstate with a deleted and added entries.
298
299
        This grabs a basic_dirstate, and then removes and re adds every entry
300
        with a new file id.
301
        """
302
        tree, state, expected = self.create_basic_dirstate()
303
        # Now we will just remove and add every file so we get an extra entry
304
        # per entry. Unversion in reverse order so we handle subdirs
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
305
        tree.unversion(['f-id', 'b-c-id', 'e-id', 'd-id', 'c-id', 'b-id', 'a-id'])
306
        tree.add(['a', 'b', 'b/c', 'b/d', 'b/d/e', 'b-c', 'f'],
307
                 ['a-id2', 'b-id2', 'c-id2', 'd-id2', 'e-id2', 'b-c-id2', 'f-id2'])
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
308
309
        # Update the expected dictionary.
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
310
        for path in ['a', 'b', 'b/c', 'b/d', 'b/d/e', 'b-c', 'f']:
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
311
            orig = expected[path]
312
            path2 = path + '2'
313
            # This record was deleted in the current tree
314
            expected[path] = (orig[0], [dirstate.DirState.NULL_PARENT_DETAILS,
315
                                        orig[1][1]])
316
            new_key = (orig[0][0], orig[0][1], orig[0][2]+'2')
317
            # And didn't exist in the basis tree
318
            expected[path2] = (new_key, [orig[1][0],
319
                                         dirstate.DirState.NULL_PARENT_DETAILS])
320
321
        # We will replace the 'dirstate' file underneath 'state', but that is
322
        # okay as lock as we unlock 'state' first.
323
        state.unlock()
324
        try:
325
            new_state = dirstate.DirState.from_tree(tree, 'dirstate')
326
            try:
327
                new_state.save()
328
            finally:
329
                new_state.unlock()
330
        finally:
331
            # But we need to leave state in a read-lock because we already have
332
            # a cleanup scheduled
333
            state.lock_read()
334
        return tree, state, expected
335
336
    def create_renamed_dirstate(self):
337
        """Create a dirstate with a few internal renames.
338
339
        This takes the basic dirstate, and moves the paths around.
340
        """
341
        tree, state, expected = self.create_basic_dirstate()
342
        # Rename a file
343
        tree.rename_one('a', 'b/g')
344
        # And a directory
345
        tree.rename_one('b/d', 'h')
346
347
        old_a = expected['a']
348
        expected['a'] = (old_a[0], [('r', 'b/g', 0, False, ''), old_a[1][1]])
349
        expected['b/g'] = (('b', 'g', 'a-id'), [old_a[1][0],
350
                                                ('r', 'a', 0, False, '')])
351
        old_d = expected['b/d']
352
        expected['b/d'] = (old_d[0], [('r', 'h', 0, False, ''), old_d[1][1]])
353
        expected['h'] = (('', 'h', 'd-id'), [old_d[1][0],
354
                                             ('r', 'b/d', 0, False, '')])
355
356
        old_e = expected['b/d/e']
357
        expected['b/d/e'] = (old_e[0], [('r', 'h/e', 0, False, ''),
358
                             old_e[1][1]])
359
        expected['h/e'] = (('h', 'e', 'e-id'), [old_e[1][0],
360
                                                ('r', 'b/d/e', 0, False, '')])
361
362
        state.unlock()
363
        try:
364
            new_state = dirstate.DirState.from_tree(tree, 'dirstate')
365
            try:
366
                new_state.save()
367
            finally:
368
                new_state.unlock()
369
        finally:
370
            state.lock_read()
371
        return tree, state, expected
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
372
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
373
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
374
class TestTreeToDirState(TestCaseWithDirState):
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
375
376
    def test_empty_to_dirstate(self):
377
        """We should be able to create a dirstate for an empty tree."""
378
        # There are no files on disk and no parents
379
        tree = self.make_branch_and_tree('tree')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
380
        expected_result = ([], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
381
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
382
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
383
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
384
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
385
        state._validate()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
386
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
387
388
    def test_1_parents_empty_to_dirstate(self):
389
        # create a parent by doing a commit
390
        tree = self.make_branch_and_tree('tree')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
391
        rev_id = tree.commit('first post').encode('utf8')
392
        root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
393
        expected_result = ([rev_id], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
394
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
395
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
396
              ('d', '', 0, False, rev_id), # first parent details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
397
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
398
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
399
        self.check_state_with_reopen(expected_result, state)
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
400
        state.lock_read()
401
        try:
402
            state._validate()
403
        finally:
404
            state.unlock()
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
405
406
    def test_2_parents_empty_to_dirstate(self):
407
        # create a parent by doing a commit
408
        tree = self.make_branch_and_tree('tree')
409
        rev_id = tree.commit('first post')
410
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
411
        rev_id2 = tree2.commit('second post', allow_pointless=True)
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
412
        tree.merge_from_branch(tree2.branch)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
413
        expected_result = ([rev_id, rev_id2], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
414
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
415
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
416
              ('d', '', 0, False, rev_id), # first parent details
4599.4.24 by Robert Collins
Prepare dirstate tests for 2a as default.
417
              ('d', '', 0, False, rev_id), # second parent details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
418
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
419
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
420
        self.check_state_with_reopen(expected_result, state)
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
421
        state.lock_read()
422
        try:
423
            state._validate()
424
        finally:
425
            state.unlock()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
426
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
427
    def test_empty_unknowns_are_ignored_to_dirstate(self):
428
        """We should be able to create a dirstate for an empty tree."""
429
        # There are no files on disk and no parents
430
        tree = self.make_branch_and_tree('tree')
1852.13.10 by Robert Collins
Use just the tree api to generate dirstate information.
431
        self.build_tree(['tree/unknown'])
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
432
        expected_result = ([], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
433
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
434
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
435
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
436
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
437
        self.check_state_with_reopen(expected_result, state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
438
1852.13.12 by Robert Collins
get actual parent info for the first parent.
439
    def get_tree_with_a_file(self):
440
        tree = self.make_branch_and_tree('tree')
441
        self.build_tree(['tree/a file'])
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
442
        tree.add('a file', 'a-file-id')
1852.13.12 by Robert Collins
get actual parent info for the first parent.
443
        return tree
444
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
445
    def test_non_empty_no_parents_to_dirstate(self):
446
        """We should be able to create a dirstate for an empty tree."""
1852.13.11 by Robert Collins
Get one content containing test passing.
447
        # There are files on disk and no parents
1852.13.12 by Robert Collins
get actual parent info for the first parent.
448
        tree = self.get_tree_with_a_file()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
449
        expected_result = ([], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
450
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
451
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
452
             ]),
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
453
            (('', 'a file', 'a-file-id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
454
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
455
             ]),
456
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
457
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
458
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
459
460
    def test_1_parents_not_empty_to_dirstate(self):
461
        # create a parent by doing a commit
1852.13.12 by Robert Collins
get actual parent info for the first parent.
462
        tree = self.get_tree_with_a_file()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
463
        rev_id = tree.commit('first post').encode('utf8')
1852.13.12 by Robert Collins
get actual parent info for the first parent.
464
        # change the current content to be different this will alter stat, sha
465
        # and length:
466
        self.build_tree_contents([('tree/a file', 'new content\n')])
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
467
        expected_result = ([rev_id], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
468
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
469
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
470
              ('d', '', 0, False, rev_id), # first parent details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
471
             ]),
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
472
            (('', 'a file', 'a-file-id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
473
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
474
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
475
               rev_id), # first parent
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
476
             ]),
477
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
478
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
479
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
480
481
    def test_2_parents_not_empty_to_dirstate(self):
482
        # create a parent by doing a commit
1852.13.13 by Robert Collins
2-parent case working.
483
        tree = self.get_tree_with_a_file()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
484
        rev_id = tree.commit('first post').encode('utf8')
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
485
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
1852.13.13 by Robert Collins
2-parent case working.
486
        # change the current content to be different this will alter stat, sha
487
        # and length:
488
        self.build_tree_contents([('tree2/a file', 'merge content\n')])
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
489
        rev_id2 = tree2.commit('second post').encode('utf8')
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
490
        tree.merge_from_branch(tree2.branch)
1852.13.13 by Robert Collins
2-parent case working.
491
        # change the current content to be different this will alter stat, sha
492
        # and length again, giving us three distinct values:
493
        self.build_tree_contents([('tree/a file', 'new content\n')])
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
494
        expected_result = ([rev_id, rev_id2], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
495
            (('', '', tree.get_root_id()), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
496
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
497
              ('d', '', 0, False, rev_id), # first parent details
4599.4.24 by Robert Collins
Prepare dirstate tests for 2a as default.
498
              ('d', '', 0, False, rev_id), # second parent details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
499
             ]),
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
500
            (('', 'a file', 'a-file-id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
501
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
502
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
503
               rev_id), # first parent
504
              ('f', '314d796174c9412647c3ce07dfb5d36a94e72958', 14, False,
505
               rev_id2), # second parent
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
506
             ]),
507
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
508
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
509
        self.check_state_with_reopen(expected_result, state)
510
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
511
    def test_colliding_fileids(self):
512
        # test insertion of parents creating several entries at the same path.
513
        # we used to have a bug where they could cause the dirstate to break
514
        # its ordering invariants.
515
        # create some trees to test from
516
        parents = []
517
        for i in range(7):
518
            tree = self.make_branch_and_tree('tree%d' % i)
519
            self.build_tree(['tree%d/name' % i,])
520
            tree.add(['name'], ['file-id%d' % i])
521
            revision_id = 'revid-%d' % i
522
            tree.commit('message', rev_id=revision_id)
523
            parents.append((revision_id,
524
                tree.branch.repository.revision_tree(revision_id)))
525
        # now fold these trees into a dirstate
526
        state = dirstate.DirState.initialize('dirstate')
527
        try:
528
            state.set_parent_trees(parents, [])
529
            state._validate()
530
        finally:
531
            state.unlock()
532
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
533
534
class TestDirStateOnFile(TestCaseWithDirState):
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
535
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
536
    def create_updated_dirstate(self):
537
        self.build_tree(['a-file'])
538
        tree = self.make_branch_and_tree('.')
539
        tree.add(['a-file'], ['a-id'])
540
        tree.commit('add a-file')
541
        # Save and unlock the state, re-open it in readonly mode
542
        state = dirstate.DirState.from_tree(tree, 'dirstate')
543
        state.save()
544
        state.unlock()
545
        state = dirstate.DirState.on_file('dirstate')
546
        state.lock_read()
547
        return state
548
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
549
    def test_construct_with_path(self):
550
        tree = self.make_branch_and_tree('tree')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
551
        state = dirstate.DirState.from_tree(tree, 'dirstate.from_tree')
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
552
        # we want to be able to get the lines of the dirstate that we will
553
        # write to disk.
554
        lines = state.get_lines()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
555
        state.unlock()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
556
        self.build_tree_contents([('dirstate', ''.join(lines))])
557
        # get a state object
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
558
        # no parents, default tree content
559
        expected_result = ([], [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
560
            (('', '', tree.get_root_id()), # common details
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
561
             # current tree details, but new from_tree skips statting, it
562
             # uses set_state_from_inventory, and thus depends on the
563
             # inventory state.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
564
             [('d', '', 0, False, dirstate.DirState.NULLSTAT),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
565
             ])
566
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
567
        state = dirstate.DirState.on_file('dirstate')
568
        state.lock_write() # check_state_with_reopen will save() and unlock it
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
569
        self.check_state_with_reopen(expected_result, state)
570
571
    def test_can_save_clean_on_file(self):
572
        tree = self.make_branch_and_tree('tree')
573
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
574
        try:
575
            # doing a save should work here as there have been no changes.
576
            state.save()
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
577
            # TODO: stat it and check it hasn't changed; may require waiting
578
            # for the state accuracy window.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
579
        finally:
580
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
581
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
582
    def test_can_save_in_read_lock(self):
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
583
        state = self.create_updated_dirstate()
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
584
        try:
585
            entry = state._get_entry(0, path_utf8='a-file')
3709.4.1 by Robert Collins
Sha files for the stat cache more lazily rather than on first-examination, allowing less overall sha calculations to occur.
586
            # The current size should be 0 (default)
587
            self.assertEqual(0, entry[1][0][2])
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
588
            # We should have a real entry.
589
            self.assertNotEqual((None, None), entry)
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
590
            # Set the cutoff-time into the future, so things look cacheable
2485.3.14 by John Arbash Meinel
Update the code so that symlinks aren't cached at incorrect times
591
            state._sha_cutoff_time()
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
592
            state._cutoff_time += 10.0
593
            st = os.lstat('a-file')
594
            sha1sum = dirstate.update_entry(state, entry, 'a-file', st)
595
            # We updated the current sha1sum because the file is cacheable
596
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
597
                             sha1sum)
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
598
599
            # The dirblock has been updated
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
600
            self.assertEqual(st.st_size, entry[1][0][2])
5807.4.3 by John Arbash Meinel
Get the test suite to run clean for bt.test_dirstate bt.test__dirstate bt.test_workingtree
601
            self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
602
                             state._dirblock_state)
603
604
            del entry
605
            # Now, since we are the only one holding a lock, we should be able
606
            # to save and have it written to disk
607
            state.save()
608
        finally:
609
            state.unlock()
610
611
        # Re-open the file, and ensure that the state has been updated.
612
        state = dirstate.DirState.on_file('dirstate')
613
        state.lock_read()
614
        try:
615
            entry = state._get_entry(0, path_utf8='a-file')
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
616
            self.assertEqual(st.st_size, entry[1][0][2])
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
617
        finally:
618
            state.unlock()
619
620
    def test_save_fails_quietly_if_locked(self):
621
        """If dirstate is locked, save will fail without complaining."""
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
622
        state = self.create_updated_dirstate()
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
623
        try:
624
            entry = state._get_entry(0, path_utf8='a-file')
5802.3.2 by John Arbash Meinel
We have to update some tests, because what used to be IN_MEMORY_MODIFIED isn't.
625
            # No cached sha1 yet.
626
            self.assertEqual('', entry[1][0][1])
627
            # Set the cutoff-time into the future, so things look cacheable
628
            state._sha_cutoff_time()
629
            state._cutoff_time += 10.0
630
            st = os.lstat('a-file')
631
            sha1sum = dirstate.update_entry(state, entry, 'a-file', st)
632
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
633
                             sha1sum)
5807.4.3 by John Arbash Meinel
Get the test suite to run clean for bt.test_dirstate bt.test__dirstate bt.test_workingtree
634
            self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
635
                             state._dirblock_state)
636
637
            # Now, before we try to save, grab another dirstate, and take out a
638
            # read lock.
639
            # TODO: jam 20070315 Ideally this would be locked by another
640
            #       process. To make sure the file is really OS locked.
641
            state2 = dirstate.DirState.on_file('dirstate')
642
            state2.lock_read()
643
            try:
644
                # This won't actually write anything, because it couldn't grab
645
                # a write lock. But it shouldn't raise an error, either.
646
                # TODO: jam 20070315 We should probably distinguish between
647
                #       being dirty because of 'update_entry'. And dirty
648
                #       because of real modification. So that save() *does*
649
                #       raise a real error if it fails when we have real
650
                #       modifications.
651
                state.save()
652
            finally:
653
                state2.unlock()
654
        finally:
655
            state.unlock()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
656
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
657
        # The file on disk should not be modified.
658
        state = dirstate.DirState.on_file('dirstate')
659
        state.lock_read()
660
        try:
661
            entry = state._get_entry(0, path_utf8='a-file')
662
            self.assertEqual('', entry[1][0][1])
663
        finally:
664
            state.unlock()
665
3221.1.7 by Martin Pool
Update and rename test for Dirstate._changes_aborted
666
    def test_save_refuses_if_changes_aborted(self):
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
667
        self.build_tree(['a-file', 'a-dir/'])
668
        state = dirstate.DirState.initialize('dirstate')
669
        try:
670
            # No stat and no sha1 sum.
671
            state.add('a-file', 'a-file-id', 'file', None, '')
672
            state.save()
673
        finally:
674
            state.unlock()
675
676
        # The dirstate should include TREE_ROOT and 'a-file' and nothing else
677
        expected_blocks = [
678
            ('', [(('', '', 'TREE_ROOT'),
679
                   [('d', '', 0, False, dirstate.DirState.NULLSTAT)])]),
680
            ('', [(('', 'a-file', 'a-file-id'),
681
                   [('f', '', 0, False, dirstate.DirState.NULLSTAT)])]),
682
        ]
683
684
        state = dirstate.DirState.on_file('dirstate')
685
        state.lock_write()
686
        try:
687
            state._read_dirblocks_if_needed()
688
            self.assertEqual(expected_blocks, state._dirblocks)
689
690
            # Now modify the state, but mark it as inconsistent
691
            state.add('a-dir', 'a-dir-id', 'directory', None, '')
3221.1.7 by Martin Pool
Update and rename test for Dirstate._changes_aborted
692
            state._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
693
            state.save()
694
        finally:
695
            state.unlock()
696
697
        state = dirstate.DirState.on_file('dirstate')
698
        state.lock_read()
699
        try:
700
            state._read_dirblocks_if_needed()
701
            self.assertEqual(expected_blocks, state._dirblocks)
702
        finally:
703
            state.unlock()
704
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
705
706
class TestDirStateInitialize(TestCaseWithDirState):
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
707
708
    def test_initialize(self):
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
709
        expected_result = ([], [
710
            (('', '', 'TREE_ROOT'), # common details
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
711
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
712
             ])
713
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
714
        state = dirstate.DirState.initialize('dirstate')
715
        try:
716
            self.assertIsInstance(state, dirstate.DirState)
717
            lines = state.get_lines()
2425.3.1 by John Arbash Meinel
Change the DirState.test_initialize test so that we don't try to read a locked file.
718
        finally:
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
719
            state.unlock()
2425.3.1 by John Arbash Meinel
Change the DirState.test_initialize test so that we don't try to read a locked file.
720
        # On win32 you can't read from a locked file, even within the same
721
        # process. So we have to unlock and release before we check the file
722
        # contents.
723
        self.assertFileEqual(''.join(lines), 'dirstate')
724
        state.lock_read() # check_state_with_reopen will unlock
725
        self.check_state_with_reopen(expected_result, state)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
726
727
728
class TestDirStateManipulations(TestCaseWithDirState):
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
729
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
730
    def make_minimal_tree(self):
731
        tree1 = self.make_branch_and_memory_tree('tree1')
732
        tree1.lock_write()
733
        self.addCleanup(tree1.unlock)
734
        tree1.add('')
735
        revid1 = tree1.commit('foo')
736
        return tree1, revid1
737
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
738
    def test_update_minimal_updates_id_index(self):
739
        state = self.create_dirstate_with_root_and_subdir()
740
        self.addCleanup(state.unlock)
741
        id_index = state._get_id_index()
742
        self.assertEqual(['a-root-value', 'subdir-id'], sorted(id_index))
743
        state.add('file-name', 'file-id', 'file', None, '')
744
        self.assertEqual(['a-root-value', 'file-id', 'subdir-id'],
745
                         sorted(id_index))
746
        state.update_minimal(('', 'new-name', 'file-id'), 'f',
747
                             path_utf8='new-name')
748
        self.assertEqual(['a-root-value', 'file-id', 'subdir-id'],
749
                         sorted(id_index))
750
        self.assertEqual([('', 'new-name', 'file-id')],
751
                         sorted(id_index['file-id']))
752
        state._validate()
753
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
754
    def test_set_state_from_inventory_no_content_no_parents(self):
755
        # setting the current inventory is a slow but important api to support.
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
756
        tree1, revid1 = self.make_minimal_tree()
6405.2.10 by Jelmer Vernooij
Fix more tests.
757
        inv = tree1.root_inventory
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
758
        root_id = inv.path2id('')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
759
        expected_result = [], [
760
            (('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
761
             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
762
        state = dirstate.DirState.initialize('dirstate')
763
        try:
764
            state.set_state_from_inventory(inv)
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
765
            self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
766
                             state._header_state)
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
767
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
768
                             state._dirblock_state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
769
        except:
770
            state.unlock()
771
            raise
772
        else:
773
            # This will unlock it
774
            self.check_state_with_reopen(expected_result, state)
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
775
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
776
    def test_set_state_from_scratch_no_parents(self):
777
        tree1, revid1 = self.make_minimal_tree()
6405.2.10 by Jelmer Vernooij
Fix more tests.
778
        inv = tree1.root_inventory
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
779
        root_id = inv.path2id('')
780
        expected_result = [], [
781
            (('', '', root_id), [
782
             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
783
        state = dirstate.DirState.initialize('dirstate')
784
        try:
785
            state.set_state_from_scratch(inv, [], [])
786
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
787
                             state._header_state)
788
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
789
                             state._dirblock_state)
790
        except:
791
            state.unlock()
792
            raise
793
        else:
794
            # This will unlock it
795
            self.check_state_with_reopen(expected_result, state)
796
797
    def test_set_state_from_scratch_identical_parent(self):
798
        tree1, revid1 = self.make_minimal_tree()
6405.2.7 by Jelmer Vernooij
Fix more tests.
799
        inv = tree1.root_inventory
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
800
        root_id = inv.path2id('')
801
        rev_tree1 = tree1.branch.repository.revision_tree(revid1)
802
        d_entry = ('d', '', 0, False, dirstate.DirState.NULLSTAT)
803
        parent_entry = ('d', '', 0, False, revid1)
804
        expected_result = [revid1], [
805
            (('', '', root_id), [d_entry, parent_entry])]
806
        state = dirstate.DirState.initialize('dirstate')
807
        try:
808
            state.set_state_from_scratch(inv, [(revid1, rev_tree1)], [])
809
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
810
                             state._header_state)
811
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
812
                             state._dirblock_state)
813
        except:
814
            state.unlock()
815
            raise
816
        else:
817
            # This will unlock it
818
            self.check_state_with_reopen(expected_result, state)
819
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
820
    def test_set_state_from_inventory_preserves_hashcache(self):
2872.4.11 by Martin Pool
Review documentation cleanups
821
        # https://bugs.launchpad.net/bzr/+bug/146176
2872.4.1 by Martin Pool
Add xfail test for #146176
822
        # set_state_from_inventory should preserve the stat and hash value for
823
        # workingtree files that are not changed by the inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
824
2872.4.1 by Martin Pool
Add xfail test for #146176
825
        tree = self.make_branch_and_tree('.')
826
        # depends on the default format using dirstate...
827
        tree.lock_write()
828
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
829
            # make a dirstate with some valid hashcache data
2872.4.1 by Martin Pool
Add xfail test for #146176
830
            # file on disk, but that's not needed for this test
831
            foo_contents = 'contents of foo'
832
            self.build_tree_contents([('foo', foo_contents)])
833
            tree.add('foo', 'foo-id')
834
835
            foo_stat = os.stat('foo')
836
            foo_packed = dirstate.pack_stat(foo_stat)
837
            foo_sha = osutils.sha_string(foo_contents)
838
            foo_size = len(foo_contents)
839
840
            # should not be cached yet, because the file's too fresh
2872.4.8 by Martin Pool
Clear up test code
841
            self.assertEqual(
842
                (('', 'foo', 'foo-id',),
843
                 [('f', '', 0, False, dirstate.DirState.NULLSTAT)]),
844
                tree._dirstate._get_entry(0, 'foo-id'))
2872.4.1 by Martin Pool
Add xfail test for #146176
845
            # poke in some hashcache information - it wouldn't normally be
846
            # stored because it's too fresh
847
            tree._dirstate.update_minimal(
848
                ('', 'foo', 'foo-id'),
849
                'f', False, foo_sha, foo_packed, foo_size, 'foo')
850
            # now should be cached
2872.4.8 by Martin Pool
Clear up test code
851
            self.assertEqual(
852
                (('', 'foo', 'foo-id',),
853
                 [('f', foo_sha, foo_size, False, foo_packed)]),
854
                tree._dirstate._get_entry(0, 'foo-id'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
855
2872.4.1 by Martin Pool
Add xfail test for #146176
856
            # extract the inventory, and add something to it
6405.2.10 by Jelmer Vernooij
Fix more tests.
857
            inv = tree._get_root_inventory()
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
858
            # should see the file we poked in...
859
            self.assertTrue(inv.has_id('foo-id'))
860
            self.assertTrue(inv.has_filename('foo'))
2872.4.1 by Martin Pool
Add xfail test for #146176
861
            inv.add_path('bar', 'file', 'bar-id')
2872.4.13 by Martin Pool
Validate dirstate during tests
862
            tree._dirstate._validate()
2872.4.11 by Martin Pool
Review documentation cleanups
863
            # this used to cause it to lose its hashcache
2872.4.1 by Martin Pool
Add xfail test for #146176
864
            tree._dirstate.set_state_from_inventory(inv)
2872.4.13 by Martin Pool
Validate dirstate during tests
865
            tree._dirstate._validate()
2872.4.1 by Martin Pool
Add xfail test for #146176
866
        finally:
867
            tree.unlock()
868
869
        tree.lock_read()
870
        try:
871
            # now check that the state still has the original hashcache value
872
            state = tree._dirstate
2872.4.13 by Martin Pool
Validate dirstate during tests
873
            state._validate()
2872.4.1 by Martin Pool
Add xfail test for #146176
874
            foo_tuple = state._get_entry(0, path_utf8='foo')
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
875
            self.assertEqual(
2872.4.1 by Martin Pool
Add xfail test for #146176
876
                (('', 'foo', 'foo-id',),
877
                 [('f', foo_sha, len(foo_contents), False,
878
                   dirstate.pack_stat(foo_stat))]),
879
                foo_tuple)
880
        finally:
881
            tree.unlock()
882
2487.1.1 by John Arbash Meinel
Adding a (broken) test that set_state_from_inventory works
883
    def test_set_state_from_inventory_mixed_paths(self):
884
        tree1 = self.make_branch_and_tree('tree1')
885
        self.build_tree(['tree1/a/', 'tree1/a/b/', 'tree1/a-b/',
886
                         'tree1/a/b/foo', 'tree1/a-b/bar'])
887
        tree1.lock_write()
888
        try:
889
            tree1.add(['a', 'a/b', 'a-b', 'a/b/foo', 'a-b/bar'],
890
                      ['a-id', 'b-id', 'a-b-id', 'foo-id', 'bar-id'])
891
            tree1.commit('rev1', rev_id='rev1')
892
            root_id = tree1.get_root_id()
6405.2.10 by Jelmer Vernooij
Fix more tests.
893
            inv = tree1.root_inventory
2487.1.1 by John Arbash Meinel
Adding a (broken) test that set_state_from_inventory works
894
        finally:
895
            tree1.unlock()
896
        expected_result1 = [('', '', root_id, 'd'),
897
                            ('', 'a', 'a-id', 'd'),
898
                            ('', 'a-b', 'a-b-id', 'd'),
899
                            ('a', 'b', 'b-id', 'd'),
900
                            ('a/b', 'foo', 'foo-id', 'f'),
901
                            ('a-b', 'bar', 'bar-id', 'f'),
902
                           ]
903
        expected_result2 = [('', '', root_id, 'd'),
904
                            ('', 'a', 'a-id', 'd'),
905
                            ('', 'a-b', 'a-b-id', 'd'),
906
                            ('a-b', 'bar', 'bar-id', 'f'),
907
                           ]
908
        state = dirstate.DirState.initialize('dirstate')
909
        try:
910
            state.set_state_from_inventory(inv)
911
            values = []
912
            for entry in state._iter_entries():
913
                values.append(entry[0] + entry[1][0][:1])
914
            self.assertEqual(expected_result1, values)
915
            del inv['b-id']
916
            state.set_state_from_inventory(inv)
917
            values = []
918
            for entry in state._iter_entries():
919
                values.append(entry[0] + entry[1][0][:1])
920
            self.assertEqual(expected_result2, values)
921
        finally:
922
            state.unlock()
923
2255.2.4 by Robert Collins
Snapshot dirstate development
924
    def test_set_path_id_no_parents(self):
925
        """The id of a path can be changed trivally with no parents."""
926
        state = dirstate.DirState.initialize('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
927
        try:
928
            # check precondition to be sure the state does change appropriately.
4634.123.4 by John Arbash Meinel
Start working on some direct dirstate tests.
929
            root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
930
            self.assertEqual([root_entry], list(state._iter_entries()))
931
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
932
            self.assertEqual(root_entry,
933
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
934
            self.assertEqual((None, None),
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
935
                             state._get_entry(0, fileid_utf8='second-root-id'))
936
            state.set_path_id('', 'second-root-id')
937
            new_root_entry = (('', '', 'second-root-id'),
4634.123.4 by John Arbash Meinel
Start working on some direct dirstate tests.
938
                              [('d', '', 0, False, 'x'*32)])
939
            expected_rows = [new_root_entry]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
940
            self.assertEqual(expected_rows, list(state._iter_entries()))
4634.123.4 by John Arbash Meinel
Start working on some direct dirstate tests.
941
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
942
            self.assertEqual(new_root_entry, 
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
943
                             state._get_entry(0, fileid_utf8='second-root-id'))
4634.123.4 by John Arbash Meinel
Start working on some direct dirstate tests.
944
            self.assertEqual((None, None),
945
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
946
            # should work across save too
947
            state.save()
948
        finally:
949
            state.unlock()
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
950
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
951
        state.lock_read()
952
        try:
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
953
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
954
            self.assertEqual(expected_rows, list(state._iter_entries()))
955
        finally:
956
            state.unlock()
2255.2.4 by Robert Collins
Snapshot dirstate development
957
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
958
    def test_set_path_id_with_parents(self):
959
        """Set the root file id in a dirstate with parents"""
960
        mt = self.make_branch_and_tree('mt')
2255.2.178 by Martin Pool
test_set_path_id_with_parents shouldn't depend on tree default root id
961
        # in case the default tree format uses a different root id
962
        mt.set_root_id('TREE_ROOT')
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
963
        mt.commit('foo', rev_id='parent-revid')
964
        rt = mt.branch.repository.revision_tree('parent-revid')
965
        state = dirstate.DirState.initialize('dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
966
        state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
967
        try:
968
            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
969
            root_entry = (('', '', 'TREE_ROOT'),
970
                          [('d', '', 0, False, 'x'*32),
971
                           ('d', '', 0, False, 'parent-revid')])
972
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
973
            self.assertEqual(root_entry,
974
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
975
            self.assertEqual((None, None),
976
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
977
            state.set_path_id('', 'Asecond-root-id')
2255.2.177 by Martin Pool
merge dirstate sorting fix, add more validation tests
978
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
979
            # now see that it is what we expected
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
980
            old_root_entry = (('', '', 'TREE_ROOT'),
981
                              [('a', '', 0, False, ''),
982
                               ('d', '', 0, False, 'parent-revid')])
983
            new_root_entry = (('', '', 'Asecond-root-id'),
984
                              [('d', '', 0, False, ''),
985
                               ('a', '', 0, False, '')])
986
            expected_rows = [new_root_entry, old_root_entry]
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
987
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
988
            self.assertEqual(expected_rows, list(state._iter_entries()))
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
989
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
990
            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
991
            self.assertEqual((None, None),
992
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
993
            self.assertEqual(old_root_entry,
994
                             state._get_entry(1, fileid_utf8='TREE_ROOT'))
995
            self.assertEqual(new_root_entry,
996
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
997
            self.assertEqual((None, None),
998
                             state._get_entry(1, fileid_utf8='Asecond-root-id'))
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
999
            # should work across save too
1000
            state.save()
1001
        finally:
1002
            state.unlock()
1003
        # now flush & check we get the same
1004
        state = dirstate.DirState.on_file('dirstate')
1005
        state.lock_read()
1006
        try:
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
1007
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
1008
            self.assertEqual(expected_rows, list(state._iter_entries()))
1009
        finally:
1010
            state.unlock()
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
1011
        # now change within an existing file-backed state
1012
        state.lock_write()
1013
        try:
1014
            state._validate()
1015
            state.set_path_id('', 'tree-root-2')
1016
            state._validate()
1017
        finally:
1018
            state.unlock()
1019
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1020
    def test_set_parent_trees_no_content(self):
1021
        # set_parent_trees is a slow but important api to support.
1022
        tree1 = self.make_branch_and_memory_tree('tree1')
2255.2.2 by Robert Collins
Partial updates for API changes in trunk.
1023
        tree1.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1024
        try:
1025
            tree1.add('')
1026
            revid1 = tree1.commit('foo')
1027
        finally:
1028
            tree1.unlock()
2255.2.4 by Robert Collins
Snapshot dirstate development
1029
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1030
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
2255.2.2 by Robert Collins
Partial updates for API changes in trunk.
1031
        tree2.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1032
        try:
1033
            revid2 = tree2.commit('foo')
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
1034
            root_id = tree2.get_root_id()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1035
        finally:
1036
            tree2.unlock()
1037
        state = dirstate.DirState.initialize('dirstate')
1038
        try:
1039
            state.set_path_id('', root_id)
1040
            state.set_parent_trees(
1041
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1042
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
1043
                 ('ghost-rev', None)),
1044
                ['ghost-rev'])
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1045
            # check we can reopen and use the dirstate after setting parent
1046
            # trees.
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
1047
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1048
            state.save()
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
1049
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1050
        finally:
1051
            state.unlock()
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1052
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1053
        state.lock_write()
1054
        try:
1055
            self.assertEqual([revid1, revid2, 'ghost-rev'],
1056
                             state.get_parent_ids())
1057
            # iterating the entire state ensures that the state is parsable.
1058
            list(state._iter_entries())
1059
            # be sure that it sets not appends - change it
1060
            state.set_parent_trees(
1061
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1062
                 ('ghost-rev', None)),
1063
                ['ghost-rev'])
1064
            # and now put it back.
1065
            state.set_parent_trees(
1066
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1067
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
1068
                 ('ghost-rev', tree2.branch.repository.revision_tree(
1069
                                   _mod_revision.NULL_REVISION))),
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1070
                ['ghost-rev'])
1071
            self.assertEqual([revid1, revid2, 'ghost-rev'],
1072
                             state.get_parent_ids())
1073
            # the ghost should be recorded as such by set_parent_trees.
1074
            self.assertEqual(['ghost-rev'], state.get_ghosts())
1075
            self.assertEqual(
1076
                [(('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
1077
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1078
                  ('d', '', 0, False, revid1),
4599.4.24 by Robert Collins
Prepare dirstate tests for 2a as default.
1079
                  ('d', '', 0, False, revid1)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1080
                  ])],
1081
                list(state._iter_entries()))
1082
        finally:
1083
            state.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1084
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1085
    def test_set_parent_trees_file_missing_from_tree(self):
1086
        # Adding a parent tree may reference files not in the current state.
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1087
        # they should get listed just once by id, even if they are in two
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1088
        # separate trees.
1089
        # set_parent_trees is a slow but important api to support.
1090
        tree1 = self.make_branch_and_memory_tree('tree1')
1091
        tree1.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1092
        try:
1093
            tree1.add('')
1094
            tree1.add(['a file'], ['file-id'], ['file'])
1095
            tree1.put_file_bytes_non_atomic('file-id', 'file-content')
1096
            revid1 = tree1.commit('foo')
1097
        finally:
1098
            tree1.unlock()
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1099
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1100
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1101
        tree2.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1102
        try:
1103
            tree2.put_file_bytes_non_atomic('file-id', 'new file-content')
1104
            revid2 = tree2.commit('foo')
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
1105
            root_id = tree2.get_root_id()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1106
        finally:
1107
            tree2.unlock()
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1108
        # check the layout in memory
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1109
        expected_result = [revid1.encode('utf8'), revid2.encode('utf8')], [
1110
            (('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
1111
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1112
             ('d', '', 0, False, revid1.encode('utf8')),
4599.4.24 by Robert Collins
Prepare dirstate tests for 2a as default.
1113
             ('d', '', 0, False, revid1.encode('utf8'))
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1114
             ]),
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1115
            (('', 'a file', 'file-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1116
             ('a', '', 0, False, ''),
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1117
             ('f', '2439573625385400f2a669657a7db6ae7515d371', 12, False,
1118
              revid1.encode('utf8')),
1119
             ('f', '542e57dc1cda4af37cb8e55ec07ce60364bb3c7d', 16, False,
1120
              revid2.encode('utf8'))
1121
             ])
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1122
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1123
        state = dirstate.DirState.initialize('dirstate')
1124
        try:
1125
            state.set_path_id('', root_id)
1126
            state.set_parent_trees(
1127
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1128
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
1129
                 ), [])
1130
        except:
1131
            state.unlock()
1132
            raise
1133
        else:
1134
            # check_state_with_reopen will unlock
1135
            self.check_state_with_reopen(expected_result, state)
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
1136
1852.13.20 by Robert Collins
Steps toward an object model.
1137
    ### add a path via _set_data - so we dont need delta work, just
1138
    # raw data in, and ensure that it comes out via get_lines happily.
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1139
1852.13.25 by Robert Collins
Snapshot state
1140
    def test_add_path_to_root_no_parents_all_data(self):
1141
        # The most trivial addition of a path is when there are no parents and
1142
        # its in the root and all data about the file is supplied
1143
        self.build_tree(['a file'])
1144
        stat = os.lstat('a file')
1145
        # the 1*20 is the sha1 pretend value.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1146
        state = dirstate.DirState.initialize('dirstate')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1147
        expected_entries = [
1148
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1149
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1150
             ]),
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
1151
            (('', 'a file', 'a-file-id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1152
             ('f', '1'*20, 19, False, dirstate.pack_stat(stat)), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1153
             ]),
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1154
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1155
        try:
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
1156
            state.add('a file', 'a-file-id', 'file', stat, '1'*20)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1157
            # having added it, it should be in the output of iter_entries.
1158
            self.assertEqual(expected_entries, list(state._iter_entries()))
1159
            # saving and reloading should not affect this.
1160
            state.save()
1161
        finally:
1162
            state.unlock()
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1163
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1164
        state.lock_read()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1165
        self.addCleanup(state.unlock)
1166
        self.assertEqual(expected_entries, list(state._iter_entries()))
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1167
1168
    def test_add_path_to_unversioned_directory(self):
2255.2.29 by Robert Collins
Change the error raised from Dirstate.add for an unversioned parent path to match the WorkingTree interface.
1169
        """Adding a path to an unversioned directory should error.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1170
1171
        This is a duplicate of TestWorkingTree.test_add_in_unversioned,
2255.2.29 by Robert Collins
Change the error raised from Dirstate.add for an unversioned parent path to match the WorkingTree interface.
1172
        once dirstate is stable and if it is merged with WorkingTree3, consider
1173
        removing this copy of the test.
1174
        """
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1175
        self.build_tree(['unversioned/', 'unversioned/a file'])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1176
        state = dirstate.DirState.initialize('dirstate')
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1177
        self.addCleanup(state.unlock)
1178
        self.assertRaises(errors.NotVersionedError, state.add,
1179
                          'unversioned/a file', 'a-file-id', 'file', None, None)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1180
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1181
    def test_add_directory_to_root_no_parents_all_data(self):
1182
        # The most trivial addition of a dir is when there are no parents and
1183
        # its in the root and all data about the file is supplied
1184
        self.build_tree(['a dir/'])
1185
        stat = os.lstat('a dir')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1186
        expected_entries = [
1187
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1188
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1189
             ]),
1190
            (('', 'a dir', 'a dir id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1191
             ('d', '', 0, False, dirstate.pack_stat(stat)), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1192
             ]),
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1193
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1194
        state = dirstate.DirState.initialize('dirstate')
1195
        try:
1196
            state.add('a dir', 'a dir id', 'directory', stat, None)
1197
            # having added it, it should be in the output of iter_entries.
1198
            self.assertEqual(expected_entries, list(state._iter_entries()))
1199
            # saving and reloading should not affect this.
1200
            state.save()
1201
        finally:
1202
            state.unlock()
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
1203
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1204
        state.lock_read()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1205
        self.addCleanup(state.unlock)
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
1206
        state._validate()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1207
        self.assertEqual(expected_entries, list(state._iter_entries()))
1852.13.25 by Robert Collins
Snapshot state
1208
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1209
    def _test_add_symlink_to_root_no_parents_all_data(self, link_name, target):
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1210
        # The most trivial addition of a symlink when there are no parents and
1211
        # its in the root and all data about the file is supplied
2321.3.8 by Alexander Belchenko
Cleanup patch after John's review
1212
        # bzr doesn't support fake symlinks on windows, yet.
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
1213
        self.requireFeature(features.SymlinkFeature)
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1214
        os.symlink(target, link_name)
1215
        stat = os.lstat(link_name)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1216
        expected_entries = [
1217
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1218
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1219
             ]),
4241.14.11 by Vincent Ladeuil
Fix wrong encoding.
1220
            (('', link_name.encode('UTF-8'), 'a link id'), [
1221
             ('l', target.encode('UTF-8'), stat[6],
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1222
              False, dirstate.pack_stat(stat)), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1223
             ]),
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1224
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1225
        state = dirstate.DirState.initialize('dirstate')
1226
        try:
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1227
            state.add(link_name, 'a link id', 'symlink', stat,
4241.14.11 by Vincent Ladeuil
Fix wrong encoding.
1228
                      target.encode('UTF-8'))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1229
            # having added it, it should be in the output of iter_entries.
1230
            self.assertEqual(expected_entries, list(state._iter_entries()))
1231
            # saving and reloading should not affect this.
1232
            state.save()
1233
        finally:
1234
            state.unlock()
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1235
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1236
        state.lock_read()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1237
        self.addCleanup(state.unlock)
1238
        self.assertEqual(expected_entries, list(state._iter_entries()))
1239
1240
    def test_add_symlink_to_root_no_parents_all_data(self):
1241
        self._test_add_symlink_to_root_no_parents_all_data('a link', 'target')
1242
1243
    def test_add_symlink_unicode_to_root_no_parents_all_data(self):
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
1244
        self.requireFeature(features.UnicodeFilenameFeature)
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1245
        self._test_add_symlink_to_root_no_parents_all_data(
1246
            u'\N{Euro Sign}link', u'targ\N{Euro Sign}et')
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1247
1248
    def test_add_directory_and_child_no_parents_all_data(self):
1249
        # after adding a directory, we should be able to add children to it.
1250
        self.build_tree(['a dir/', 'a dir/a file'])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1251
        dirstat = os.lstat('a dir')
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1252
        filestat = os.lstat('a dir/a file')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1253
        expected_entries = [
1254
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1255
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1256
             ]),
1257
            (('', 'a dir', 'a dir id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1258
             ('d', '', 0, False, dirstate.pack_stat(dirstat)), # current tree
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1259
             ]),
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
1260
            (('a dir', 'a file', 'a-file-id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1261
             ('f', '1'*20, 25, False,
1262
              dirstate.pack_stat(filestat)), # current tree details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1263
             ]),
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1264
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1265
        state = dirstate.DirState.initialize('dirstate')
1266
        try:
1267
            state.add('a dir', 'a dir id', 'directory', dirstat, None)
3010.1.2 by Robert Collins
Use valid file-ids for dirstate tests.
1268
            state.add('a dir/a file', 'a-file-id', 'file', filestat, '1'*20)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1269
            # added it, it should be in the output of iter_entries.
1270
            self.assertEqual(expected_entries, list(state._iter_entries()))
1271
            # saving and reloading should not affect this.
1272
            state.save()
1273
        finally:
1274
            state.unlock()
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
1275
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1276
        state.lock_read()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1277
        self.addCleanup(state.unlock)
1278
        self.assertEqual(expected_entries, list(state._iter_entries()))
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1279
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
1280
    def test_add_tree_reference(self):
1281
        # make a dirstate and add a tree reference
1282
        state = dirstate.DirState.initialize('dirstate')
1283
        expected_entry = (
1284
            ('', 'subdir', 'subdir-id'),
1285
            [('t', 'subtree-123123', 0, False,
1286
              'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')],
1287
            )
1288
        try:
1289
            state.add('subdir', 'subdir-id', 'tree-reference', None, 'subtree-123123')
1290
            entry = state._get_entry(0, 'subdir-id', 'subdir')
1291
            self.assertEqual(entry, expected_entry)
1292
            state._validate()
1293
            state.save()
1294
        finally:
1295
            state.unlock()
1296
        # now check we can read it back
1297
        state.lock_read()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1298
        self.addCleanup(state.unlock)
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
1299
        state._validate()
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1300
        entry2 = state._get_entry(0, 'subdir-id', 'subdir')
1301
        self.assertEqual(entry, entry2)
1302
        self.assertEqual(entry, expected_entry)
1303
        # and lookup by id should work too
1304
        entry2 = state._get_entry(0, fileid_utf8='subdir-id')
1305
        self.assertEqual(entry, expected_entry)
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
1306
2255.2.225 by Martin Pool
Prohibit dirstate from getting entries called ..
1307
    def test_add_forbidden_names(self):
1308
        state = dirstate.DirState.initialize('dirstate')
2255.2.233 by John Arbash Meinel
DirState.initialize returns a locked state, unlock as part of cleanup.
1309
        self.addCleanup(state.unlock)
2255.2.225 by Martin Pool
Prohibit dirstate from getting entries called ..
1310
        self.assertRaises(errors.BzrError,
1311
            state.add, '.', 'ass-id', 'directory', None, None)
1312
        self.assertRaises(errors.BzrError,
1313
            state.add, '..', 'ass-id', 'directory', None, None)
1314
4536.4.1 by Robert Collins
Fix dirstate.set_state_from_inventory to have a more stable old_iterator, fixing rename problems in new trees. (Robert Collins, bug 395556)
1315
    def test_set_state_with_rename_b_a_bug_395556(self):
1316
        # bug 395556 uncovered a bug where the dirstate ends up with a false
1317
        # relocation record - in a tree with no parents there should be no
1318
        # absent or relocated records. This then leads to further corruption
1319
        # when a commit occurs, as the incorrect relocation gathers an
1320
        # incorrect absent in tree 1, and future changes go to pot.
1321
        tree1 = self.make_branch_and_tree('tree1')
1322
        self.build_tree(['tree1/b'])
1323
        tree1.lock_write()
1324
        try:
1325
            tree1.add(['b'], ['b-id'])
1326
            root_id = tree1.get_root_id()
6405.2.10 by Jelmer Vernooij
Fix more tests.
1327
            inv = tree1.root_inventory
4536.4.1 by Robert Collins
Fix dirstate.set_state_from_inventory to have a more stable old_iterator, fixing rename problems in new trees. (Robert Collins, bug 395556)
1328
            state = dirstate.DirState.initialize('dirstate')
1329
            try:
1330
                # Set the initial state with 'b'
1331
                state.set_state_from_inventory(inv)
1332
                inv.rename('b-id', root_id, 'a')
1333
                # Set the new state with 'a', which currently corrupts.
1334
                state.set_state_from_inventory(inv)
1335
                expected_result1 = [('', '', root_id, 'd'),
1336
                                    ('', 'a', 'b-id', 'f'),
1337
                                   ]
1338
                values = []
1339
                for entry in state._iter_entries():
1340
                    values.append(entry[0] + entry[1][0][:1])
1341
                self.assertEqual(expected_result1, values)
1342
            finally:
1343
                state.unlock()
1344
        finally:
1345
            tree1.unlock()
1346
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1347
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1348
class TestDirStateHashUpdates(TestCaseWithDirState):
1349
1350
    def do_update_entry(self, state, path):
1351
        entry = state._get_entry(0, path_utf8=path)
1352
        stat = os.lstat(path)
1353
        return dirstate.update_entry(state, entry, os.path.abspath(path), stat)
1354
5912.1.1 by John Arbash Meinel
Fix a test that was failing on win32.
1355
    def _read_state_content(self, state):
1356
        """Read the content of the dirstate file.
1357
1358
        On Windows when one process locks a file, you can't even open() the
1359
        file in another process (to read it). So we go directly to
1360
        state._state_file. This should always be the exact disk representation,
1361
        so it is reasonable to do so.
1362
        DirState also always seeks before reading, so it doesn't matter if we
1363
        bump the file pointer.
1364
        """
1365
        state._state_file.seek(0)
1366
        return state._state_file.read()
1367
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1368
    def test_worth_saving_limit_avoids_writing(self):
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
1369
        tree = self.make_branch_and_tree('.')
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1370
        self.build_tree(['c', 'd'])
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
1371
        tree.lock_write()
1372
        tree.add(['c', 'd'], ['c-id', 'd-id'])
1373
        tree.commit('add c and d')
1374
        state = InstrumentedDirState.on_file(tree.current_dirstate()._filename,
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1375
                                             worth_saving_limit=2)
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
1376
        tree.unlock()
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1377
        state.lock_write()
1378
        self.addCleanup(state.unlock)
1379
        state._read_dirblocks_if_needed()
1380
        state.adjust_time(+20) # Allow things to be cached
1381
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1382
                         state._dirblock_state)
5912.1.1 by John Arbash Meinel
Fix a test that was failing on win32.
1383
        content = self._read_state_content(state)
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1384
        self.do_update_entry(state, 'c')
1385
        self.assertEqual(1, len(state._known_hash_changes))
1386
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1387
                         state._dirblock_state)
1388
        state.save()
1389
        # It should not have set the state to IN_MEMORY_UNMODIFIED because the
1390
        # hash values haven't been written out.
1391
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1392
                         state._dirblock_state)
5912.1.1 by John Arbash Meinel
Fix a test that was failing on win32.
1393
        self.assertEqual(content, self._read_state_content(state))
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1394
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1395
                         state._dirblock_state)
1396
        self.do_update_entry(state, 'd')
1397
        self.assertEqual(2, len(state._known_hash_changes))
1398
        state.save()
1399
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1400
                         state._dirblock_state)
1401
        self.assertEqual(0, len(state._known_hash_changes))
1402
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
1403
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1404
class TestGetLines(TestCaseWithDirState):
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1405
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1406
    def test_get_line_with_2_rows(self):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1407
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1408
        try:
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
1409
            self.assertEqual(['#bazaar dirstate flat format 3\n',
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
1410
                'crc32: 41262208\n',
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1411
                'num_entries: 2\n',
1412
                '0\x00\n\x00'
1413
                '0\x00\n\x00'
1414
                '\x00\x00a-root-value\x00'
1415
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
1416
                '\x00subdir\x00subdir-id\x00'
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1417
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
1418
                ], state.get_lines())
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1419
        finally:
1420
            state.unlock()
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1421
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1422
    def test_entry_to_line(self):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1423
        state = self.create_dirstate_with_root()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1424
        try:
1425
            self.assertEqual(
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1426
                '\x00\x00a-root-value\x00d\x00\x000\x00n'
1427
                '\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk',
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1428
                state._entry_to_line(state._dirblocks[0][1][0]))
1429
        finally:
1430
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1431
1432
    def test_entry_to_line_with_parent(self):
1433
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
1434
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1435
            ('d', '', 0, False, packed_stat), # current tree details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1436
             # first: a pointer to the current location
1437
            ('a', 'dirname/basename', 0, False, ''),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1438
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1439
        state = dirstate.DirState.initialize('dirstate')
1440
        try:
1441
            self.assertEqual(
1442
                '\x00\x00a-root-value\x00'
1443
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
1444
                'a\x00dirname/basename\x000\x00n\x00',
1445
                state._entry_to_line(root_entry))
1446
        finally:
1447
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1448
1449
    def test_entry_to_line_with_two_parents_at_different_paths(self):
1450
        # / in the tree, at / in one parent and /dirname/basename in the other.
1451
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
1452
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1453
            ('d', '', 0, False, packed_stat), # current tree details
1454
            ('d', '', 0, False, 'rev_id'), # first parent details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1455
             # second: a pointer to the current location
1456
            ('a', 'dirname/basename', 0, False, ''),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1457
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1458
        state = dirstate.DirState.initialize('dirstate')
1459
        try:
1460
            self.assertEqual(
1461
                '\x00\x00a-root-value\x00'
1462
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
1463
                'd\x00\x000\x00n\x00rev_id\x00'
1464
                'a\x00dirname/basename\x000\x00n\x00',
1465
                state._entry_to_line(root_entry))
1466
        finally:
1467
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1468
1469
    def test_iter_entries(self):
1470
        # we should be able to iterate the dirstate entries from end to end
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1471
        # this is for get_lines to be easy to read.
1472
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1473
        dirblocks = []
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1474
        root_entries = [(('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1475
            ('d', '', 0, False, packed_stat), # current tree details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1476
            ])]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1477
        dirblocks.append(('', root_entries))
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1478
        # add two files in the root
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1479
        subdir_entry = ('', 'subdir', 'subdir-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1480
            ('d', '', 0, False, packed_stat), # current tree details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1481
            ]
1482
        afile_entry = ('', 'afile', 'afile-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1483
            ('f', 'sha1value', 34, False, packed_stat), # current tree details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1484
            ]
1485
        dirblocks.append(('', [subdir_entry, afile_entry]))
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1486
        # and one in subdir
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1487
        file_entry2 = ('subdir', '2file', '2file-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1488
            ('f', 'sha1value', 23, False, packed_stat), # current tree details
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1489
            ]
1490
        dirblocks.append(('subdir', [file_entry2]))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1491
        state = dirstate.DirState.initialize('dirstate')
1492
        try:
1493
            state._set_data([], dirblocks)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1494
            expected_entries = [root_entries[0], subdir_entry, afile_entry,
1495
                                file_entry2]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1496
            self.assertEqual(expected_entries, list(state._iter_entries()))
1497
        finally:
1498
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1499
1500
1501
class TestGetBlockRowIndex(TestCaseWithDirState):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1502
1503
    def assertBlockRowIndexEqual(self, block_index, row_index, dir_present,
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1504
        file_present, state, dirname, basename, tree_index):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1505
        self.assertEqual((block_index, row_index, dir_present, file_present),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1506
            state._get_block_entry_index(dirname, basename, tree_index))
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1507
        if dir_present:
1508
            block = state._dirblocks[block_index]
1509
            self.assertEqual(dirname, block[0])
1510
        if dir_present and file_present:
1511
            row = state._dirblocks[block_index][1][row_index]
1512
            self.assertEqual(dirname, row[0][0])
1513
            self.assertEqual(basename, row[0][1])
1514
1515
    def test_simple_structure(self):
1516
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1517
        self.addCleanup(state.unlock)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1518
        self.assertBlockRowIndexEqual(1, 0, True, True, state, '', 'subdir', 0)
1519
        self.assertBlockRowIndexEqual(1, 0, True, False, state, '', 'bdir', 0)
1520
        self.assertBlockRowIndexEqual(1, 1, True, False, state, '', 'zdir', 0)
1521
        self.assertBlockRowIndexEqual(2, 0, False, False, state, 'a', 'foo', 0)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1522
        self.assertBlockRowIndexEqual(2, 0, False, False, state,
1523
                                      'subdir', 'foo', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1524
1525
    def test_complex_structure_exists(self):
1526
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1527
        self.addCleanup(state.unlock)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1528
        # Make sure we can find everything that exists
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1529
        self.assertBlockRowIndexEqual(0, 0, True, True, state, '', '', 0)
1530
        self.assertBlockRowIndexEqual(1, 0, True, True, state, '', 'a', 0)
1531
        self.assertBlockRowIndexEqual(1, 1, True, True, state, '', 'b', 0)
1532
        self.assertBlockRowIndexEqual(1, 2, True, True, state, '', 'c', 0)
1533
        self.assertBlockRowIndexEqual(1, 3, True, True, state, '', 'd', 0)
1534
        self.assertBlockRowIndexEqual(2, 0, True, True, state, 'a', 'e', 0)
1535
        self.assertBlockRowIndexEqual(2, 1, True, True, state, 'a', 'f', 0)
1536
        self.assertBlockRowIndexEqual(3, 0, True, True, state, 'b', 'g', 0)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1537
        self.assertBlockRowIndexEqual(3, 1, True, True, state,
1538
                                      'b', 'h\xc3\xa5', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1539
1540
    def test_complex_structure_missing(self):
1541
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1542
        self.addCleanup(state.unlock)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1543
        # Make sure things would be inserted in the right locations
1544
        # '_' comes before 'a'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1545
        self.assertBlockRowIndexEqual(0, 0, True, True, state, '', '', 0)
1546
        self.assertBlockRowIndexEqual(1, 0, True, False, state, '', '_', 0)
1547
        self.assertBlockRowIndexEqual(1, 1, True, False, state, '', 'aa', 0)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1548
        self.assertBlockRowIndexEqual(1, 4, True, False, state,
1549
                                      '', 'h\xc3\xa5', 0)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1550
        self.assertBlockRowIndexEqual(2, 0, False, False, state, '_', 'a', 0)
1551
        self.assertBlockRowIndexEqual(3, 0, False, False, state, 'aa', 'a', 0)
1552
        self.assertBlockRowIndexEqual(4, 0, False, False, state, 'bb', 'a', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1553
        # This would be inserted between a/ and b/
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1554
        self.assertBlockRowIndexEqual(3, 0, False, False, state, 'a/e', 'a', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1555
        # Put at the end
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1556
        self.assertBlockRowIndexEqual(4, 0, False, False, state, 'e', 'a', 0)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1557
1558
1559
class TestGetEntry(TestCaseWithDirState):
1560
1561
    def assertEntryEqual(self, dirname, basename, file_id, state, path, index):
1562
        """Check that the right entry is returned for a request to getEntry."""
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1563
        entry = state._get_entry(index, path_utf8=path)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1564
        if file_id is None:
1565
            self.assertEqual((None, None), entry)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1566
        else:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1567
            cur = entry[0]
1568
            self.assertEqual((dirname, basename, file_id), cur[:3])
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1569
1570
    def test_simple_structure(self):
1571
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1572
        self.addCleanup(state.unlock)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1573
        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
1574
        self.assertEntryEqual('', 'subdir', 'subdir-id', state, 'subdir', 0)
1575
        self.assertEntryEqual(None, None, None, state, 'missing', 0)
1576
        self.assertEntryEqual(None, None, None, state, 'missing/foo', 0)
1577
        self.assertEntryEqual(None, None, None, state, 'subdir/foo', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1578
1579
    def test_complex_structure_exists(self):
1580
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1581
        self.addCleanup(state.unlock)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1582
        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
1583
        self.assertEntryEqual('', 'a', 'a-dir', state, 'a', 0)
1584
        self.assertEntryEqual('', 'b', 'b-dir', state, 'b', 0)
1585
        self.assertEntryEqual('', 'c', 'c-file', state, 'c', 0)
1586
        self.assertEntryEqual('', 'd', 'd-file', state, 'd', 0)
1587
        self.assertEntryEqual('a', 'e', 'e-dir', state, 'a/e', 0)
1588
        self.assertEntryEqual('a', 'f', 'f-file', state, 'a/f', 0)
1589
        self.assertEntryEqual('b', 'g', 'g-file', state, 'b/g', 0)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1590
        self.assertEntryEqual('b', 'h\xc3\xa5', 'h-\xc3\xa5-file', state,
1591
                              'b/h\xc3\xa5', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1592
1593
    def test_complex_structure_missing(self):
1594
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1595
        self.addCleanup(state.unlock)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1596
        self.assertEntryEqual(None, None, None, state, '_', 0)
1597
        self.assertEntryEqual(None, None, None, state, '_\xc3\xa5', 0)
1598
        self.assertEntryEqual(None, None, None, state, 'a/b', 0)
1599
        self.assertEntryEqual(None, None, None, state, 'c/d', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1600
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1601
    def test_get_entry_uninitialized(self):
1602
        """Calling get_entry will load data if it needs to"""
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1603
        state = self.create_dirstate_with_root()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1604
        try:
1605
            state.save()
1606
        finally:
1607
            state.unlock()
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1608
        del state
1609
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1610
        state.lock_read()
1611
        try:
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1612
            self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
1613
                             state._header_state)
1614
            self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
1615
                             state._dirblock_state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1616
            self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
1617
        finally:
1618
            state.unlock()
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1619
1620
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1621
class TestIterChildEntries(TestCaseWithDirState):
1622
1623
    def create_dirstate_with_two_trees(self):
1624
        """This dirstate contains multiple files and directories.
1625
1626
         /        a-root-value
1627
         a/       a-dir
1628
         b/       b-dir
1629
         c        c-file
1630
         d        d-file
1631
         a/e/     e-dir
1632
         a/f      f-file
1633
         b/g      g-file
1634
         b/h\xc3\xa5  h-\xc3\xa5-file  #This is u'\xe5' encoded into utf-8
1635
1636
        Notice that a/e is an empty directory.
1637
1638
        There is one parent tree, which has the same shape with the following variations:
1639
        b/g in the parent is gone.
1640
        b/h in the parent has a different id
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1641
        b/i is new in the parent
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1642
        c is renamed to b/j in the parent
1643
1644
        :return: The dirstate, still write-locked.
1645
        """
1646
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
1647
        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
1648
        NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1649
        root_entry = ('', '', 'a-root-value'), [
1650
            ('d', '', 0, False, packed_stat),
1651
            ('d', '', 0, False, 'parent-revid'),
1652
            ]
1653
        a_entry = ('', 'a', 'a-dir'), [
1654
            ('d', '', 0, False, packed_stat),
1655
            ('d', '', 0, False, 'parent-revid'),
1656
            ]
1657
        b_entry = ('', 'b', 'b-dir'), [
1658
            ('d', '', 0, False, packed_stat),
1659
            ('d', '', 0, False, 'parent-revid'),
1660
            ]
1661
        c_entry = ('', 'c', 'c-file'), [
1662
            ('f', null_sha, 10, False, packed_stat),
1663
            ('r', 'b/j', 0, False, ''),
1664
            ]
1665
        d_entry = ('', 'd', 'd-file'), [
1666
            ('f', null_sha, 20, False, packed_stat),
1667
            ('f', 'd', 20, False, 'parent-revid'),
1668
            ]
1669
        e_entry = ('a', 'e', 'e-dir'), [
1670
            ('d', '', 0, False, packed_stat),
1671
            ('d', '', 0, False, 'parent-revid'),
1672
            ]
1673
        f_entry = ('a', 'f', 'f-file'), [
1674
            ('f', null_sha, 30, False, packed_stat),
1675
            ('f', 'f', 20, False, 'parent-revid'),
1676
            ]
1677
        g_entry = ('b', 'g', 'g-file'), [
1678
            ('f', null_sha, 30, False, packed_stat),
1679
            NULL_PARENT_DETAILS,
1680
            ]
1681
        h_entry1 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file1'), [
1682
            ('f', null_sha, 40, False, packed_stat),
1683
            NULL_PARENT_DETAILS,
1684
            ]
1685
        h_entry2 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file2'), [
1686
            NULL_PARENT_DETAILS,
1687
            ('f', 'h', 20, False, 'parent-revid'),
1688
            ]
1689
        i_entry = ('b', 'i', 'i-file'), [
1690
            NULL_PARENT_DETAILS,
1691
            ('f', 'h', 20, False, 'parent-revid'),
1692
            ]
1693
        j_entry = ('b', 'j', 'c-file'), [
1694
            ('r', 'c', 0, False, ''),
1695
            ('f', 'j', 20, False, 'parent-revid'),
1696
            ]
1697
        dirblocks = []
1698
        dirblocks.append(('', [root_entry]))
1699
        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
1700
        dirblocks.append(('a', [e_entry, f_entry]))
1701
        dirblocks.append(('b', [g_entry, h_entry1, h_entry2, i_entry, j_entry]))
1702
        state = dirstate.DirState.initialize('dirstate')
1703
        state._validate()
1704
        try:
1705
            state._set_data(['parent'], dirblocks)
1706
        except:
1707
            state.unlock()
1708
            raise
1709
        return state, dirblocks
1710
1711
    def test_iter_children_b(self):
1712
        state, dirblocks = self.create_dirstate_with_two_trees()
1713
        self.addCleanup(state.unlock)
1714
        expected_result = []
1715
        expected_result.append(dirblocks[3][1][2]) # h2
1716
        expected_result.append(dirblocks[3][1][3]) # i
1717
        expected_result.append(dirblocks[3][1][4]) # j
1718
        self.assertEqual(expected_result,
1719
            list(state._iter_child_entries(1, 'b')))
1720
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1721
    def test_iter_child_root(self):
1722
        state, dirblocks = self.create_dirstate_with_two_trees()
1723
        self.addCleanup(state.unlock)
1724
        expected_result = []
1725
        expected_result.append(dirblocks[1][1][0]) # a
1726
        expected_result.append(dirblocks[1][1][1]) # b
1727
        expected_result.append(dirblocks[1][1][3]) # d
1728
        expected_result.append(dirblocks[2][1][0]) # e
1729
        expected_result.append(dirblocks[2][1][1]) # f
1730
        expected_result.append(dirblocks[3][1][2]) # h2
1731
        expected_result.append(dirblocks[3][1][3]) # i
1732
        expected_result.append(dirblocks[3][1][4]) # j
1733
        self.assertEqual(expected_result,
1734
            list(state._iter_child_entries(1, '')))
1735
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1736
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1737
class TestDirstateSortOrder(tests.TestCaseWithTransport):
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1738
    """Test that DirState adds entries in the right order."""
1739
1740
    def test_add_sorting(self):
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1741
        """Add entries in lexicographical order, we get path sorted order.
1742
1743
        This tests it to a depth of 4, to make sure we don't just get it right
1744
        at a single depth. 'a/a' should come before 'a-a', even though it
1745
        doesn't lexicographically.
1746
        """
1747
        dirs = ['a', 'a/a', 'a/a/a', 'a/a/a/a',
1748
                'a-a', 'a/a-a', 'a/a/a-a', 'a/a/a/a-a',
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1749
               ]
1750
        null_sha = ''
1751
        state = dirstate.DirState.initialize('dirstate')
1752
        self.addCleanup(state.unlock)
1753
1754
        fake_stat = os.stat('dirstate')
1755
        for d in dirs:
1756
            d_id = d.replace('/', '_')+'-id'
1757
            file_path = d + '/f'
1758
            file_id = file_path.replace('/', '_')+'-id'
1759
            state.add(d, d_id, 'directory', fake_stat, null_sha)
1760
            state.add(file_path, file_id, 'file', fake_stat, null_sha)
1761
1762
        expected = ['', '', 'a',
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1763
                'a/a', 'a/a/a', 'a/a/a/a',
1764
                'a/a/a/a-a', 'a/a/a-a', 'a/a-a', 'a-a',
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1765
               ]
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1766
        split = lambda p:p.split('/')
1767
        self.assertEqual(sorted(expected, key=split), expected)
1768
        dirblock_names = [d[0] for d in state._dirblocks]
1769
        self.assertEqual(expected, dirblock_names)
1770
1771
    def test_set_parent_trees_correct_order(self):
1772
        """After calling set_parent_trees() we should maintain the order."""
1773
        dirs = ['a', 'a-a', 'a/a']
1774
        null_sha = ''
1775
        state = dirstate.DirState.initialize('dirstate')
1776
        self.addCleanup(state.unlock)
1777
1778
        fake_stat = os.stat('dirstate')
1779
        for d in dirs:
1780
            d_id = d.replace('/', '_')+'-id'
1781
            file_path = d + '/f'
1782
            file_id = file_path.replace('/', '_')+'-id'
1783
            state.add(d, d_id, 'directory', fake_stat, null_sha)
1784
            state.add(file_path, file_id, 'file', fake_stat, null_sha)
1785
1786
        expected = ['', '', 'a', 'a/a', 'a-a']
1787
        dirblock_names = [d[0] for d in state._dirblocks]
1788
        self.assertEqual(expected, dirblock_names)
1789
1790
        # *really* cheesy way to just get an empty tree
1791
        repo = self.make_repository('repo')
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
1792
        empty_tree = repo.revision_tree(_mod_revision.NULL_REVISION)
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1793
        state.set_parent_trees([('null:', empty_tree)], [])
1794
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1795
        dirblock_names = [d[0] for d in state._dirblocks]
1796
        self.assertEqual(expected, dirblock_names)
1797
1798
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1799
class InstrumentedDirState(dirstate.DirState):
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1800
    """An DirState with instrumented sha1 functionality."""
1801
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
1802
    def __init__(self, path, sha1_provider, worth_saving_limit=0):
1803
        super(InstrumentedDirState, self).__init__(path, sha1_provider,
1804
            worth_saving_limit=worth_saving_limit)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1805
        self._time_offset = 0
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1806
        self._log = []
2872.3.3 by Martin Pool
Fix up test_update_entry to work with -Dhashcache
1807
        # member is dynamically set in DirState.__init__ to turn on trace
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
1808
        self._sha1_provider = sha1_provider
2872.3.3 by Martin Pool
Fix up test_update_entry to work with -Dhashcache
1809
        self._sha1_file = self._sha1_file_and_log
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1810
1811
    def _sha_cutoff_time(self):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1812
        timestamp = super(InstrumentedDirState, self)._sha_cutoff_time()
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
1813
        self._cutoff_time = timestamp + self._time_offset
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1814
2872.3.3 by Martin Pool
Fix up test_update_entry to work with -Dhashcache
1815
    def _sha1_file_and_log(self, abspath):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1816
        self._log.append(('sha1', abspath))
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
1817
        return self._sha1_provider.sha1(abspath)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1818
1819
    def _read_link(self, abspath, old_link):
1820
        self._log.append(('read_link', abspath, old_link))
1821
        return super(InstrumentedDirState, self)._read_link(abspath, old_link)
1822
1823
    def _lstat(self, abspath, entry):
1824
        self._log.append(('lstat', abspath))
1825
        return super(InstrumentedDirState, self)._lstat(abspath, entry)
1826
1827
    def _is_executable(self, mode, old_executable):
1828
        self._log.append(('is_exec', mode, old_executable))
1829
        return super(InstrumentedDirState, self)._is_executable(mode,
1830
                                                                old_executable)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1831
1832
    def adjust_time(self, secs):
1833
        """Move the clock forward or back.
1834
1835
        :param secs: The amount to adjust the clock by. Positive values make it
1836
        seem as if we are in the future, negative values make it seem like we
1837
        are in the past.
1838
        """
1839
        self._time_offset += secs
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
1840
        self._cutoff_time = None
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1841
1842
1843
class _FakeStat(object):
1844
    """A class with the same attributes as a real stat result."""
1845
1846
    def __init__(self, size, mtime, ctime, dev, ino, mode):
1847
        self.st_size = size
1848
        self.st_mtime = mtime
1849
        self.st_ctime = ctime
1850
        self.st_dev = dev
1851
        self.st_ino = ino
1852
        self.st_mode = mode
1853
4132.2.3 by Ian Clatworthy
add test as suggested by poolie's review
1854
    @staticmethod
1855
    def from_stat(st):
1856
        return _FakeStat(st.st_size, st.st_mtime, st.st_ctime, st.st_dev,
1857
            st.st_ino, st.st_mode)
1858
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1859
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
1860
class TestPackStat(tests.TestCaseWithTransport):
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1861
1862
    def assertPackStat(self, expected, stat_value):
1863
        """Check the packed and serialized form of a stat value."""
1864
        self.assertEqual(expected, dirstate.pack_stat(stat_value))
1865
1866
    def test_pack_stat_int(self):
1867
        st = _FakeStat(6859L, 1172758614, 1172758617, 777L, 6499538L, 0100644)
1868
        # Make sure that all parameters have an impact on the packed stat.
1869
        self.assertPackStat('AAAay0Xm4FZF5uBZAAADCQBjLNIAAIGk', st)
1870
        st.st_size = 7000L
1871
        #                ay0 => bWE
1872
        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
1873
        st.st_mtime = 1172758620
1874
        #                     4FZ => 4Fx
1875
        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
1876
        st.st_ctime = 1172758630
1877
        #                          uBZ => uBm
1878
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1879
        st.st_dev = 888L
1880
        #                                DCQ => DeA
1881
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNIAAIGk', st)
1882
        st.st_ino = 6499540L
1883
        #                                     LNI => LNQ
1884
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIGk', st)
1885
        st.st_mode = 0100744
1886
        #                                          IGk => IHk
1887
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIHk', st)
1888
1889
    def test_pack_stat_float(self):
1890
        """On some platforms mtime and ctime are floats.
1891
1892
        Make sure we don't get warnings or errors, and that we ignore changes <
1893
        1s
1894
        """
1895
        st = _FakeStat(7000L, 1172758614.0, 1172758617.0,
1896
                       777L, 6499538L, 0100644)
1897
        # These should all be the same as the integer counterparts
1898
        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
1899
        st.st_mtime = 1172758620.0
1900
        #                     FZF5 => FxF5
1901
        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
1902
        st.st_ctime = 1172758630.0
1903
        #                          uBZ => uBm
1904
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1905
        # fractional seconds are discarded, so no change from above
1906
        st.st_mtime = 1172758620.453
1907
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1908
        st.st_ctime = 1172758630.228
1909
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1910
1911
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
1912
class TestBisect(TestCaseWithDirState):
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1913
    """Test the ability to bisect into the disk format."""
1914
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1915
    def assertBisect(self, expected_map, map_keys, state, paths):
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1916
        """Assert that bisecting for paths returns the right result.
1917
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1918
        :param expected_map: A map from key => entry value
1919
        :param map_keys: The keys to expect for each path
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1920
        :param state: The DirState object.
1921
        :param paths: A list of paths, these will automatically be split into
1922
                      (dir, name) tuples, and sorted according to how _bisect
1923
                      requires.
1924
        """
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1925
        result = state._bisect(paths)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1926
        # For now, results are just returned in whatever order we read them.
1927
        # We could sort by (dir, name, file_id) or something like that, but in
1928
        # the end it would still be fairly arbitrary, and we don't want the
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1929
        # extra overhead if we can avoid it. So sort everything to make sure
1930
        # equality is true
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1931
        self.assertEqual(len(map_keys), len(paths))
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1932
        expected = {}
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1933
        for path, keys in zip(paths, map_keys):
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1934
            if keys is None:
1935
                # This should not be present in the output
1936
                continue
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1937
            expected[path] = sorted(expected_map[k] for k in keys)
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1938
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1939
        # The returned values are just arranged randomly based on when they
1940
        # were read, for testing, make sure it is properly sorted.
1941
        for path in result:
1942
            result[path].sort()
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1943
1944
        self.assertEqual(expected, result)
1945
1946
    def assertBisectDirBlocks(self, expected_map, map_keys, state, paths):
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
1947
        """Assert that bisecting for dirbblocks returns the right result.
1948
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1949
        :param expected_map: A map from key => expected values
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1950
        :param map_keys: A nested list of paths we expect to be returned.
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
1951
            Something like [['a', 'b', 'f'], ['b/c', 'b/d']]
1952
        :param state: The DirState object.
1953
        :param paths: A list of directories
1954
        """
1955
        result = state._bisect_dirblocks(paths)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1956
        self.assertEqual(len(map_keys), len(paths))
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1957
        expected = {}
1958
        for path, keys in zip(paths, map_keys):
1959
            if keys is None:
1960
                # This should not be present in the output
1961
                continue
1962
            expected[path] = sorted(expected_map[k] for k in keys)
1963
        for path in result:
1964
            result[path].sort()
1965
1966
        self.assertEqual(expected, result)
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
1967
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1968
    def assertBisectRecursive(self, expected_map, map_keys, state, paths):
1969
        """Assert the return value of a recursive bisection.
1970
1971
        :param expected_map: A map from key => entry value
1972
        :param map_keys: A list of paths we expect to be returned.
1973
            Something like ['a', 'b', 'f', 'b/d', 'b/d2']
1974
        :param state: The DirState object.
1975
        :param paths: A list of files and directories. It will be broken up
1976
            into (dir, name) pairs and sorted before calling _bisect_recursive.
1977
        """
1978
        expected = {}
1979
        for key in map_keys:
1980
            entry = expected_map[key]
1981
            dir_name_id, trees_info = entry
1982
            expected[dir_name_id] = trees_info
1983
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1984
        result = state._bisect_recursive(paths)
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1985
1986
        self.assertEqual(expected, result)
1987
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1988
    def test_bisect_each(self):
1989
        """Find a single record using bisect."""
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1990
        tree, state, expected = self.create_basic_dirstate()
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1991
1992
        # Bisect should return the rows for the specified files.
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1993
        self.assertBisect(expected, [['']], state, [''])
1994
        self.assertBisect(expected, [['a']], state, ['a'])
1995
        self.assertBisect(expected, [['b']], state, ['b'])
1996
        self.assertBisect(expected, [['b/c']], state, ['b/c'])
1997
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
1998
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
1999
        self.assertBisect(expected, [['b-c']], state, ['b-c'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2000
        self.assertBisect(expected, [['f']], state, ['f'])
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
2001
2002
    def test_bisect_multi(self):
2003
        """Bisect can be used to find multiple records at the same time."""
2004
        tree, state, expected = self.create_basic_dirstate()
2005
        # Bisect should be capable of finding multiple entries at the same time
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2006
        self.assertBisect(expected, [['a'], ['b'], ['f']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2007
                          state, ['a', 'b', 'f'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2008
        self.assertBisect(expected, [['f'], ['b/d'], ['b/d/e']],
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
2009
                          state, ['f', 'b/d', 'b/d/e'])
2010
        self.assertBisect(expected, [['b'], ['b-c'], ['b/c']],
2011
                          state, ['b', 'b-c', 'b/c'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2012
2013
    def test_bisect_one_page(self):
2014
        """Test bisect when there is only 1 page to read"""
2015
        tree, state, expected = self.create_basic_dirstate()
2016
        state._bisect_page_size = 5000
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2017
        self.assertBisect(expected,[['']], state, [''])
2018
        self.assertBisect(expected,[['a']], state, ['a'])
2019
        self.assertBisect(expected,[['b']], state, ['b'])
2020
        self.assertBisect(expected,[['b/c']], state, ['b/c'])
2021
        self.assertBisect(expected,[['b/d']], state, ['b/d'])
2022
        self.assertBisect(expected,[['b/d/e']], state, ['b/d/e'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2023
        self.assertBisect(expected,[['b-c']], state, ['b-c'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2024
        self.assertBisect(expected,[['f']], state, ['f'])
2025
        self.assertBisect(expected,[['a'], ['b'], ['f']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2026
                          state, ['a', 'b', 'f'])
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
2027
        self.assertBisect(expected, [['b/d'], ['b/d/e'], ['f']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2028
                          state, ['b/d', 'b/d/e', 'f'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2029
        self.assertBisect(expected, [['b'], ['b/c'], ['b-c']],
2030
                          state, ['b', 'b/c', 'b-c'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2031
2032
    def test_bisect_duplicate_paths(self):
2033
        """When bisecting for a path, handle multiple entries."""
2034
        tree, state, expected = self.create_duplicated_dirstate()
2035
2036
        # Now make sure that both records are properly returned.
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2037
        self.assertBisect(expected, [['']], state, [''])
2038
        self.assertBisect(expected, [['a', 'a2']], state, ['a'])
2039
        self.assertBisect(expected, [['b', 'b2']], state, ['b'])
2040
        self.assertBisect(expected, [['b/c', 'b/c2']], state, ['b/c'])
2041
        self.assertBisect(expected, [['b/d', 'b/d2']], state, ['b/d'])
2042
        self.assertBisect(expected, [['b/d/e', 'b/d/e2']],
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
2043
                          state, ['b/d/e'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2044
        self.assertBisect(expected, [['b-c', 'b-c2']], state, ['b-c'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2045
        self.assertBisect(expected, [['f', 'f2']], state, ['f'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2046
2047
    def test_bisect_page_size_too_small(self):
2255.2.128 by John Arbash Meinel
Rather than falling over when the page size is to small, just increase it and try again.
2048
        """If the page size is too small, we will auto increase it."""
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2049
        tree, state, expected = self.create_basic_dirstate()
2050
        state._bisect_page_size = 50
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2051
        self.assertBisect(expected, [None], state, ['b/e'])
2052
        self.assertBisect(expected, [['a']], state, ['a'])
2053
        self.assertBisect(expected, [['b']], state, ['b'])
2054
        self.assertBisect(expected, [['b/c']], state, ['b/c'])
2055
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
2056
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2057
        self.assertBisect(expected, [['b-c']], state, ['b-c'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2058
        self.assertBisect(expected, [['f']], state, ['f'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2059
2060
    def test_bisect_missing(self):
2061
        """Test that bisect return None if it cannot find a path."""
2062
        tree, state, expected = self.create_basic_dirstate()
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2063
        self.assertBisect(expected, [None], state, ['foo'])
2064
        self.assertBisect(expected, [None], state, ['b/foo'])
2065
        self.assertBisect(expected, [None], state, ['bar/foo'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2066
        self.assertBisect(expected, [None], state, ['b-c/foo'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2067
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2068
        self.assertBisect(expected, [['a'], None, ['b/d']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
2069
                          state, ['a', 'foo', 'b/d'])
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
2070
2071
    def test_bisect_rename(self):
2072
        """Check that we find a renamed row."""
2073
        tree, state, expected = self.create_renamed_dirstate()
2074
2075
        # Search for the pre and post renamed entries
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
2076
        self.assertBisect(expected, [['a']], state, ['a'])
2077
        self.assertBisect(expected, [['b/g']], state, ['b/g'])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
2078
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
2079
        self.assertBisect(expected, [['h']], state, ['h'])
2080
2081
        # What about b/d/e? shouldn't that also get 2 directory entries?
2082
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
2083
        self.assertBisect(expected, [['h/e']], state, ['h/e'])
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
2084
2085
    def test_bisect_dirblocks(self):
2086
        tree, state, expected = self.create_duplicated_dirstate()
2087
        self.assertBisectDirBlocks(expected,
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2088
            [['', 'a', 'a2', 'b', 'b2', 'b-c', 'b-c2', 'f', 'f2']],
2089
            state, [''])
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
2090
        self.assertBisectDirBlocks(expected,
2091
            [['b/c', 'b/c2', 'b/d', 'b/d2']], state, ['b'])
2092
        self.assertBisectDirBlocks(expected,
2093
            [['b/d/e', 'b/d/e2']], state, ['b/d'])
2094
        self.assertBisectDirBlocks(expected,
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2095
            [['', 'a', 'a2', 'b', 'b2', 'b-c', 'b-c2', 'f', 'f2'],
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
2096
             ['b/c', 'b/c2', 'b/d', 'b/d2'],
2097
             ['b/d/e', 'b/d/e2'],
2098
            ], state, ['', 'b', 'b/d'])
2099
2100
    def test_bisect_dirblocks_missing(self):
2101
        tree, state, expected = self.create_basic_dirstate()
2102
        self.assertBisectDirBlocks(expected, [['b/d/e'], None],
2103
            state, ['b/d', 'b/e'])
2104
        # Files don't show up in this search
2105
        self.assertBisectDirBlocks(expected, [None], state, ['a'])
2106
        self.assertBisectDirBlocks(expected, [None], state, ['b/c'])
2107
        self.assertBisectDirBlocks(expected, [None], state, ['c'])
2108
        self.assertBisectDirBlocks(expected, [None], state, ['b/d/e'])
2109
        self.assertBisectDirBlocks(expected, [None], state, ['f'])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
2110
2111
    def test_bisect_recursive_each(self):
2112
        tree, state, expected = self.create_basic_dirstate()
2113
        self.assertBisectRecursive(expected, ['a'], state, ['a'])
2114
        self.assertBisectRecursive(expected, ['b/c'], state, ['b/c'])
2115
        self.assertBisectRecursive(expected, ['b/d/e'], state, ['b/d/e'])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
2116
        self.assertBisectRecursive(expected, ['b-c'], state, ['b-c'])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
2117
        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
2118
                                   state, ['b/d'])
2119
        self.assertBisectRecursive(expected, ['b', 'b/c', 'b/d', 'b/d/e'],
2120
                                   state, ['b'])
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
2121
        self.assertBisectRecursive(expected, ['', 'a', 'b', 'b-c', 'f', 'b/c',
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
2122
                                              'b/d', 'b/d/e'],
2123
                                   state, [''])
2124
2125
    def test_bisect_recursive_multiple(self):
2126
        tree, state, expected = self.create_basic_dirstate()
2127
        self.assertBisectRecursive(expected, ['a', 'b/c'], state, ['a', 'b/c'])
2128
        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
2129
                                   state, ['b/d', 'b/d/e'])
2130
2131
    def test_bisect_recursive_missing(self):
2132
        tree, state, expected = self.create_basic_dirstate()
2133
        self.assertBisectRecursive(expected, [], state, ['d'])
2134
        self.assertBisectRecursive(expected, [], state, ['b/e'])
2135
        self.assertBisectRecursive(expected, [], state, ['g'])
2136
        self.assertBisectRecursive(expected, ['a'], state, ['a', 'g'])
2137
2138
    def test_bisect_recursive_renamed(self):
2139
        tree, state, expected = self.create_renamed_dirstate()
2140
2141
        # Looking for either renamed item should find the other
2142
        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['a'])
2143
        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['b/g'])
2144
        # Looking in the containing directory should find the rename target,
2145
        # and anything in a subdir of the renamed target.
2146
        self.assertBisectRecursive(expected, ['a', 'b', 'b/c', 'b/d',
2147
                                              'b/d/e', 'b/g', 'h', 'h/e'],
2148
                                   state, ['b'])
2149
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
2150
2323.5.4 by Martin Pool
Move some dirstate test setup methods into the base class
2151
class TestDirstateValidation(TestCaseWithDirState):
2152
2153
    def test_validate_correct_dirstate(self):
2154
        state = self.create_complex_dirstate()
2155
        state._validate()
2156
        state.unlock()
2157
        # and make sure we can also validate with a read lock
2158
        state.lock_read()
2159
        try:
2160
            state._validate()
2161
        finally:
2162
            state.unlock()
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2163
2164
    def test_dirblock_not_sorted(self):
2165
        tree, state, expected = self.create_renamed_dirstate()
2166
        state._read_dirblocks_if_needed()
2167
        last_dirblock = state._dirblocks[-1]
2168
        # we're appending to the dirblock, but this name comes before some of
2169
        # the existing names; that's wrong
2170
        last_dirblock[1].append(
2171
            (('h', 'aaaa', 'a-id'),
2172
             [('a', '', 0, False, ''),
2173
              ('a', '', 0, False, '')]))
2174
        e = self.assertRaises(AssertionError,
2175
            state._validate)
2176
        self.assertContainsRe(str(e), 'not sorted')
2177
2178
    def test_dirblock_name_mismatch(self):
2179
        tree, state, expected = self.create_renamed_dirstate()
2180
        state._read_dirblocks_if_needed()
2181
        last_dirblock = state._dirblocks[-1]
2182
        # add an entry with the wrong directory name
2183
        last_dirblock[1].append(
2184
            (('', 'z', 'a-id'),
2185
             [('a', '', 0, False, ''),
2186
              ('a', '', 0, False, '')]))
2187
        e = self.assertRaises(AssertionError,
2188
            state._validate)
2189
        self.assertContainsRe(str(e),
2190
            "doesn't match directory name")
2191
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2192
    def test_dirblock_missing_rename(self):
2193
        tree, state, expected = self.create_renamed_dirstate()
2194
        state._read_dirblocks_if_needed()
2195
        last_dirblock = state._dirblocks[-1]
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2196
        # make another entry for a-id, without a correct 'r' pointer to
2197
        # the real occurrence in the working tree
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2198
        last_dirblock[1].append(
2199
            (('h', 'z', 'a-id'),
2200
             [('a', '', 0, False, ''),
2201
              ('a', '', 0, False, '')]))
2202
        e = self.assertRaises(AssertionError,
2203
            state._validate)
2204
        self.assertContainsRe(str(e),
2205
            'file a-id is absent in row')
2474.1.41 by John Arbash Meinel
Change the name of cmp_dirblock_strings to cmp_by_dirs
2206
2645.2.1 by Wouter van Heyst
The DirState fingerprint for tree-references should be an empty string instead of None
2207
2208
class TestDirstateTreeReference(TestCaseWithDirState):
2209
2210
    def test_reference_revision_is_none(self):
6437.14.2 by Jelmer Vernooij
Run subtree tests with development-subtree rather than deprecated dirstate-with-subtree.
2211
        tree = self.make_branch_and_tree('tree', format='development-subtree')
2645.2.1 by Wouter van Heyst
The DirState fingerprint for tree-references should be an empty string instead of None
2212
        subtree = self.make_branch_and_tree('tree/subtree',
6437.14.2 by Jelmer Vernooij
Run subtree tests with development-subtree rather than deprecated dirstate-with-subtree.
2213
                            format='development-subtree')
2645.2.1 by Wouter van Heyst
The DirState fingerprint for tree-references should be an empty string instead of None
2214
        subtree.set_root_id('subtree')
2215
        tree.add_reference(subtree)
2216
        tree.add('subtree')
2217
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2218
        key = ('', 'subtree', 'subtree')
2219
        expected = ('', [(key,
2220
            [('t', '', 0, False, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])])
2221
2222
        try:
2223
            self.assertEqual(expected, state._find_block(key))
2224
        finally:
2225
            state.unlock()
2984.1.1 by John Arbash Meinel
Fix bug #161131: Correct DirState._discard_merge_parents logic.
2226
2227
2228
class TestDiscardMergeParents(TestCaseWithDirState):
2229
2230
    def test_discard_no_parents(self):
2231
        # This should be a no-op
2232
        state = self.create_empty_dirstate()
2233
        self.addCleanup(state.unlock)
2234
        state._discard_merge_parents()
2235
        state._validate()
2236
2237
    def test_discard_one_parent(self):
2238
        # No-op
2239
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2240
        root_entry_direntry = ('', '', 'a-root-value'), [
2241
            ('d', '', 0, False, packed_stat),
2242
            ('d', '', 0, False, packed_stat),
2243
            ]
2244
        dirblocks = []
2245
        dirblocks.append(('', [root_entry_direntry]))
2246
        dirblocks.append(('', []))
2247
2248
        state = self.create_empty_dirstate()
2249
        self.addCleanup(state.unlock)
2250
        state._set_data(['parent-id'], dirblocks[:])
2251
        state._validate()
2252
2253
        state._discard_merge_parents()
2254
        state._validate()
2255
        self.assertEqual(dirblocks, state._dirblocks)
2256
2257
    def test_discard_simple(self):
2258
        # No-op
2259
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2260
        root_entry_direntry = ('', '', 'a-root-value'), [
2261
            ('d', '', 0, False, packed_stat),
2262
            ('d', '', 0, False, packed_stat),
2263
            ('d', '', 0, False, packed_stat),
2264
            ]
2265
        expected_root_entry_direntry = ('', '', 'a-root-value'), [
2266
            ('d', '', 0, False, packed_stat),
2267
            ('d', '', 0, False, packed_stat),
2268
            ]
2269
        dirblocks = []
2270
        dirblocks.append(('', [root_entry_direntry]))
2271
        dirblocks.append(('', []))
2272
2273
        state = self.create_empty_dirstate()
2274
        self.addCleanup(state.unlock)
2275
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2276
        state._validate()
2277
2278
        # This should strip of the extra column
2279
        state._discard_merge_parents()
2280
        state._validate()
2281
        expected_dirblocks = [('', [expected_root_entry_direntry]), ('', [])]
2282
        self.assertEqual(expected_dirblocks, state._dirblocks)
2283
2284
    def test_discard_absent(self):
2285
        """If entries are only in a merge, discard should remove the entries"""
2286
        null_stat = dirstate.DirState.NULLSTAT
2287
        present_dir = ('d', '', 0, False, null_stat)
2288
        present_file = ('f', '', 0, False, null_stat)
2289
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2290
        root_key = ('', '', 'a-root-value')
2291
        file_in_root_key = ('', 'file-in-root', 'a-file-id')
2292
        file_in_merged_key = ('', 'file-in-merged', 'b-file-id')
2293
        dirblocks = [('', [(root_key, [present_dir, present_dir, present_dir])]),
2294
                     ('', [(file_in_merged_key,
2295
                            [absent, absent, present_file]),
2296
                           (file_in_root_key,
2297
                            [present_file, present_file, present_file]),
2298
                          ]),
2299
                    ]
2300
2301
        state = self.create_empty_dirstate()
2302
        self.addCleanup(state.unlock)
2303
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2304
        state._validate()
2305
2306
        exp_dirblocks = [('', [(root_key, [present_dir, present_dir])]),
2307
                         ('', [(file_in_root_key,
2308
                                [present_file, present_file]),
2309
                              ]),
2310
                        ]
2311
        state._discard_merge_parents()
2312
        state._validate()
2313
        self.assertEqual(exp_dirblocks, state._dirblocks)
2314
2315
    def test_discard_renamed(self):
2316
        null_stat = dirstate.DirState.NULLSTAT
2317
        present_dir = ('d', '', 0, False, null_stat)
2318
        present_file = ('f', '', 0, False, null_stat)
2319
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2320
        root_key = ('', '', 'a-root-value')
2321
        file_in_root_key = ('', 'file-in-root', 'a-file-id')
2322
        # Renamed relative to parent
2323
        file_rename_s_key = ('', 'file-s', 'b-file-id')
2324
        file_rename_t_key = ('', 'file-t', 'b-file-id')
2325
        # And one that is renamed between the parents, but absent in this
2326
        key_in_1 = ('', 'file-in-1', 'c-file-id')
2327
        key_in_2 = ('', 'file-in-2', 'c-file-id')
2328
2329
        dirblocks = [
2330
            ('', [(root_key, [present_dir, present_dir, present_dir])]),
2331
            ('', [(key_in_1,
2332
                   [absent, present_file, ('r', 'file-in-2', 'c-file-id')]),
2333
                  (key_in_2,
2334
                   [absent, ('r', 'file-in-1', 'c-file-id'), present_file]),
2335
                  (file_in_root_key,
2336
                   [present_file, present_file, present_file]),
2337
                  (file_rename_s_key,
2338
                   [('r', 'file-t', 'b-file-id'), absent, present_file]),
2339
                  (file_rename_t_key,
2340
                   [present_file, absent, ('r', 'file-s', 'b-file-id')]),
2341
                 ]),
2342
        ]
2343
        exp_dirblocks = [
2344
            ('', [(root_key, [present_dir, present_dir])]),
2345
            ('', [(key_in_1, [absent, present_file]),
2346
                  (file_in_root_key, [present_file, present_file]),
2347
                  (file_rename_t_key, [present_file, absent]),
2348
                 ]),
2349
        ]
2350
        state = self.create_empty_dirstate()
2351
        self.addCleanup(state.unlock)
2352
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2353
        state._validate()
2354
2355
        state._discard_merge_parents()
2356
        state._validate()
2357
        self.assertEqual(exp_dirblocks, state._dirblocks)
2358
2359
    def test_discard_all_subdir(self):
2360
        null_stat = dirstate.DirState.NULLSTAT
2361
        present_dir = ('d', '', 0, False, null_stat)
2362
        present_file = ('f', '', 0, False, null_stat)
2363
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2364
        root_key = ('', '', 'a-root-value')
2365
        subdir_key = ('', 'sub', 'dir-id')
2366
        child1_key = ('sub', 'child1', 'child1-id')
2367
        child2_key = ('sub', 'child2', 'child2-id')
2368
        child3_key = ('sub', 'child3', 'child3-id')
2369
2370
        dirblocks = [
2371
            ('', [(root_key, [present_dir, present_dir, present_dir])]),
2372
            ('', [(subdir_key, [present_dir, present_dir, present_dir])]),
2373
            ('sub', [(child1_key, [absent, absent, present_file]),
2374
                     (child2_key, [absent, absent, present_file]),
2375
                     (child3_key, [absent, absent, present_file]),
2376
                    ]),
2377
        ]
2378
        exp_dirblocks = [
2379
            ('', [(root_key, [present_dir, present_dir])]),
2380
            ('', [(subdir_key, [present_dir, present_dir])]),
2381
            ('sub', []),
2382
        ]
2383
        state = self.create_empty_dirstate()
2384
        self.addCleanup(state.unlock)
2385
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2386
        state._validate()
2387
2388
        state._discard_merge_parents()
2389
        state._validate()
2390
        self.assertEqual(exp_dirblocks, state._dirblocks)
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2391
2392
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
2393
class Test_InvEntryToDetails(tests.TestCase):
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2394
2395
    def assertDetails(self, expected, inv_entry):
2396
        details = dirstate.DirState._inv_entry_to_details(inv_entry)
2397
        self.assertEqual(expected, details)
3477.2.2 by John Arbash Meinel
Change how we handle unicode targets, and add a NEWS entry.
2398
        # details should always allow join() and always be a plain str when
2399
        # finished
2400
        (minikind, fingerprint, size, executable, tree_data) = details
2401
        self.assertIsInstance(minikind, str)
2402
        self.assertIsInstance(fingerprint, str)
2403
        self.assertIsInstance(tree_data, str)
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2404
2405
    def test_unicode_symlink(self):
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
2406
        inv_entry = inventory.InventoryLink('link-file-id',
2407
                                            u'nam\N{Euro Sign}e',
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2408
                                            'link-parent-id')
2409
        inv_entry.revision = 'link-revision-id'
4241.14.10 by Vincent Ladeuil
Add DirReader parametrized tests.
2410
        target = u'link-targ\N{Euro Sign}t'
2411
        inv_entry.symlink_target = target
2412
        self.assertDetails(('l', target.encode('UTF-8'), 0, False,
2413
                            'link-revision-id'), inv_entry)
2414
2415
2416
class TestSHA1Provider(tests.TestCaseInTempDir):
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2417
2418
    def test_sha1provider_is_an_interface(self):
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2419
        p = dirstate.SHA1Provider()
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2420
        self.assertRaises(NotImplementedError, p.sha1, "foo")
2421
        self.assertRaises(NotImplementedError, p.stat_and_sha1, "foo")
2422
2423
    def test_defaultsha1provider_sha1(self):
2424
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
2425
        self.build_tree_contents([('foo', text)])
2426
        expected_sha = osutils.sha_string(text)
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2427
        p = dirstate.DefaultSHA1Provider()
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2428
        self.assertEqual(expected_sha, p.sha1('foo'))
2429
2430
    def test_defaultsha1provider_stat_and_sha1(self):
2431
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
2432
        self.build_tree_contents([('foo', text)])
2433
        expected_sha = osutils.sha_string(text)
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2434
        p = dirstate.DefaultSHA1Provider()
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2435
        statvalue, sha1 = p.stat_and_sha1('foo')
2436
        self.assertTrue(len(statvalue) >= 10)
2437
        self.assertEqual(len(text), statvalue.st_size)
2438
        self.assertEqual(expected_sha, sha1)
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2439
2440
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2441
class _Repo(object):
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2442
    """A minimal api to get InventoryRevisionTree to work."""
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2443
2444
    def __init__(self):
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
2445
        default_format = controldir.format_registry.make_bzrdir('default')
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2446
        self._format = default_format.repository_format
2447
2448
    def lock_read(self):
2449
        pass
2450
2451
    def unlock(self):
2452
        pass
2453
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2454
2455
class TestUpdateBasisByDelta(tests.TestCase):
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2456
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2457
    def path_to_ie(self, path, file_id, rev_id, dir_ids):
2458
        if path.endswith('/'):
2459
            is_dir = True
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2460
            path = path[:-1]
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2461
        else:
2462
            is_dir = False
2463
        dirname, basename = osutils.split(path)
5847.4.27 by John Arbash Meinel
Handle missing parent, though bugs may still remain
2464
        try:
2465
            dir_id = dir_ids[dirname]
2466
        except KeyError:
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2467
            dir_id = osutils.basename(dirname) + '-id'
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2468
        if is_dir:
2469
            ie = inventory.InventoryDirectory(file_id, basename, dir_id)
5847.4.29 by John Arbash Meinel
Simplify a bit. Handle that when a directory is added, we need to add its block.
2470
            dir_ids[path] = file_id
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2471
        else:
2472
            ie = inventory.InventoryFile(file_id, basename, dir_id)
2473
            ie.text_size = 0
2474
            ie.text_sha1 = ''
2475
        ie.revision = rev_id
2476
        return ie
2477
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2478
    def create_tree_from_shape(self, rev_id, shape):
2479
        dir_ids = {'': 'root-id'}
2480
        inv = inventory.Inventory('root-id', rev_id)
6015.45.3 by John Arbash Meinel
Add a direct Dirstate.update_basis_by_delta test.
2481
        for info in shape:
2482
            if len(info) == 2:
2483
                path, file_id = info
2484
                ie_rev_id = rev_id
2485
            else:
2486
                path, file_id, ie_rev_id = info
5847.4.32 by John Arbash Meinel
Update the test suite to handle root changes.
2487
            if path == '':
2488
                # Replace the root entry
2489
                del inv._byid[inv.root.file_id]
2490
                inv.root.file_id = file_id
2491
                inv._byid[file_id] = inv.root
2492
                dir_ids[''] = file_id
2493
                continue
6015.45.3 by John Arbash Meinel
Add a direct Dirstate.update_basis_by_delta test.
2494
            inv.add(self.path_to_ie(path, file_id, ie_rev_id, dir_ids))
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2495
        return revisiontree.InventoryRevisionTree(_Repo(), inv, rev_id)
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2496
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2497
    def create_empty_dirstate(self):
2498
        fd, path = tempfile.mkstemp(prefix='bzr-dirstate')
2499
        self.addCleanup(os.remove, path)
2500
        os.close(fd)
2501
        state = dirstate.DirState.initialize(path)
2502
        self.addCleanup(state.unlock)
2503
        return state
2504
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2505
    def create_inv_delta(self, delta, rev_id):
2506
        """Translate a 'delta shape' into an actual InventoryDelta"""
2507
        dir_ids = {'': 'root-id'}
2508
        inv_delta = []
2509
        for old_path, new_path, file_id in delta:
2510
            if old_path is not None and old_path.endswith('/'):
2511
                # Don't have to actually do anything for this, because only
2512
                # new_path creates InventoryEntries
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2513
                old_path = old_path[:-1]
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2514
            if new_path is None: # Delete
2515
                inv_delta.append((old_path, None, file_id, None))
2516
                continue
2517
            ie = self.path_to_ie(new_path, file_id, rev_id, dir_ids)
2518
            inv_delta.append((old_path, new_path, file_id, ie))
2519
        return inv_delta
2520
5847.4.15 by John Arbash Meinel
two simple tests in the new framework.
2521
    def assertUpdate(self, active, basis, target):
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2522
        """Assert that update_basis_by_delta works how we want.
2523
2524
        Set up a DirState object with active_shape for tree 0, basis_shape for
2525
        tree 1. Then apply the delta from basis_shape to target_shape,
2526
        and assert that the DirState is still valid, and that its stored
2527
        content matches the target_shape.
2528
        """
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2529
        active_tree = self.create_tree_from_shape('active', active)
2530
        basis_tree = self.create_tree_from_shape('basis', basis)
2531
        target_tree = self.create_tree_from_shape('target', target)
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2532
        state = self.create_empty_dirstate()
6405.2.9 by Jelmer Vernooij
More test fixes.
2533
        state.set_state_from_scratch(active_tree.root_inventory,
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2534
            [('basis', basis_tree)], [])
6405.2.10 by Jelmer Vernooij
Fix more tests.
2535
        delta = target_tree.root_inventory._make_delta(
2536
            basis_tree.root_inventory)
5847.4.15 by John Arbash Meinel
two simple tests in the new framework.
2537
        state.update_basis_by_delta(delta, 'target')
2538
        state._validate()
2539
        dirstate_tree = workingtree_4.DirStateRevisionTree(state,
5847.4.16 by John Arbash Meinel
Switching from BranchBuilder to Inventory directly dropped us from 73ms to 26ms.
2540
            'target', _Repo())
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2541
        # The target now that delta has been applied should match the
2542
        # RevisionTree
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2543
        self.assertEqual([], list(dirstate_tree.iter_changes(target_tree)))
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2544
        # And the dirblock state should be identical to the state if we created
2545
        # it from scratch.
2546
        state2 = self.create_empty_dirstate()
6405.2.10 by Jelmer Vernooij
Fix more tests.
2547
        state2.set_state_from_scratch(active_tree.root_inventory,
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2548
            [('target', target_tree)], [])
5847.4.20 by John Arbash Meinel
Handle a bunch of rename cases.
2549
        self.assertEqual(state2._dirblocks, state._dirblocks)
5847.4.15 by John Arbash Meinel
two simple tests in the new framework.
2550
        return state
5847.4.14 by John Arbash Meinel
Create a direct helper for testing UpdateBasisByDelta cases.
2551
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2552
    def assertBadDelta(self, active, basis, delta):
2553
        """Test that we raise InconsistentDelta when appropriate.
2554
2555
        :param active: The active tree shape
2556
        :param basis: The basis tree shape
2557
        :param delta: A description of the delta to apply. Similar to the form
2558
            for regular inventory deltas, but omitting the InventoryEntry.
2559
            So adding a file is: (None, 'path', 'file-id')
2560
            Adding a directory is: (None, 'path/', 'dir-id')
2561
            Renaming a dir is: ('old/', 'new/', 'dir-id')
2562
            etc.
2563
        """
2564
        active_tree = self.create_tree_from_shape('active', active)
2565
        basis_tree = self.create_tree_from_shape('basis', basis)
2566
        inv_delta = self.create_inv_delta(delta, 'target')
2567
        state = self.create_empty_dirstate()
6405.2.10 by Jelmer Vernooij
Fix more tests.
2568
        state.set_state_from_scratch(active_tree.root_inventory,
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2569
            [('basis', basis_tree)], [])
5847.4.25 by John Arbash Meinel
Trap an InconsistentDelta case. add can try to add another
2570
        self.assertRaises(errors.InconsistentDelta,
2571
            state.update_basis_by_delta, inv_delta, 'target')
5847.4.26 by John Arbash Meinel
_check_delta_ids_absent thought it didn't have to set _changes_aborted=True
2572
        ## try:
2573
        ##     state.update_basis_by_delta(inv_delta, 'target')
2574
        ## except errors.InconsistentDelta, e:
2575
        ##     import pdb; pdb.set_trace()
2576
        ## else:
2577
        ##     import pdb; pdb.set_trace()
5847.4.22 by John Arbash Meinel
Cleanup dirstate a bit.
2578
        self.assertTrue(state._changes_aborted)
2579
5847.4.15 by John Arbash Meinel
two simple tests in the new framework.
2580
    def test_remove_file_matching_active_state(self):
2581
        state = self.assertUpdate(
2582
            active=[],
2583
            basis =[('file', 'file-id')],
2584
            target=[],
2585
            )
5847.4.17 by John Arbash Meinel
The 25ms was the time spent checking that we didn't alter the containing WT.
2586
2587
    def test_remove_file_present_in_active_state(self):
2588
        state = self.assertUpdate(
2589
            active=[('file', 'file-id')],
2590
            basis =[('file', 'file-id')],
2591
            target=[],
2592
            )
5847.4.18 by John Arbash Meinel
And now we add a bunch more tests, and finally have a failing case.
2593
2594
    def test_remove_file_present_elsewhere_in_active_state(self):
2595
        state = self.assertUpdate(
2596
            active=[('other-file', 'file-id')],
2597
            basis =[('file', 'file-id')],
2598
            target=[],
2599
            )
2600
2601
    def test_remove_file_active_state_has_diff_file(self):
2602
        state = self.assertUpdate(
2603
            active=[('file', 'file-id-2')],
2604
            basis =[('file', 'file-id')],
2605
            target=[],
2606
            )
2607
2608
    def test_remove_file_active_state_has_diff_file_and_file_elsewhere(self):
2609
        state = self.assertUpdate(
2610
            active=[('file', 'file-id-2'),
2611
                    ('other-file', 'file-id')],
2612
            basis =[('file', 'file-id')],
2613
            target=[],
2614
            )
2615
2616
    def test_add_file_matching_active_state(self):
2617
        state = self.assertUpdate(
2618
            active=[('file', 'file-id')],
2619
            basis =[],
2620
            target=[('file', 'file-id')],
2621
            )
2622
6015.45.3 by John Arbash Meinel
Add a direct Dirstate.update_basis_by_delta test.
2623
    def test_add_file_in_empty_dir_not_matching_active_state(self):
2624
        state = self.assertUpdate(
2625
                active=[],
2626
                basis=[('dir/', 'dir-id')],
2627
                target=[('dir/', 'dir-id', 'basis'), ('dir/file', 'file-id')],
2628
                )
2629
5847.4.18 by John Arbash Meinel
And now we add a bunch more tests, and finally have a failing case.
2630
    def test_add_file_missing_in_active_state(self):
2631
        state = self.assertUpdate(
2632
            active=[],
2633
            basis =[],
2634
            target=[('file', 'file-id')],
2635
            )
2636
2637
    def test_add_file_elsewhere_in_active_state(self):
2638
        state = self.assertUpdate(
2639
            active=[('other-file', 'file-id')],
2640
            basis =[],
2641
            target=[('file', 'file-id')],
2642
            )
5847.4.20 by John Arbash Meinel
Handle a bunch of rename cases.
2643
2644
    def test_add_file_active_state_has_diff_file_and_file_elsewhere(self):
2645
        state = self.assertUpdate(
2646
            active=[('other-file', 'file-id'),
2647
                    ('file', 'file-id-2')],
2648
            basis =[],
2649
            target=[('file', 'file-id')],
2650
            )
2651
2652
    def test_rename_file_matching_active_state(self):
2653
        state = self.assertUpdate(
2654
            active=[('other-file', 'file-id')],
2655
            basis =[('file', 'file-id')],
2656
            target=[('other-file', 'file-id')],
2657
            )
2658
2659
    def test_rename_file_missing_in_active_state(self):
2660
        state = self.assertUpdate(
2661
            active=[],
2662
            basis =[('file', 'file-id')],
2663
            target=[('other-file', 'file-id')],
2664
            )
2665
2666
    def test_rename_file_present_elsewhere_in_active_state(self):
2667
        state = self.assertUpdate(
2668
            active=[('third', 'file-id')],
2669
            basis =[('file', 'file-id')],
2670
            target=[('other-file', 'file-id')],
2671
            )
2672
2673
    def test_rename_file_active_state_has_diff_source_file(self):
2674
        state = self.assertUpdate(
2675
            active=[('file', 'file-id-2')],
2676
            basis =[('file', 'file-id')],
2677
            target=[('other-file', 'file-id')],
2678
            )
2679
2680
    def test_rename_file_active_state_has_diff_target_file(self):
2681
        state = self.assertUpdate(
2682
            active=[('other-file', 'file-id-2')],
2683
            basis =[('file', 'file-id')],
2684
            target=[('other-file', 'file-id')],
2685
            )
5847.4.21 by John Arbash Meinel
We were raising exceptions improperly. A couple more tests cases, so far so good.
2686
2687
    def test_rename_file_active_has_swapped_files(self):
2688
        state = self.assertUpdate(
2689
            active=[('file', 'file-id'),
2690
                    ('other-file', 'file-id-2')],
2691
            basis= [('file', 'file-id'),
2692
                    ('other-file', 'file-id-2')],
2693
            target=[('file', 'file-id-2'),
2694
                    ('other-file', 'file-id')])
2695
2696
    def test_rename_file_basis_has_swapped_files(self):
2697
        state = self.assertUpdate(
2698
            active=[('file', 'file-id'),
2699
                    ('other-file', 'file-id-2')],
2700
            basis= [('file', 'file-id-2'),
2701
                    ('other-file', 'file-id')],
2702
            target=[('file', 'file-id'),
2703
                    ('other-file', 'file-id-2')])
5847.4.23 by John Arbash Meinel
Add the first invalid delta test.
2704
5847.4.29 by John Arbash Meinel
Simplify a bit. Handle that when a directory is added, we need to add its block.
2705
    def test_rename_directory_with_contents(self):
2706
        state = self.assertUpdate( # active matches basis
2707
            active=[('dir1/', 'dir-id'),
2708
                    ('dir1/file', 'file-id')],
2709
            basis= [('dir1/', 'dir-id'),
2710
                    ('dir1/file', 'file-id')],
2711
            target=[('dir2/', 'dir-id'),
2712
                    ('dir2/file', 'file-id')])
2713
        state = self.assertUpdate( # active matches target
2714
            active=[('dir2/', 'dir-id'),
2715
                    ('dir2/file', 'file-id')],
2716
            basis= [('dir1/', 'dir-id'),
2717
                    ('dir1/file', 'file-id')],
2718
            target=[('dir2/', 'dir-id'),
2719
                    ('dir2/file', 'file-id')])
2720
        state = self.assertUpdate( # active empty
2721
            active=[],
2722
            basis= [('dir1/', 'dir-id'),
2723
                    ('dir1/file', 'file-id')],
2724
            target=[('dir2/', 'dir-id'),
2725
                    ('dir2/file', 'file-id')])
2726
        state = self.assertUpdate( # active present at other location
2727
            active=[('dir3/', 'dir-id'),
2728
                    ('dir3/file', 'file-id')],
2729
            basis= [('dir1/', 'dir-id'),
2730
                    ('dir1/file', 'file-id')],
2731
            target=[('dir2/', 'dir-id'),
2732
                    ('dir2/file', 'file-id')])
2733
        state = self.assertUpdate( # active has different ids
2734
            active=[('dir1/', 'dir1-id'),
2735
                    ('dir1/file', 'file1-id'),
2736
                    ('dir2/', 'dir2-id'),
2737
                    ('dir2/file', 'file2-id')],
2738
            basis= [('dir1/', 'dir-id'),
2739
                    ('dir1/file', 'file-id')],
2740
            target=[('dir2/', 'dir-id'),
2741
                    ('dir2/file', 'file-id')])
2742
5847.4.23 by John Arbash Meinel
Add the first invalid delta test.
2743
    def test_invalid_file_not_present(self):
2744
        state = self.assertBadDelta(
2745
            active=[('file', 'file-id')],
2746
            basis= [('file', 'file-id')],
2747
            delta=[('other-file', 'file', 'file-id')])
2748
5847.4.24 by John Arbash Meinel
Start handling an InconsistentDelta case exposed by test_inv cases.
2749
    def test_invalid_new_id_same_path(self):
5847.4.25 by John Arbash Meinel
Trap an InconsistentDelta case. add can try to add another
2750
        # The bad entry comes after
5847.4.24 by John Arbash Meinel
Start handling an InconsistentDelta case exposed by test_inv cases.
2751
        state = self.assertBadDelta(
2752
            active=[('file', 'file-id')],
2753
            basis= [('file', 'file-id')],
2754
            delta=[(None, 'file', 'file-id-2')])
5847.4.25 by John Arbash Meinel
Trap an InconsistentDelta case. add can try to add another
2755
        # The bad entry comes first
2756
        state = self.assertBadDelta(
2757
            active=[('file', 'file-id-2')],
5847.4.27 by John Arbash Meinel
Handle missing parent, though bugs may still remain
2758
            basis=[('file', 'file-id-2')],
5847.4.25 by John Arbash Meinel
Trap an InconsistentDelta case. add can try to add another
2759
            delta=[(None, 'file', 'file-id')])
5847.4.24 by John Arbash Meinel
Start handling an InconsistentDelta case exposed by test_inv cases.
2760
5847.4.27 by John Arbash Meinel
Handle missing parent, though bugs may still remain
2761
    def test_invalid_existing_id(self):
5847.4.26 by John Arbash Meinel
_check_delta_ids_absent thought it didn't have to set _changes_aborted=True
2762
        state = self.assertBadDelta(
2763
            active=[('file', 'file-id')],
2764
            basis= [('file', 'file-id')],
2765
            delta=[(None, 'file', 'file-id')])
2766
5847.4.27 by John Arbash Meinel
Handle missing parent, though bugs may still remain
2767
    def test_invalid_parent_missing(self):
2768
        state = self.assertBadDelta(
2769
            active=[],
2770
            basis= [],
2771
            delta=[(None, 'path/path2', 'file-id')])
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2772
        # Note: we force the active tree to have the directory, by knowing how
2773
        #       path_to_ie handles entries with missing parents
2774
        state = self.assertBadDelta(
2775
            active=[('path/', 'path-id')],
5847.4.33 by John Arbash Meinel
Clean up the _update_basis_apply_changes code
2776
            basis= [],
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2777
            delta=[(None, 'path/path2', 'file-id')])
2778
        state = self.assertBadDelta(
2779
            active=[('path/', 'path-id'),
2780
                    ('path/path2', 'file-id')],
5847.4.33 by John Arbash Meinel
Clean up the _update_basis_apply_changes code
2781
            basis= [],
5847.4.28 by John Arbash Meinel
Some more direct tests. Fix some bugs in the create_entry code.
2782
            delta=[(None, 'path/path2', 'file-id')])
2783
5847.4.36 by John Arbash Meinel
test cases for stuff like a parent becoming its own parent,
2784
    def test_renamed_dir_same_path(self):
2785
        # We replace the parent directory, with another parent dir. But the C
2786
        # file doesn't look like it has been moved.
2787
        state = self.assertUpdate(# Same as basis
5847.4.38 by John Arbash Meinel
Removing the 'fast-path' for paths that look unchanged fixes the bug.
2788
            active=[('dir/', 'A-id'),
2789
                    ('dir/B', 'B-id')],
2790
            basis= [('dir/', 'A-id'),
2791
                    ('dir/B', 'B-id')],
2792
            target=[('dir/', 'C-id'),
2793
                    ('dir/B', 'B-id')])
2794
        state = self.assertUpdate(# Same as target
2795
            active=[('dir/', 'C-id'),
2796
                    ('dir/B', 'B-id')],
2797
            basis= [('dir/', 'A-id'),
2798
                    ('dir/B', 'B-id')],
2799
            target=[('dir/', 'C-id'),
2800
                    ('dir/B', 'B-id')])
2801
        state = self.assertUpdate(# empty active
2802
            active=[],
2803
            basis= [('dir/', 'A-id'),
2804
                    ('dir/B', 'B-id')],
2805
            target=[('dir/', 'C-id'),
2806
                    ('dir/B', 'B-id')])
2807
        state = self.assertUpdate(# different active
2808
            active=[('dir/', 'D-id'),
2809
                    ('dir/B', 'B-id')],
2810
            basis= [('dir/', 'A-id'),
2811
                    ('dir/B', 'B-id')],
2812
            target=[('dir/', 'C-id'),
2813
                    ('dir/B', 'B-id')])
5847.4.36 by John Arbash Meinel
test cases for stuff like a parent becoming its own parent,
2814
2815
    def test_parent_child_swap(self):
2816
        state = self.assertUpdate(# Same as basis
2817
            active=[('A/', 'A-id'),
2818
                    ('A/B/', 'B-id'),
2819
                    ('A/B/C', 'C-id')],
2820
            basis= [('A/', 'A-id'),
2821
                    ('A/B/', 'B-id'),
2822
                    ('A/B/C', 'C-id')],
2823
            target=[('A/', 'B-id'),
2824
                    ('A/B/', 'A-id'),
2825
                    ('A/B/C', 'C-id')])
2826
        state = self.assertUpdate(# Same as target
2827
            active=[('A/', 'B-id'),
2828
                    ('A/B/', 'A-id'),
2829
                    ('A/B/C', 'C-id')],
2830
            basis= [('A/', 'A-id'),
2831
                    ('A/B/', 'B-id'),
2832
                    ('A/B/C', 'C-id')],
2833
            target=[('A/', 'B-id'),
2834
                    ('A/B/', 'A-id'),
2835
                    ('A/B/C', 'C-id')])
2836
        state = self.assertUpdate(# empty active
2837
            active=[],
2838
            basis= [('A/', 'A-id'),
2839
                    ('A/B/', 'B-id'),
2840
                    ('A/B/C', 'C-id')],
2841
            target=[('A/', 'B-id'),
2842
                    ('A/B/', 'A-id'),
2843
                    ('A/B/C', 'C-id')])
2844
        state = self.assertUpdate(# different active
2845
            active=[('D/', 'A-id'),
2846
                    ('D/E/', 'B-id'),
2847
                    ('F', 'C-id')],
2848
            basis= [('A/', 'A-id'),
2849
                    ('A/B/', 'B-id'),
2850
                    ('A/B/C', 'C-id')],
2851
            target=[('A/', 'B-id'),
2852
                    ('A/B/', 'A-id'),
2853
                    ('A/B/C', 'C-id')])
2854
5847.4.32 by John Arbash Meinel
Update the test suite to handle root changes.
2855
    def test_change_root_id(self):
2856
        state = self.assertUpdate( # same as basis
2857
            active=[('', 'root-id'),
2858
                    ('file', 'file-id')],
2859
            basis= [('', 'root-id'),
2860
                    ('file', 'file-id')],
2861
            target=[('', 'target-root-id'),
2862
                    ('file', 'file-id')])
2863
        state = self.assertUpdate( # same as target
2864
            active=[('', 'target-root-id'),
2865
                    ('file', 'file-id')],
2866
            basis= [('', 'root-id'),
2867
                    ('file', 'file-id')],
2868
            target=[('', 'target-root-id'),
2869
                    ('file', 'root-id')])
2870
        state = self.assertUpdate( # all different
2871
            active=[('', 'active-root-id'),
2872
                    ('file', 'file-id')],
2873
            basis= [('', 'root-id'),
2874
                    ('file', 'file-id')],
2875
            target=[('', 'target-root-id'),
2876
                    ('file', 'root-id')])
5847.4.33 by John Arbash Meinel
Clean up the _update_basis_apply_changes code
2877
2878
    def test_change_file_absent_in_active(self):
2879
        state = self.assertUpdate(
2880
            active=[],
2881
            basis= [('file', 'file-id')],
2882
            target=[('file', 'file-id')])
2883
2884
    def test_invalid_changed_file(self):
2885
        state = self.assertBadDelta( # Not present in basis
2886
            active=[('file', 'file-id')],
2887
            basis= [],
2888
            delta=[('file', 'file', 'file-id')])
2889
        state = self.assertBadDelta( # present at another location in basis
2890
            active=[('file', 'file-id')],
2891
            basis= [('other-file', 'file-id')],
2892
            delta=[('file', 'file', 'file-id')])