/brz/remove-bazaar

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