/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.2.27 by John Arbash Meinel
Fix a copyright statement to let 'source' tests pass
1
# Copyright (C) 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests of the dirstate functionality being built for WorkingTreeFormat4."""
18
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
19
import bisect
1852.13.20 by Robert Collins
Steps toward an object model.
20
import os
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
21
import time
1852.13.20 by Robert Collins
Steps toward an object model.
22
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
23
from bzrlib import (
24
    dirstate,
25
    errors,
26
    osutils,
27
    )
2255.2.4 by Robert Collins
Snapshot dirstate development
28
from bzrlib.memorytree import MemoryTree
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
29
from bzrlib.tests import TestCase, TestCaseWithTransport
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
30
31
32
# TODO:
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
33
# test DirStateRevisionTree : test filtering out of deleted files does not
34
#         filter out files called RECYCLED.BIN ;)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
35
# test 0 parents, 1 parent, 4 parents.
36
# test unicode parents, non unicode parents
1852.13.12 by Robert Collins
get actual parent info for the first parent.
37
# test all change permutations in one and two parents.
38
# i.e. file in parent 1, dir in parent 2, symlink in tree.
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
39
# test that renames in the tree result in correct parent paths
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
40
# Test get state from a file, then asking for lines.
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
41
# write a smaller state, and check the file has been truncated.
42
# add a entry when its in state deleted
1852.13.20 by Robert Collins
Steps toward an object model.
43
# revision attribute for root entries.
44
# test that utf8 strings are preserved in _row_to_line
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
45
# test parent manipulation
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.
46
# test parents that are null in save : i.e. no record in the parent tree for this.
47
# todo: _set_data records ghost parents.
2255.2.4 by Robert Collins
Snapshot dirstate development
48
# 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.
49
# general checks for NOT_IN_MEMORY error conditions.
50
# set_path_id on a NOT_IN_MEMORY dirstate
2255.2.4 by Robert Collins
Snapshot dirstate development
51
# set_path_id  unicode support
52
# set_path_id  setting id of a path not root
53
# set_path_id  setting id when there are parents without the id in the parents
54
# set_path_id  setting id when there are parents with the id in the parents
55
# set_path_id  setting id when state is not in memory
56
# set_path_id  setting id when state is in memory unmodified
57
# set_path_id  setting id when state is in memory modified
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
58
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
59
class TestCaseWithDirState(TestCaseWithTransport):
60
    """Helper functions for creating DirState objects with various content."""
61
62
    def create_empty_dirstate(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
63
        """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.
64
        state = dirstate.DirState.initialize('dirstate')
65
        return state
66
67
    def create_dirstate_with_root(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
68
        """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.
69
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
70
        root_entry_direntry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
71
            ('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.
72
            ]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
73
        dirblocks = []
74
        dirblocks.append(('', [root_entry_direntry]))
75
        dirblocks.append(('', []))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
76
        state = self.create_empty_dirstate()
77
        try:
78
            state._set_data([], dirblocks)
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
79
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
80
        except:
81
            state.unlock()
82
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
83
        return state
84
85
    def create_dirstate_with_root_and_subdir(self):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
86
        """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.
87
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
88
        subdir_entry = ('', 'subdir', 'subdir-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
89
            ('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.
90
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
91
        state = self.create_dirstate_with_root()
92
        try:
93
            dirblocks = list(state._dirblocks)
94
            dirblocks[1][1].append(subdir_entry)
95
            state._set_data([], dirblocks)
96
        except:
97
            state.unlock()
98
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
99
        return state
100
101
    def create_complex_dirstate(self):
102
        """This dirstate contains multiple files and directories.
103
104
         /        a-root-value
105
         a/       a-dir
106
         b/       b-dir
107
         c        c-file
108
         d        d-file
109
         a/e/     e-dir
110
         a/f      f-file
111
         b/g      g-file
112
         b/h\xc3\xa5  h-\xc3\xa5-file  #This is u'\xe5' encoded into utf-8
113
114
        # Notice that a/e is an empty directory.
115
        """
116
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
117
        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
118
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
119
            ('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.
120
            ]
121
        a_entry = ('', 'a', 'a-dir'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
122
            ('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.
123
            ]
124
        b_entry = ('', 'b', 'b-dir'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
125
            ('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.
126
            ]
127
        c_entry = ('', 'c', 'c-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
128
            ('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.
129
            ]
130
        d_entry = ('', 'd', 'd-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
131
            ('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.
132
            ]
133
        e_entry = ('a', 'e', 'e-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
        f_entry = ('a', 'f', 'f-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
137
            ('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.
138
            ]
139
        g_entry = ('b', 'g', 'g-file'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
140
            ('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.
141
            ]
142
        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
143
            ('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.
144
            ]
145
        dirblocks = []
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
146
        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.
147
        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
148
        dirblocks.append(('a', [e_entry, f_entry]))
149
        dirblocks.append(('b', [g_entry, h_entry]))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
150
        state = dirstate.DirState.initialize('dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
151
        state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
152
        try:
153
            state._set_data([], dirblocks)
154
        except:
155
            state.unlock()
156
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
157
        return state
158
159
    def check_state_with_reopen(self, expected_result, state):
160
        """Check that state has current state expected_result.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
161
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
162
        This will check the current state, open the file anew and check it
163
        again.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
164
        This function expects the current state to be locked for writing, and
165
        will unlock it before re-opening.
166
        This is required because we can't open a lock_read() while something
167
        else has a lock_write().
168
            write => mutually exclusive lock
169
            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.
170
        """
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
171
        # The state should already be write locked, since we just had to do
172
        # some operation to get here.
173
        assert state._lock_token is not None
174
        try:
175
            self.assertEqual(expected_result[0],  state.get_parent_ids())
176
            # there should be no ghosts in this tree.
177
            self.assertEqual([], state.get_ghosts())
178
            # there should be one fileid in this tree - the root of the tree.
179
            self.assertEqual(expected_result[1], list(state._iter_entries()))
180
            state.save()
181
        finally:
182
            state.unlock()
183
        del state # Callers should unlock
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
184
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
185
        state.lock_read()
186
        try:
187
            self.assertEqual(expected_result[1], list(state._iter_entries()))
188
        finally:
189
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
190
191
192
class TestTreeToDirState(TestCaseWithDirState):
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
193
194
    def test_empty_to_dirstate(self):
195
        """We should be able to create a dirstate for an empty tree."""
196
        # There are no files on disk and no parents
197
        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.
198
        expected_result = ([], [
199
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
200
             [('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.
201
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
202
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
203
        state._validate()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
204
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
205
206
    def test_1_parents_empty_to_dirstate(self):
207
        # create a parent by doing a commit
208
        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.
209
        rev_id = tree.commit('first post').encode('utf8')
210
        root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
211
        expected_result = ([rev_id], [
212
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
213
             [('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
214
              ('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.
215
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
216
        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.
217
        self.check_state_with_reopen(expected_result, state)
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
218
        state._validate()
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
219
220
    def test_2_parents_empty_to_dirstate(self):
221
        # create a parent by doing a commit
222
        tree = self.make_branch_and_tree('tree')
223
        rev_id = tree.commit('first post')
224
        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.
225
        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.
226
        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.
227
        expected_result = ([rev_id, rev_id2], [
228
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
229
             [('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
230
              ('d', '', 0, False, rev_id), # first parent details
231
              ('d', '', 0, False, rev_id2), # 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.
232
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
233
        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.
234
        self.check_state_with_reopen(expected_result, state)
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
235
        state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
236
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
237
    def test_empty_unknowns_are_ignored_to_dirstate(self):
238
        """We should be able to create a dirstate for an empty tree."""
239
        # There are no files on disk and no parents
240
        tree = self.make_branch_and_tree('tree')
1852.13.10 by Robert Collins
Use just the tree api to generate dirstate information.
241
        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.
242
        expected_result = ([], [
243
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
244
             [('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.
245
             ])])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
246
        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.
247
        self.check_state_with_reopen(expected_result, state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
248
1852.13.12 by Robert Collins
get actual parent info for the first parent.
249
    def get_tree_with_a_file(self):
250
        tree = self.make_branch_and_tree('tree')
251
        self.build_tree(['tree/a file'])
252
        tree.add('a file', 'a file id')
253
        return tree
254
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
255
    def test_non_empty_no_parents_to_dirstate(self):
256
        """We should be able to create a dirstate for an empty tree."""
1852.13.11 by Robert Collins
Get one content containing test passing.
257
        # There are files on disk and no parents
1852.13.12 by Robert Collins
get actual parent info for the first parent.
258
        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.
259
        expected_result = ([], [
260
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
261
             [('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.
262
             ]),
263
            (('', 'a file', 'a file id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
264
             [('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.
265
             ]),
266
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
267
        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.
268
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
269
270
    def test_1_parents_not_empty_to_dirstate(self):
271
        # create a parent by doing a commit
1852.13.12 by Robert Collins
get actual parent info for the first parent.
272
        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.
273
        rev_id = tree.commit('first post').encode('utf8')
1852.13.12 by Robert Collins
get actual parent info for the first parent.
274
        # change the current content to be different this will alter stat, sha
275
        # and length:
276
        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.
277
        expected_result = ([rev_id], [
278
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
279
             [('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
280
              ('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.
281
             ]),
282
            (('', 'a file', 'a file id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
283
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
284
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
285
               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.
286
             ]),
287
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
288
        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.
289
        self.check_state_with_reopen(expected_result, state)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
290
291
    def test_2_parents_not_empty_to_dirstate(self):
292
        # create a parent by doing a commit
1852.13.13 by Robert Collins
2-parent case working.
293
        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.
294
        rev_id = tree.commit('first post').encode('utf8')
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
295
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
1852.13.13 by Robert Collins
2-parent case working.
296
        # change the current content to be different this will alter stat, sha
297
        # and length:
298
        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.
299
        rev_id2 = tree2.commit('second post').encode('utf8')
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
300
        tree.merge_from_branch(tree2.branch)
1852.13.13 by Robert Collins
2-parent case working.
301
        # change the current content to be different this will alter stat, sha
302
        # and length again, giving us three distinct values:
303
        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.
304
        expected_result = ([rev_id, rev_id2], [
305
            (('', '', tree.path2id('')), # common details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
306
             [('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
307
              ('d', '', 0, False, rev_id), # first parent details
308
              ('d', '', 0, False, rev_id2), # 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.
309
             ]),
310
            (('', 'a file', 'a file id'), # common
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
311
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
312
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
313
               rev_id), # first parent
314
              ('f', '314d796174c9412647c3ce07dfb5d36a94e72958', 14, False,
315
               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.
316
             ]),
317
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
318
        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.
319
        self.check_state_with_reopen(expected_result, state)
320
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
321
    def test_colliding_fileids(self):
322
        # test insertion of parents creating several entries at the same path.
323
        # we used to have a bug where they could cause the dirstate to break
324
        # its ordering invariants.
325
        # create some trees to test from
326
        parents = []
327
        for i in range(7):
328
            tree = self.make_branch_and_tree('tree%d' % i)
329
            self.build_tree(['tree%d/name' % i,])
330
            tree.add(['name'], ['file-id%d' % i])
331
            revision_id = 'revid-%d' % i
332
            tree.commit('message', rev_id=revision_id)
333
            parents.append((revision_id,
334
                tree.branch.repository.revision_tree(revision_id)))
335
        # now fold these trees into a dirstate
336
        state = dirstate.DirState.initialize('dirstate')
337
        try:
338
            state.set_parent_trees(parents, [])
339
            state._validate()
340
        finally:
341
            state.unlock()
342
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
343
344
class TestDirStateOnFile(TestCaseWithDirState):
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
345
346
    def test_construct_with_path(self):
347
        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.
348
        state = dirstate.DirState.from_tree(tree, 'dirstate.from_tree')
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
349
        # we want to be able to get the lines of the dirstate that we will
350
        # write to disk.
351
        lines = state.get_lines()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
352
        state.unlock()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
353
        self.build_tree_contents([('dirstate', ''.join(lines))])
354
        # 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.
355
        # no parents, default tree content
356
        expected_result = ([], [
357
            (('', '', tree.path2id('')), # common details
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
358
             # current tree details, but new from_tree skips statting, it
359
             # uses set_state_from_inventory, and thus depends on the
360
             # inventory state.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
361
             [('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.
362
             ])
363
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
364
        state = dirstate.DirState.on_file('dirstate')
365
        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.
366
        self.check_state_with_reopen(expected_result, state)
367
368
    def test_can_save_clean_on_file(self):
369
        tree = self.make_branch_and_tree('tree')
370
        state = dirstate.DirState.from_tree(tree, 'dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
371
        try:
372
            # doing a save should work here as there have been no changes.
373
            state.save()
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
374
            # TODO: stat it and check it hasn't changed; may require waiting
375
            # for the state accuracy window.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
376
        finally:
377
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
378
379
380
class TestDirStateInitialize(TestCaseWithDirState):
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
381
382
    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.
383
        expected_result = ([], [
384
            (('', '', 'TREE_ROOT'), # common details
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
385
             [('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.
386
             ])
387
            ])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
388
        state = dirstate.DirState.initialize('dirstate')
389
        try:
390
            self.assertIsInstance(state, dirstate.DirState)
391
            lines = state.get_lines()
392
            self.assertFileEqual(''.join(state.get_lines()),
393
                'dirstate')
394
            self.check_state_with_reopen(expected_result, state)
395
        except:
396
            state.unlock()
397
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
398
399
400
class TestDirStateManipulations(TestCaseWithDirState):
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
401
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.
402
    def test_set_state_from_inventory_no_content_no_parents(self):
403
        # setting the current inventory is a slow but important api to support.
404
        tree1 = self.make_branch_and_memory_tree('tree1')
405
        tree1.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
406
        try:
407
            tree1.add('')
408
            revid1 = tree1.commit('foo').encode('utf8')
409
            root_id = tree1.inventory.root.file_id
410
            inv = tree1.inventory
411
        finally:
412
            tree1.unlock()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
413
        expected_result = [], [
414
            (('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
415
             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
416
        state = dirstate.DirState.initialize('dirstate')
417
        try:
418
            state.set_state_from_inventory(inv)
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
419
            self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
420
                             state._header_state)
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
421
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
422
                             state._dirblock_state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
423
        except:
424
            state.unlock()
425
            raise
426
        else:
427
            # This will unlock it
428
            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.
429
2255.2.4 by Robert Collins
Snapshot dirstate development
430
    def test_set_path_id_no_parents(self):
431
        """The id of a path can be changed trivally with no parents."""
432
        state = dirstate.DirState.initialize('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
433
        try:
434
            # check precondition to be sure the state does change appropriately.
435
            self.assertEqual(
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
436
                [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
437
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
438
                list(state._iter_entries()))
439
            state.set_path_id('', 'foobarbaz')
440
            expected_rows = [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
441
                (('', '', 'foobarbaz'), [('d', '', 0, False,
442
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
443
            self.assertEqual(expected_rows, list(state._iter_entries()))
444
            # should work across save too
445
            state.save()
446
        finally:
447
            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.
448
        state = dirstate.DirState.on_file('dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
449
        state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
450
        state.lock_read()
451
        try:
452
            self.assertEqual(expected_rows, list(state._iter_entries()))
453
        finally:
454
            state.unlock()
2255.2.4 by Robert Collins
Snapshot dirstate development
455
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
456
    def test_set_path_id_with_parents(self):
457
        """Set the root file id in a dirstate with parents"""
458
        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
459
        # in case the default tree format uses a different root id
460
        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
461
        mt.commit('foo', rev_id='parent-revid')
462
        rt = mt.branch.repository.revision_tree('parent-revid')
463
        state = dirstate.DirState.initialize('dirstate')
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
464
        state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
465
        try:
466
            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
467
            state.set_path_id('', 'foobarbaz')
2255.2.177 by Martin Pool
merge dirstate sorting fix, add more validation tests
468
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
469
            # now see that it is what we expected
470
            expected_rows = [
471
                (('', '', 'TREE_ROOT'),
472
                    [('a', '', 0, False, ''),
473
                     ('d', '', 0, False, 'parent-revid'),
474
                     ]),
475
                (('', '', 'foobarbaz'),
476
                    [('d', '', 0, False, ''),
477
                     ('a', '', 0, False, ''),
478
                     ]),
479
                ]
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
480
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
481
            self.assertEqual(expected_rows, list(state._iter_entries()))
482
            # should work across save too
483
            state.save()
484
        finally:
485
            state.unlock()
486
        # now flush & check we get the same
487
        state = dirstate.DirState.on_file('dirstate')
488
        state.lock_read()
489
        try:
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
490
            state._validate()
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
491
            self.assertEqual(expected_rows, list(state._iter_entries()))
492
        finally:
493
            state.unlock()
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
494
        # now change within an existing file-backed state
495
        state.lock_write()
496
        try:
497
            state._validate()
498
            state.set_path_id('', 'tree-root-2')
499
            state._validate()
500
        finally:
501
            state.unlock()
502
2255.7.68 by Martin Pool
Add a test for setting the root id in a dirstate with parent trees
503
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.
504
    def test_set_parent_trees_no_content(self):
505
        # set_parent_trees is a slow but important api to support.
506
        tree1 = self.make_branch_and_memory_tree('tree1')
2255.2.2 by Robert Collins
Partial updates for API changes in trunk.
507
        tree1.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
508
        try:
509
            tree1.add('')
510
            revid1 = tree1.commit('foo')
511
        finally:
512
            tree1.unlock()
2255.2.4 by Robert Collins
Snapshot dirstate development
513
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
514
        tree2 = MemoryTree.create_on_branch(branch2)
2255.2.2 by Robert Collins
Partial updates for API changes in trunk.
515
        tree2.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
516
        try:
517
            revid2 = tree2.commit('foo')
518
            root_id = tree2.inventory.root.file_id
519
        finally:
520
            tree2.unlock()
521
        state = dirstate.DirState.initialize('dirstate')
522
        try:
523
            state.set_path_id('', root_id)
524
            state.set_parent_trees(
525
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
526
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
527
                 ('ghost-rev', None)),
528
                ['ghost-rev'])
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
529
            # check we can reopen and use the dirstate after setting parent
530
            # trees.
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
531
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
532
            state.save()
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
533
            state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
534
        finally:
535
            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.
536
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
537
        state.lock_write()
538
        try:
539
            self.assertEqual([revid1, revid2, 'ghost-rev'],
540
                             state.get_parent_ids())
541
            # iterating the entire state ensures that the state is parsable.
542
            list(state._iter_entries())
543
            # be sure that it sets not appends - change it
544
            state.set_parent_trees(
545
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
546
                 ('ghost-rev', None)),
547
                ['ghost-rev'])
548
            # and now put it back.
549
            state.set_parent_trees(
550
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
551
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
552
                 ('ghost-rev', tree2.branch.repository.revision_tree(None))),
553
                ['ghost-rev'])
554
            self.assertEqual([revid1, revid2, 'ghost-rev'],
555
                             state.get_parent_ids())
556
            # the ghost should be recorded as such by set_parent_trees.
557
            self.assertEqual(['ghost-rev'], state.get_ghosts())
558
            self.assertEqual(
559
                [(('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
560
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
561
                  ('d', '', 0, False, revid1),
562
                  ('d', '', 0, False, revid2)
563
                  ])],
564
                list(state._iter_entries()))
565
        finally:
566
            state.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
567
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
568
    def test_set_parent_trees_file_missing_from_tree(self):
569
        # 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
570
        # 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
571
        # separate trees.
572
        # set_parent_trees is a slow but important api to support.
573
        tree1 = self.make_branch_and_memory_tree('tree1')
574
        tree1.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
575
        try:
576
            tree1.add('')
577
            tree1.add(['a file'], ['file-id'], ['file'])
578
            tree1.put_file_bytes_non_atomic('file-id', 'file-content')
579
            revid1 = tree1.commit('foo')
580
        finally:
581
            tree1.unlock()
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
582
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
583
        tree2 = MemoryTree.create_on_branch(branch2)
584
        tree2.lock_write()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
585
        try:
586
            tree2.put_file_bytes_non_atomic('file-id', 'new file-content')
587
            revid2 = tree2.commit('foo')
588
            root_id = tree2.inventory.root.file_id
589
        finally:
590
            tree2.unlock()
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
591
        # check the layout in memory
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
592
        expected_result = [revid1.encode('utf8'), revid2.encode('utf8')], [
593
            (('', '', root_id), [
2255.2.124 by John Arbash Meinel
Remove direct access to Dirstate prefering dirstate.Dirstate
594
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
595
             ('d', '', 0, False, revid1.encode('utf8')),
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
596
             ('d', '', 0, False, revid2.encode('utf8'))
597
             ]),
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
598
            (('', 'a file', 'file-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
599
             ('a', '', 0, False, ''),
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
600
             ('f', '2439573625385400f2a669657a7db6ae7515d371', 12, False,
601
              revid1.encode('utf8')),
602
             ('f', '542e57dc1cda4af37cb8e55ec07ce60364bb3c7d', 16, False,
603
              revid2.encode('utf8'))
604
             ])
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
605
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
606
        state = dirstate.DirState.initialize('dirstate')
607
        try:
608
            state.set_path_id('', root_id)
609
            state.set_parent_trees(
610
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
611
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
612
                 ), [])
613
        except:
614
            state.unlock()
615
            raise
616
        else:
617
            # check_state_with_reopen will unlock
618
            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
619
1852.13.20 by Robert Collins
Steps toward an object model.
620
    ### add a path via _set_data - so we dont need delta work, just
621
    # 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.
622
1852.13.25 by Robert Collins
Snapshot state
623
    def test_add_path_to_root_no_parents_all_data(self):
624
        # The most trivial addition of a path is when there are no parents and
625
        # its in the root and all data about the file is supplied
626
        self.build_tree(['a file'])
627
        stat = os.lstat('a file')
628
        # the 1*20 is the sha1 pretend value.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
629
        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.
630
        expected_entries = [
631
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
632
             ('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.
633
             ]),
634
            (('', 'a file', 'a file id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
635
             ('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.
636
             ]),
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
637
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
638
        try:
639
            state.add('a file', 'a file id', 'file', stat, '1'*20)
640
            # having added it, it should be in the output of iter_entries.
641
            self.assertEqual(expected_entries, list(state._iter_entries()))
642
            # saving and reloading should not affect this.
643
            state.save()
644
        finally:
645
            state.unlock()
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
646
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
647
        state.lock_read()
648
        try:
649
            self.assertEqual(expected_entries, list(state._iter_entries()))
650
        finally:
651
            state.unlock()
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
652
653
    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.
654
        """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.
655
656
        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.
657
        once dirstate is stable and if it is merged with WorkingTree3, consider
658
        removing this copy of the test.
659
        """
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
660
        self.build_tree(['unversioned/', 'unversioned/a file'])
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
661
        state = dirstate.DirState.initialize('dirstate')
662
        try:
663
            self.assertRaises(errors.NotVersionedError, state.add,
664
                'unversioned/a file', 'a file id', 'file', None, None)
665
        finally:
666
            state.unlock()
667
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
668
    def test_add_directory_to_root_no_parents_all_data(self):
669
        # The most trivial addition of a dir is when there are no parents and
670
        # its in the root and all data about the file is supplied
671
        self.build_tree(['a dir/'])
672
        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.
673
        expected_entries = [
674
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
675
             ('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.
676
             ]),
677
            (('', 'a dir', 'a dir id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
678
             ('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.
679
             ]),
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
680
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
681
        state = dirstate.DirState.initialize('dirstate')
682
        try:
683
            state.add('a dir', 'a dir id', 'directory', stat, None)
684
            # having added it, it should be in the output of iter_entries.
685
            self.assertEqual(expected_entries, list(state._iter_entries()))
686
            # saving and reloading should not affect this.
687
            state.save()
688
        finally:
689
            state.unlock()
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
690
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
691
        state.lock_read()
2255.7.78 by Martin Pool
Add DirState._validate and call from the tests
692
        state._validate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
693
        try:
694
            self.assertEqual(expected_entries, list(state._iter_entries()))
695
        finally:
696
            state.unlock()
1852.13.25 by Robert Collins
Snapshot state
697
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.
698
    def test_add_symlink_to_root_no_parents_all_data(self):
699
        # The most trivial addition of a symlink when there are no parents and
700
        # its in the root and all data about the file is supplied
701
        ## TODO: windows: dont fail this test. Also, how are symlinks meant to
702
        # be represented on windows.
703
        os.symlink('target', 'a link')
704
        stat = os.lstat('a link')
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
705
        expected_entries = [
706
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
707
             ('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.
708
             ]),
709
            (('', 'a link', 'a link id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
710
             ('l', 'target', 6, 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.
711
             ]),
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.
712
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
713
        state = dirstate.DirState.initialize('dirstate')
714
        try:
715
            state.add('a link', 'a link id', 'symlink', stat, 'target')
716
            # having added it, it should be in the output of iter_entries.
717
            self.assertEqual(expected_entries, list(state._iter_entries()))
718
            # saving and reloading should not affect this.
719
            state.save()
720
        finally:
721
            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.
722
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
723
        state.lock_read()
724
        try:
725
            self.assertEqual(expected_entries, list(state._iter_entries()))
726
        finally:
727
            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.
728
729
    def test_add_directory_and_child_no_parents_all_data(self):
730
        # after adding a directory, we should be able to add children to it.
731
        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.
732
        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.
733
        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.
734
        expected_entries = [
735
            (('', '', 'TREE_ROOT'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
736
             ('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.
737
             ]),
738
            (('', 'a dir', 'a dir id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
739
             ('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.
740
             ]),
741
            (('a dir', 'a file', 'a file id'), [
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
742
             ('f', '1'*20, 25, False,
743
              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.
744
             ]),
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.
745
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
746
        state = dirstate.DirState.initialize('dirstate')
747
        try:
748
            state.add('a dir', 'a dir id', 'directory', dirstat, None)
749
            state.add('a dir/a file', 'a file id', 'file', filestat, '1'*20)
750
            # added it, it should be in the output of iter_entries.
751
            self.assertEqual(expected_entries, list(state._iter_entries()))
752
            # saving and reloading should not affect this.
753
            state.save()
754
        finally:
755
            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.
756
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
757
        state.lock_read()
758
        try:
759
            self.assertEqual(expected_entries, list(state._iter_entries()))
760
        finally:
761
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
762
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
763
    def test_add_tree_reference(self):
764
        # make a dirstate and add a tree reference
765
        state = dirstate.DirState.initialize('dirstate')
766
        expected_entry = (
767
            ('', 'subdir', 'subdir-id'),
768
            [('t', 'subtree-123123', 0, False,
769
              'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')],
770
            )
771
        try:
772
            state.add('subdir', 'subdir-id', 'tree-reference', None, 'subtree-123123')
773
            entry = state._get_entry(0, 'subdir-id', 'subdir')
774
            self.assertEqual(entry, expected_entry)
775
            state._validate()
776
            state.save()
777
        finally:
778
            state.unlock()
779
        # now check we can read it back
780
        state.lock_read()
781
        state._validate()
782
        try:
783
            entry2 = state._get_entry(0, 'subdir-id', 'subdir')
784
            self.assertEqual(entry, entry2)
785
            self.assertEqual(entry, expected_entry)
786
            # and lookup by id should work too
787
            entry2 = state._get_entry(0, fileid_utf8='subdir-id')
788
            self.assertEqual(entry, expected_entry)
789
        finally:
790
            state.unlock()
791
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
792
793
class TestGetLines(TestCaseWithDirState):
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
794
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.
795
    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.
796
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
797
        try:
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
798
            self.assertEqual(['#bazaar dirstate flat format 3\n',
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
799
                'adler32: -1327947603\n',
800
                'num_entries: 2\n',
801
                '0\x00\n\x00'
802
                '0\x00\n\x00'
803
                '\x00\x00a-root-value\x00'
804
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
805
                '\x00subdir\x00subdir-id\x00'
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
806
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00\n\x00'
807
                ], state.get_lines())
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
808
        finally:
809
            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.
810
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
811
    def test_entry_to_line(self):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
812
        state = self.create_dirstate_with_root()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
813
        try:
814
            self.assertEqual(
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
815
                '\x00\x00a-root-value\x00d\x00\x000\x00n'
816
                '\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk',
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
817
                state._entry_to_line(state._dirblocks[0][1][0]))
818
        finally:
819
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
820
821
    def test_entry_to_line_with_parent(self):
822
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
823
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
824
            ('d', '', 0, False, packed_stat), # current tree details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
825
             # first: a pointer to the current location
826
            ('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.
827
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
828
        state = dirstate.DirState.initialize('dirstate')
829
        try:
830
            self.assertEqual(
831
                '\x00\x00a-root-value\x00'
832
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
833
                'a\x00dirname/basename\x000\x00n\x00',
834
                state._entry_to_line(root_entry))
835
        finally:
836
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
837
838
    def test_entry_to_line_with_two_parents_at_different_paths(self):
839
        # / in the tree, at / in one parent and /dirname/basename in the other.
840
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
841
        root_entry = ('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
842
            ('d', '', 0, False, packed_stat), # current tree details
843
            ('d', '', 0, False, 'rev_id'), # first parent details
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
844
             # second: a pointer to the current location
845
            ('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.
846
            ]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
847
        state = dirstate.DirState.initialize('dirstate')
848
        try:
849
            self.assertEqual(
850
                '\x00\x00a-root-value\x00'
851
                'd\x00\x000\x00n\x00AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk\x00'
852
                'd\x00\x000\x00n\x00rev_id\x00'
853
                'a\x00dirname/basename\x000\x00n\x00',
854
                state._entry_to_line(root_entry))
855
        finally:
856
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
857
858
    def test_iter_entries(self):
859
        # 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.
860
        # this is for get_lines to be easy to read.
861
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
862
        dirblocks = []
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
863
        root_entries = [(('', '', 'a-root-value'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
864
            ('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.
865
            ])]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
866
        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.
867
        # 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.
868
        subdir_entry = ('', 'subdir', 'subdir-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
869
            ('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.
870
            ]
871
        afile_entry = ('', 'afile', 'afile-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
872
            ('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.
873
            ]
874
        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.
875
        # 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.
876
        file_entry2 = ('subdir', '2file', '2file-id'), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
877
            ('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.
878
            ]
879
        dirblocks.append(('subdir', [file_entry2]))
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
880
        state = dirstate.DirState.initialize('dirstate')
881
        try:
882
            state._set_data([], dirblocks)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
883
            expected_entries = [root_entries[0], subdir_entry, afile_entry,
884
                                file_entry2]
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
885
            self.assertEqual(expected_entries, list(state._iter_entries()))
886
        finally:
887
            state.unlock()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
888
889
890
class TestGetBlockRowIndex(TestCaseWithDirState):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
891
892
    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.
893
        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.
894
        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.
895
            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.
896
        if dir_present:
897
            block = state._dirblocks[block_index]
898
            self.assertEqual(dirname, block[0])
899
        if dir_present and file_present:
900
            row = state._dirblocks[block_index][1][row_index]
901
            self.assertEqual(dirname, row[0][0])
902
            self.assertEqual(basename, row[0][1])
903
904
    def test_simple_structure(self):
905
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
906
        self.addCleanup(state.unlock)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
907
        self.assertBlockRowIndexEqual(1, 0, True, True, state, '', 'subdir', 0)
908
        self.assertBlockRowIndexEqual(1, 0, True, False, state, '', 'bdir', 0)
909
        self.assertBlockRowIndexEqual(1, 1, True, False, state, '', 'zdir', 0)
910
        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
911
        self.assertBlockRowIndexEqual(2, 0, False, False, state,
912
                                      'subdir', 'foo', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
913
914
    def test_complex_structure_exists(self):
915
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
916
        self.addCleanup(state.unlock)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
917
        # Make sure we can find everything that exists
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
918
        self.assertBlockRowIndexEqual(0, 0, True, True, state, '', '', 0)
919
        self.assertBlockRowIndexEqual(1, 0, True, True, state, '', 'a', 0)
920
        self.assertBlockRowIndexEqual(1, 1, True, True, state, '', 'b', 0)
921
        self.assertBlockRowIndexEqual(1, 2, True, True, state, '', 'c', 0)
922
        self.assertBlockRowIndexEqual(1, 3, True, True, state, '', 'd', 0)
923
        self.assertBlockRowIndexEqual(2, 0, True, True, state, 'a', 'e', 0)
924
        self.assertBlockRowIndexEqual(2, 1, True, True, state, 'a', 'f', 0)
925
        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
926
        self.assertBlockRowIndexEqual(3, 1, True, True, state,
927
                                      'b', 'h\xc3\xa5', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
928
929
    def test_complex_structure_missing(self):
930
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
931
        self.addCleanup(state.unlock)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
932
        # Make sure things would be inserted in the right locations
933
        # '_' comes before 'a'
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
934
        self.assertBlockRowIndexEqual(0, 0, True, True, state, '', '', 0)
935
        self.assertBlockRowIndexEqual(1, 0, True, False, state, '', '_', 0)
936
        self.assertBlockRowIndexEqual(1, 1, True, False, state, '', 'aa', 0)
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
937
        self.assertBlockRowIndexEqual(1, 4, True, False, state,
938
                                      '', 'h\xc3\xa5', 0)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
939
        self.assertBlockRowIndexEqual(2, 0, False, False, state, '_', 'a', 0)
940
        self.assertBlockRowIndexEqual(3, 0, False, False, state, 'aa', 'a', 0)
941
        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.
942
        # This would be inserted between a/ and b/
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
943
        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.
944
        # Put at the end
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
945
        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.
946
947
948
class TestGetEntry(TestCaseWithDirState):
949
950
    def assertEntryEqual(self, dirname, basename, file_id, state, path, index):
951
        """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.
952
        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.
953
        if file_id is None:
954
            self.assertEqual((None, None), entry)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
955
        else:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
956
            cur = entry[0]
957
            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.
958
959
    def test_simple_structure(self):
960
        state = self.create_dirstate_with_root_and_subdir()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
961
        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.
962
        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
963
        self.assertEntryEqual('', 'subdir', 'subdir-id', state, 'subdir', 0)
964
        self.assertEntryEqual(None, None, None, state, 'missing', 0)
965
        self.assertEntryEqual(None, None, None, state, 'missing/foo', 0)
966
        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.
967
968
    def test_complex_structure_exists(self):
969
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
970
        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.
971
        self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
972
        self.assertEntryEqual('', 'a', 'a-dir', state, 'a', 0)
973
        self.assertEntryEqual('', 'b', 'b-dir', state, 'b', 0)
974
        self.assertEntryEqual('', 'c', 'c-file', state, 'c', 0)
975
        self.assertEntryEqual('', 'd', 'd-file', state, 'd', 0)
976
        self.assertEntryEqual('a', 'e', 'e-dir', state, 'a/e', 0)
977
        self.assertEntryEqual('a', 'f', 'f-file', state, 'a/f', 0)
978
        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
979
        self.assertEntryEqual('b', 'h\xc3\xa5', 'h-\xc3\xa5-file', state,
980
                              'b/h\xc3\xa5', 0)
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
981
982
    def test_complex_structure_missing(self):
983
        state = self.create_complex_dirstate()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
984
        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.
985
        self.assertEntryEqual(None, None, None, state, '_', 0)
986
        self.assertEntryEqual(None, None, None, state, '_\xc3\xa5', 0)
987
        self.assertEntryEqual(None, None, None, state, 'a/b', 0)
988
        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.
989
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
990
    def test_get_entry_uninitialized(self):
991
        """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.
992
        state = self.create_dirstate_with_root()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
993
        try:
994
            state.save()
995
        finally:
996
            state.unlock()
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
997
        del state
998
        state = dirstate.DirState.on_file('dirstate')
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
999
        state.lock_read()
1000
        try:
2255.2.123 by John Arbash Meinel
Simple line wrapping cleanup in test_dirstate.py
1001
            self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
1002
                             state._header_state)
1003
            self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
1004
                             state._dirblock_state)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1005
            self.assertEntryEqual('', '', 'a-root-value', state, '', 0)
1006
        finally:
1007
            state.unlock()
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1008
1009
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1010
class TestDirstateSortOrder(TestCaseWithTransport):
1011
    """Test that DirState adds entries in the right order."""
1012
1013
    def test_add_sorting(self):
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1014
        """Add entries in lexicographical order, we get path sorted order.
1015
1016
        This tests it to a depth of 4, to make sure we don't just get it right
1017
        at a single depth. 'a/a' should come before 'a-a', even though it
1018
        doesn't lexicographically.
1019
        """
1020
        dirs = ['a', 'a/a', 'a/a/a', 'a/a/a/a',
1021
                '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.
1022
               ]
1023
        null_sha = ''
1024
        state = dirstate.DirState.initialize('dirstate')
1025
        self.addCleanup(state.unlock)
1026
1027
        fake_stat = os.stat('dirstate')
1028
        for d in dirs:
1029
            d_id = d.replace('/', '_')+'-id'
1030
            file_path = d + '/f'
1031
            file_id = file_path.replace('/', '_')+'-id'
1032
            state.add(d, d_id, 'directory', fake_stat, null_sha)
1033
            state.add(file_path, file_id, 'file', fake_stat, null_sha)
1034
1035
        expected = ['', '', 'a',
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1036
                'a/a', 'a/a/a', 'a/a/a/a',
1037
                '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.
1038
               ]
2255.7.21 by John Arbash Meinel
Get iter_changes working again, by fixing set_parent_trees to
1039
        split = lambda p:p.split('/')
1040
        self.assertEqual(sorted(expected, key=split), expected)
1041
        dirblock_names = [d[0] for d in state._dirblocks]
1042
        self.assertEqual(expected, dirblock_names)
1043
1044
    def test_set_parent_trees_correct_order(self):
1045
        """After calling set_parent_trees() we should maintain the order."""
1046
        dirs = ['a', 'a-a', 'a/a']
1047
        null_sha = ''
1048
        state = dirstate.DirState.initialize('dirstate')
1049
        self.addCleanup(state.unlock)
1050
1051
        fake_stat = os.stat('dirstate')
1052
        for d in dirs:
1053
            d_id = d.replace('/', '_')+'-id'
1054
            file_path = d + '/f'
1055
            file_id = file_path.replace('/', '_')+'-id'
1056
            state.add(d, d_id, 'directory', fake_stat, null_sha)
1057
            state.add(file_path, file_id, 'file', fake_stat, null_sha)
1058
1059
        expected = ['', '', 'a', 'a/a', 'a-a']
1060
        dirblock_names = [d[0] for d in state._dirblocks]
1061
        self.assertEqual(expected, dirblock_names)
1062
1063
        # *really* cheesy way to just get an empty tree
1064
        repo = self.make_repository('repo')
1065
        empty_tree = repo.revision_tree(None)
1066
        state.set_parent_trees([('null:', empty_tree)], [])
1067
2255.8.5 by John Arbash Meinel
Add a test that dirstate adds records in the right order.
1068
        dirblock_names = [d[0] for d in state._dirblocks]
1069
        self.assertEqual(expected, dirblock_names)
1070
1071
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1072
class InstrumentedDirState(dirstate.DirState):
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1073
    """An DirState with instrumented sha1 functionality."""
1074
1075
    def __init__(self, path):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1076
        super(InstrumentedDirState, self).__init__(path)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1077
        self._time_offset = 0
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1078
        self._log = []
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1079
1080
    def _sha_cutoff_time(self):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1081
        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.
1082
        self._cutoff_time = timestamp + self._time_offset
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1083
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1084
    def _sha1_file(self, abspath, entry):
1085
        self._log.append(('sha1', abspath))
1086
        return super(InstrumentedDirState, self)._sha1_file(abspath, entry)
1087
1088
    def _read_link(self, abspath, old_link):
1089
        self._log.append(('read_link', abspath, old_link))
1090
        return super(InstrumentedDirState, self)._read_link(abspath, old_link)
1091
1092
    def _lstat(self, abspath, entry):
1093
        self._log.append(('lstat', abspath))
1094
        return super(InstrumentedDirState, self)._lstat(abspath, entry)
1095
1096
    def _is_executable(self, mode, old_executable):
1097
        self._log.append(('is_exec', mode, old_executable))
1098
        return super(InstrumentedDirState, self)._is_executable(mode,
1099
                                                                old_executable)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1100
1101
    def adjust_time(self, secs):
1102
        """Move the clock forward or back.
1103
1104
        :param secs: The amount to adjust the clock by. Positive values make it
1105
        seem as if we are in the future, negative values make it seem like we
1106
        are in the past.
1107
        """
1108
        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.
1109
        self._cutoff_time = None
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1110
1111
1112
class _FakeStat(object):
1113
    """A class with the same attributes as a real stat result."""
1114
1115
    def __init__(self, size, mtime, ctime, dev, ino, mode):
1116
        self.st_size = size
1117
        self.st_mtime = mtime
1118
        self.st_ctime = ctime
1119
        self.st_dev = dev
1120
        self.st_ino = ino
1121
        self.st_mode = mode
1122
1123
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1124
class TestUpdateEntry(TestCaseWithDirState):
1125
    """Test the DirState.update_entry functions"""
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1126
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1127
    def get_state_with_a(self):
1128
        """Create a DirState tracking a single object named 'a'"""
1129
        state = InstrumentedDirState.initialize('dirstate')
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1130
        self.addCleanup(state.unlock)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1131
        state.add('a', 'a-id', 'file', None, '')
1132
        entry = state._get_entry(0, path_utf8='a')
1133
        return state, entry
1134
1135
    def test_update_entry(self):
1136
        state, entry = self.get_state_with_a()
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1137
        self.build_tree(['a'])
1138
        # Add one where we don't provide the stat or sha already
1139
        self.assertEqual(('', 'a', 'a-id'), entry[0])
1140
        self.assertEqual([('f', '', 0, False, dirstate.DirState.NULLSTAT)],
1141
                         entry[1])
1142
        # Flush the buffers to disk
1143
        state.save()
1144
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1145
                         state._dirblock_state)
1146
1147
        stat_value = os.lstat('a')
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1148
        packed_stat = dirstate.pack_stat(stat_value)
1149
        link_or_sha1 = state.update_entry(entry, abspath='a',
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1150
                                          stat_value=stat_value)
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1151
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1152
                         link_or_sha1)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1153
1154
        # The dirblock entry should be updated with the new info
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1155
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
1156
                         entry[1])
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1157
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1158
                         state._dirblock_state)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1159
        mode = stat_value.st_mode
1160
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False)], state._log)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1161
1162
        state.save()
1163
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1164
                         state._dirblock_state)
1165
1166
        # If we do it again right away, we don't know if the file has changed
1167
        # so we will re-read the file. Roll the clock back so the file is
1168
        # guaranteed to look too new.
1169
        state.adjust_time(-10)
1170
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1171
        link_or_sha1 = state.update_entry(entry, abspath='a',
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1172
                                          stat_value=stat_value)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1173
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
1174
                          ('sha1', 'a'), ('is_exec', mode, False),
1175
                         ], state._log)
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1176
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1177
                         link_or_sha1)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1178
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1179
                         state._dirblock_state)
1180
        state.save()
1181
1182
        # However, if we move the clock forward so the file is considered
1183
        # "stable", it should just returned the cached value.
1184
        state.adjust_time(20)
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1185
        link_or_sha1 = state.update_entry(entry, abspath='a',
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1186
                                          stat_value=stat_value)
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1187
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1188
                         link_or_sha1)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1189
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
1190
                          ('sha1', 'a'), ('is_exec', mode, False),
1191
                         ], state._log)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1192
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1193
    def test_update_entry_no_stat_value(self):
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1194
        """Passing the stat_value is optional."""
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1195
        state, entry = self.get_state_with_a()
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1196
        state.adjust_time(-10) # Make sure the file looks new
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1197
        self.build_tree(['a'])
1198
        # Add one where we don't provide the stat or sha already
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1199
        link_or_sha1 = state.update_entry(entry, abspath='a')
1200
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1201
                         link_or_sha1)
1202
        stat_value = os.lstat('a')
1203
        self.assertEqual([('lstat', 'a'), ('sha1', 'a'),
1204
                          ('is_exec', stat_value.st_mode, False),
1205
                         ], state._log)
1206
1207
    def test_update_entry_symlink(self):
1208
        """Update entry should read symlinks."""
1209
        if not osutils.has_symlinks():
1210
            return # PlatformDeficiency / TestSkipped
1211
        state, entry = self.get_state_with_a()
1212
        state.save()
1213
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1214
                         state._dirblock_state)
1215
        os.symlink('target', 'a')
1216
1217
        state.adjust_time(-10) # Make the symlink look new
1218
        stat_value = os.lstat('a')
1219
        packed_stat = dirstate.pack_stat(stat_value)
1220
        link_or_sha1 = state.update_entry(entry, abspath='a',
1221
                                          stat_value=stat_value)
1222
        self.assertEqual('target', link_or_sha1)
1223
        self.assertEqual([('read_link', 'a', '')], state._log)
1224
        # Dirblock is updated
1225
        self.assertEqual([('l', link_or_sha1, 6, False, packed_stat)],
1226
                         entry[1])
1227
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1228
                         state._dirblock_state)
1229
1230
        # Because the stat_value looks new, we should re-read the target
1231
        link_or_sha1 = state.update_entry(entry, abspath='a',
1232
                                          stat_value=stat_value)
1233
        self.assertEqual('target', link_or_sha1)
1234
        self.assertEqual([('read_link', 'a', ''),
1235
                          ('read_link', 'a', 'target'),
1236
                         ], state._log)
1237
        state.adjust_time(+20) # Skip into the future, all files look old
1238
        link_or_sha1 = state.update_entry(entry, abspath='a',
1239
                                          stat_value=stat_value)
1240
        self.assertEqual('target', link_or_sha1)
1241
        # There should not be a new read_link call.
1242
        # (this is a weak assertion, because read_link is fairly inexpensive,
1243
        # versus the number of symlinks that we would have)
1244
        self.assertEqual([('read_link', 'a', ''),
1245
                          ('read_link', 'a', 'target'),
1246
                         ], state._log)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1247
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1248
    def test_update_entry_dir(self):
1249
        state, entry = self.get_state_with_a()
1250
        self.build_tree(['a/'])
1251
        self.assertIs(None, state.update_entry(entry, 'a'))
1252
1253
    def create_and_test_file(self, state, entry):
1254
        """Create a file at 'a' and verify the state finds it.
1255
1256
        The state should already be versioning *something* at 'a'. This makes
1257
        sure that state.update_entry recognizes it as a file.
1258
        """
1259
        self.build_tree(['a'])
1260
        stat_value = os.lstat('a')
1261
        packed_stat = dirstate.pack_stat(stat_value)
1262
1263
        link_or_sha1 = state.update_entry(entry, abspath='a')
1264
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1265
                         link_or_sha1)
1266
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
1267
                         entry[1])
1268
        return packed_stat
1269
1270
    def create_and_test_dir(self, state, entry):
1271
        """Create a directory at 'a' and verify the state finds it.
1272
1273
        The state should already be versioning *something* at 'a'. This makes
1274
        sure that state.update_entry recognizes it as a directory.
1275
        """
1276
        self.build_tree(['a/'])
1277
        stat_value = os.lstat('a')
1278
        packed_stat = dirstate.pack_stat(stat_value)
1279
1280
        link_or_sha1 = state.update_entry(entry, abspath='a')
1281
        self.assertIs(None, link_or_sha1)
1282
        self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
1283
1284
        return packed_stat
1285
1286
    def create_and_test_symlink(self, state, entry):
1287
        """Create a symlink at 'a' and verify the state finds it.
1288
1289
        The state should already be versioning *something* at 'a'. This makes
1290
        sure that state.update_entry recognizes it as a symlink.
1291
1292
        This should not be called if this platform does not have symlink
1293
        support.
1294
        """
1295
        os.symlink('path/to/foo', 'a')
1296
1297
        stat_value = os.lstat('a')
1298
        packed_stat = dirstate.pack_stat(stat_value)
1299
1300
        link_or_sha1 = state.update_entry(entry, abspath='a')
1301
        self.assertEqual('path/to/foo', link_or_sha1)
1302
        self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
1303
                         entry[1])
1304
        return packed_stat
1305
1306
    def test_update_missing_file(self):
1307
        state, entry = self.get_state_with_a()
1308
        packed_stat = self.create_and_test_file(state, entry)
1309
        # Now if we delete the file, update_entry should recover and
1310
        # return None.
1311
        os.remove('a')
1312
        self.assertIs(None, state.update_entry(entry, abspath='a'))
1313
        # And the record shouldn't be changed.
1314
        digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1315
        self.assertEqual([('f', digest, 14, False, packed_stat)],
1316
                         entry[1])
1317
1318
    def test_update_missing_dir(self):
1319
        state, entry = self.get_state_with_a()
1320
        packed_stat = self.create_and_test_dir(state, entry)
1321
        # Now if we delete the directory, update_entry should recover and
1322
        # return None.
1323
        os.rmdir('a')
1324
        self.assertIs(None, state.update_entry(entry, abspath='a'))
1325
        self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
1326
1327
    def test_update_missing_symlink(self):
1328
        if not osutils.has_symlinks():
1329
            return # PlatformDeficiency / TestSkipped
1330
        state, entry = self.get_state_with_a()
1331
        packed_stat = self.create_and_test_symlink(state, entry)
1332
        os.remove('a')
1333
        self.assertIs(None, state.update_entry(entry, abspath='a'))
1334
        # And the record shouldn't be changed.
1335
        self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
1336
                         entry[1])
1337
1338
    def test_update_file_to_dir(self):
1339
        """If a file changes to a directory we return None for the sha.
1340
        We also update the inventory record.
1341
        """
1342
        state, entry = self.get_state_with_a()
1343
        self.create_and_test_file(state, entry)
1344
        os.remove('a')
1345
        self.create_and_test_dir(state, entry)
1346
1347
    def test_update_file_to_symlink(self):
1348
        """File becomes a symlink"""
1349
        if not osutils.has_symlinks():
1350
            return # PlatformDeficiency / TestSkipped
1351
        state, entry = self.get_state_with_a()
1352
        self.create_and_test_file(state, entry)
1353
        os.remove('a')
1354
        self.create_and_test_symlink(state, entry)
1355
1356
    def test_update_dir_to_file(self):
1357
        """Directory becoming a file updates the entry."""
1358
        state, entry = self.get_state_with_a()
1359
        self.create_and_test_dir(state, entry)
1360
        os.rmdir('a')
1361
        self.create_and_test_file(state, entry)
1362
1363
    def test_update_dir_to_symlink(self):
1364
        """Directory becomes a symlink"""
1365
        if not osutils.has_symlinks():
1366
            return # PlatformDeficiency / TestSkipped
1367
        state, entry = self.get_state_with_a()
1368
        self.create_and_test_dir(state, entry)
1369
        os.rmdir('a')
1370
        self.create_and_test_symlink(state, entry)
1371
1372
    def test_update_symlink_to_file(self):
1373
        """Symlink becomes a file"""
1374
        state, entry = self.get_state_with_a()
1375
        self.create_and_test_symlink(state, entry)
1376
        os.remove('a')
1377
        self.create_and_test_file(state, entry)
1378
1379
    def test_update_symlink_to_dir(self):
1380
        """Symlink becomes a directory"""
1381
        state, entry = self.get_state_with_a()
1382
        self.create_and_test_symlink(state, entry)
1383
        os.remove('a')
1384
        self.create_and_test_dir(state, entry)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
1385
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1386
    def test__is_executable_win32(self):
1387
        state, entry = self.get_state_with_a()
1388
        self.build_tree(['a'])
1389
1390
        # Make sure we are using the win32 implementation of _is_executable
1391
        state._is_executable = state._is_executable_win32
1392
1393
        # The file on disk is not executable, but we are marking it as though
1394
        # it is. With _is_executable_win32 we ignore what is on disk.
1395
        entry[1][0] = ('f', '', 0, True, dirstate.DirState.NULLSTAT)
1396
1397
        stat_value = os.lstat('a')
1398
        packed_stat = dirstate.pack_stat(stat_value)
1399
1400
        state.adjust_time(-10) # Make sure everything is new
1401
        # Make sure it wants to kkkkkkkk
1402
        state.update_entry(entry, abspath='a', stat_value=stat_value)
1403
1404
        # The row is updated, but the executable bit stays set.
1405
        digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1406
        self.assertEqual([('f', digest, 14, True, packed_stat)], entry[1])
1407
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1408
1409
class TestPackStat(TestCaseWithTransport):
1410
1411
    def assertPackStat(self, expected, stat_value):
1412
        """Check the packed and serialized form of a stat value."""
1413
        self.assertEqual(expected, dirstate.pack_stat(stat_value))
1414
1415
    def test_pack_stat_int(self):
1416
        st = _FakeStat(6859L, 1172758614, 1172758617, 777L, 6499538L, 0100644)
1417
        # Make sure that all parameters have an impact on the packed stat.
1418
        self.assertPackStat('AAAay0Xm4FZF5uBZAAADCQBjLNIAAIGk', st)
1419
        st.st_size = 7000L
1420
        #                ay0 => bWE
1421
        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
1422
        st.st_mtime = 1172758620
1423
        #                     4FZ => 4Fx
1424
        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
1425
        st.st_ctime = 1172758630
1426
        #                          uBZ => uBm
1427
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1428
        st.st_dev = 888L
1429
        #                                DCQ => DeA
1430
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNIAAIGk', st)
1431
        st.st_ino = 6499540L
1432
        #                                     LNI => LNQ
1433
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIGk', st)
1434
        st.st_mode = 0100744
1435
        #                                          IGk => IHk
1436
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADeABjLNQAAIHk', st)
1437
1438
    def test_pack_stat_float(self):
1439
        """On some platforms mtime and ctime are floats.
1440
1441
        Make sure we don't get warnings or errors, and that we ignore changes <
1442
        1s
1443
        """
1444
        st = _FakeStat(7000L, 1172758614.0, 1172758617.0,
1445
                       777L, 6499538L, 0100644)
1446
        # These should all be the same as the integer counterparts
1447
        self.assertPackStat('AAAbWEXm4FZF5uBZAAADCQBjLNIAAIGk', st)
1448
        st.st_mtime = 1172758620.0
1449
        #                     FZF5 => FxF5
1450
        self.assertPackStat('AAAbWEXm4FxF5uBZAAADCQBjLNIAAIGk', st)
1451
        st.st_ctime = 1172758630.0
1452
        #                          uBZ => uBm
1453
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1454
        # fractional seconds are discarded, so no change from above
1455
        st.st_mtime = 1172758620.453
1456
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1457
        st.st_ctime = 1172758630.228
1458
        self.assertPackStat('AAAbWEXm4FxF5uBmAAADCQBjLNIAAIGk', st)
1459
1460
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1461
class TestBisect(TestCaseWithTransport):
1462
    """Test the ability to bisect into the disk format."""
1463
1464
    def create_basic_dirstate(self):
1465
        """Create a dirstate with a few files and directories.
1466
1467
            a
1468
            b/
1469
              c
1470
              d/
1471
                e
1472
            f
1473
        """
1474
        tree = self.make_branch_and_tree('tree')
1475
        paths = ['a', 'b/', 'b/c', 'b/d/', 'b/d/e', 'f']
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1476
        file_ids = ['a-id', 'b-id', 'c-id', 'd-id', 'e-id', 'f-id']
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1477
        self.build_tree(['tree/' + p for p in paths])
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1478
        tree.set_root_id('TREE_ROOT')
1479
        tree.add([p.rstrip('/') for p in paths], file_ids)
1480
        tree.commit('initial', rev_id='rev-1')
1481
        revision_id = 'rev-1'
1482
        # a_packed_stat = dirstate.pack_stat(os.stat('tree/a'))
1483
        t = self.get_transport().clone('tree')
1484
        a_text = t.get_bytes('a')
1485
        a_sha = osutils.sha_string(a_text)
1486
        a_len = len(a_text)
1487
        # b_packed_stat = dirstate.pack_stat(os.stat('tree/b'))
1488
        # c_packed_stat = dirstate.pack_stat(os.stat('tree/b/c'))
1489
        c_text = t.get_bytes('b/c')
1490
        c_sha = osutils.sha_string(c_text)
1491
        c_len = len(c_text)
1492
        # d_packed_stat = dirstate.pack_stat(os.stat('tree/b/d'))
1493
        # e_packed_stat = dirstate.pack_stat(os.stat('tree/b/d/e'))
1494
        e_text = t.get_bytes('b/d/e')
1495
        e_sha = osutils.sha_string(e_text)
1496
        e_len = len(e_text)
1497
        # f_packed_stat = dirstate.pack_stat(os.stat('tree/f'))
1498
        f_text = t.get_bytes('f')
1499
        f_sha = osutils.sha_string(f_text)
1500
        f_len = len(f_text)
1501
        null_stat = dirstate.DirState.NULLSTAT
1502
        expected = {
1503
            '':(('', '', 'TREE_ROOT'), [
1504
                  ('d', '', 0, False, null_stat),
1505
                  ('d', '', 0, False, revision_id),
1506
                ]),
1507
            'a':(('', 'a', 'a-id'), [
1508
                   ('f', '', 0, False, null_stat),
1509
                   ('f', a_sha, a_len, False, revision_id),
1510
                 ]),
1511
            'b':(('', 'b', 'b-id'), [
1512
                  ('d', '', 0, False, null_stat),
1513
                  ('d', '', 0, False, revision_id),
1514
                 ]),
1515
            'b/c':(('b', 'c', 'c-id'), [
1516
                    ('f', '', 0, False, null_stat),
1517
                    ('f', c_sha, c_len, False, revision_id),
1518
                   ]),
1519
            'b/d':(('b', 'd', 'd-id'), [
1520
                    ('d', '', 0, False, null_stat),
1521
                    ('d', '', 0, False, revision_id),
1522
                   ]),
1523
            'b/d/e':(('b/d', 'e', 'e-id'), [
1524
                      ('f', '', 0, False, null_stat),
1525
                      ('f', e_sha, e_len, False, revision_id),
1526
                     ]),
1527
            'f':(('', 'f', 'f-id'), [
1528
                  ('f', '', 0, False, null_stat),
1529
                  ('f', f_sha, f_len, False, revision_id),
1530
                 ]),
1531
        }
1532
        state = dirstate.DirState.from_tree(tree, 'dirstate')
1533
        try:
1534
            state.save()
1535
        finally:
1536
            state.unlock()
1537
        # Use a different object, to make sure nothing is pre-cached in memory.
1538
        state = dirstate.DirState.on_file('dirstate')
1539
        state.lock_read()
1540
        self.addCleanup(state.unlock)
1541
        self.assertEqual(dirstate.DirState.NOT_IN_MEMORY,
1542
                         state._dirblock_state)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1543
        # This is code is only really tested if we actually have to make more
1544
        # than one read, so set the page size to something smaller.
1545
        # We want it to contain about 2.2 records, so that we have a couple
1546
        # records that we can read per attempt
1547
        state._bisect_page_size = 200
1548
        return tree, state, expected
1549
1550
    def create_duplicated_dirstate(self):
1551
        """Create a dirstate with a deleted and added entries.
1552
1553
        This grabs a basic_dirstate, and then removes and re adds every entry
1554
        with a new file id.
1555
        """
1556
        tree, state, expected = self.create_basic_dirstate()
1557
        # Now we will just remove and add every file so we get an extra entry
1558
        # per entry. Unversion in reverse order so we handle subdirs
1559
        tree.unversion(['f-id', 'e-id', 'd-id', 'c-id', 'b-id', 'a-id'])
1560
        tree.add(['a', 'b', 'b/c', 'b/d', 'b/d/e', 'f'],
1561
                 ['a-id2', 'b-id2', 'c-id2', 'd-id2', 'e-id2', 'f-id2'])
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1562
1563
        # Update the expected dictionary.
1564
        for path in ['a', 'b', 'b/c', 'b/d', 'b/d/e', 'f']:
1565
            orig = expected[path]
1566
            path2 = path + '2'
1567
            # This record was deleted in the current tree
1568
            expected[path] = (orig[0], [dirstate.DirState.NULL_PARENT_DETAILS,
1569
                                        orig[1][1]])
1570
            new_key = (orig[0][0], orig[0][1], orig[0][2]+'2')
1571
            # And didn't exist in the basis tree
1572
            expected[path2] = (new_key, [orig[1][0],
1573
                                         dirstate.DirState.NULL_PARENT_DETAILS])
1574
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1575
        # We will replace the 'dirstate' file underneath 'state', but that is
1576
        # okay as lock as we unlock 'state' first.
1577
        state.unlock()
1578
        try:
1579
            new_state = dirstate.DirState.from_tree(tree, 'dirstate')
1580
            try:
1581
                new_state.save()
1582
            finally:
1583
                new_state.unlock()
1584
        finally:
1585
            # But we need to leave state in a read-lock because we already have
1586
            # a cleanup scheduled
1587
            state.lock_read()
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1588
        return tree, state, expected
1589
1590
    def create_renamed_dirstate(self):
1591
        """Create a dirstate with a few internal renames.
1592
1593
        This takes the basic dirstate, and moves the paths around.
1594
        """
1595
        tree, state, expected = self.create_basic_dirstate()
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1596
        # Rename a file
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1597
        tree.rename_one('a', 'b/g')
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1598
        # And a directory
1599
        tree.rename_one('b/d', 'h')
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1600
1601
        old_a = expected['a']
1602
        expected['a'] = (old_a[0], [('r', 'b/g', 0, False, ''), old_a[1][1]])
1603
        expected['b/g'] = (('b', 'g', 'a-id'), [old_a[1][0],
1604
                                                ('r', 'a', 0, False, '')])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1605
        old_d = expected['b/d']
1606
        expected['b/d'] = (old_d[0], [('r', 'h', 0, False, ''), old_d[1][1]])
1607
        expected['h'] = (('', 'h', 'd-id'), [old_d[1][0],
1608
                                             ('r', 'b/d', 0, False, '')])
1609
1610
        old_e = expected['b/d/e']
1611
        expected['b/d/e'] = (old_e[0], [('r', 'h/e', 0, False, ''),
1612
                             old_e[1][1]])
1613
        expected['h/e'] = (('h', 'e', 'e-id'), [old_e[1][0],
1614
                                                ('r', 'b/d/e', 0, False, '')])
1615
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1616
        state.unlock()
1617
        try:
1618
            new_state = dirstate.DirState.from_tree(tree, 'dirstate')
1619
            try:
1620
                new_state.save()
1621
            finally:
1622
                new_state.unlock()
1623
        finally:
1624
            state.lock_read()
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1625
        return tree, state, expected
1626
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1627
    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.
1628
        """Assert that bisecting for paths returns the right result.
1629
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1630
        :param expected_map: A map from key => entry value
1631
        :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.
1632
        :param state: The DirState object.
1633
        :param paths: A list of paths, these will automatically be split into
1634
                      (dir, name) tuples, and sorted according to how _bisect
1635
                      requires.
1636
        """
1637
        dir_names = sorted(osutils.split(p) for p in paths)
1638
        result = state._bisect(dir_names)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1639
        # For now, results are just returned in whatever order we read them.
1640
        # We could sort by (dir, name, file_id) or something like that, but in
1641
        # 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
1642
        # extra overhead if we can avoid it. So sort everything to make sure
1643
        # equality is true
1644
        assert len(map_keys) == len(dir_names)
1645
        expected = {}
1646
        for dir_name, keys in zip(dir_names, map_keys):
1647
            if keys is None:
1648
                # This should not be present in the output
1649
                continue
1650
            expected[dir_name] = sorted(expected_map[k] for k in keys)
1651
1652
        for dir_name in result:
1653
            result[dir_name].sort()
1654
1655
        self.assertEqual(expected, result)
1656
1657
    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.
1658
        """Assert that bisecting for dirbblocks returns the right result.
1659
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1660
        :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
1661
        :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.
1662
            Something like [['a', 'b', 'f'], ['b/c', 'b/d']]
1663
        :param state: The DirState object.
1664
        :param paths: A list of directories
1665
        """
1666
        result = state._bisect_dirblocks(paths)
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1667
        assert len(map_keys) == len(paths)
1668
1669
        expected = {}
1670
        for path, keys in zip(paths, map_keys):
1671
            if keys is None:
1672
                # This should not be present in the output
1673
                continue
1674
            expected[path] = sorted(expected_map[k] for k in keys)
1675
        for path in result:
1676
            result[path].sort()
1677
1678
        self.assertEqual(expected, result)
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
1679
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1680
    def assertBisectRecursive(self, expected_map, map_keys, state, paths):
1681
        """Assert the return value of a recursive bisection.
1682
1683
        :param expected_map: A map from key => entry value
1684
        :param map_keys: A list of paths we expect to be returned.
1685
            Something like ['a', 'b', 'f', 'b/d', 'b/d2']
1686
        :param state: The DirState object.
1687
        :param paths: A list of files and directories. It will be broken up
1688
            into (dir, name) pairs and sorted before calling _bisect_recursive.
1689
        """
1690
        expected = {}
1691
        for key in map_keys:
1692
            entry = expected_map[key]
1693
            dir_name_id, trees_info = entry
1694
            expected[dir_name_id] = trees_info
1695
1696
        dir_names = sorted(osutils.split(p) for p in paths)
1697
        result = state._bisect_recursive(dir_names)
1698
1699
        self.assertEqual(expected, result)
1700
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1701
    def test_bisect_each(self):
1702
        """Find a single record using bisect."""
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1703
        tree, state, expected = self.create_basic_dirstate()
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1704
1705
        # 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
1706
        self.assertBisect(expected, [['']], state, [''])
1707
        self.assertBisect(expected, [['a']], state, ['a'])
1708
        self.assertBisect(expected, [['b']], state, ['b'])
1709
        self.assertBisect(expected, [['b/c']], state, ['b/c'])
1710
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
1711
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
1712
        self.assertBisect(expected, [['f']], state, ['f'])
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
1713
1714
    def test_bisect_multi(self):
1715
        """Bisect can be used to find multiple records at the same time."""
1716
        tree, state, expected = self.create_basic_dirstate()
1717
        # 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
1718
        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
1719
                          state, ['a', 'b', 'f'])
1720
        # ('', 'f') sorts before the others
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1721
        self.assertBisect(expected, [['f'], ['b/d'], ['b/d/e']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1722
                          state, ['b/d', 'b/d/e', 'f'])
1723
1724
    def test_bisect_one_page(self):
1725
        """Test bisect when there is only 1 page to read"""
1726
        tree, state, expected = self.create_basic_dirstate()
1727
        state._bisect_page_size = 5000
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1728
        self.assertBisect(expected,[['']], state, [''])
1729
        self.assertBisect(expected,[['a']], state, ['a'])
1730
        self.assertBisect(expected,[['b']], state, ['b'])
1731
        self.assertBisect(expected,[['b/c']], state, ['b/c'])
1732
        self.assertBisect(expected,[['b/d']], state, ['b/d'])
1733
        self.assertBisect(expected,[['b/d/e']], state, ['b/d/e'])
1734
        self.assertBisect(expected,[['f']], state, ['f'])
1735
        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
1736
                          state, ['a', 'b', 'f'])
1737
        # ('', 'f') sorts before the others
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1738
        self.assertBisect(expected, [['f'], ['b/d'], ['b/d/e']],
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1739
                          state, ['b/d', 'b/d/e', 'f'])
1740
1741
    def test_bisect_duplicate_paths(self):
1742
        """When bisecting for a path, handle multiple entries."""
1743
        tree, state, expected = self.create_duplicated_dirstate()
1744
1745
        # 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
1746
        self.assertBisect(expected, [['']], state, [''])
1747
        self.assertBisect(expected, [['a', 'a2']], state, ['a'])
1748
        self.assertBisect(expected, [['b', 'b2']], state, ['b'])
1749
        self.assertBisect(expected, [['b/c', 'b/c2']], state, ['b/c'])
1750
        self.assertBisect(expected, [['b/d', 'b/d2']], state, ['b/d'])
1751
        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
1752
                          state, ['b/d/e'])
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1753
        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
1754
1755
    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.
1756
        """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
1757
        tree, state, expected = self.create_basic_dirstate()
1758
        state._bisect_page_size = 50
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1759
        self.assertBisect(expected, [None], state, ['b/e'])
1760
        self.assertBisect(expected, [['a']], state, ['a'])
1761
        self.assertBisect(expected, [['b']], state, ['b'])
1762
        self.assertBisect(expected, [['b/c']], state, ['b/c'])
1763
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
1764
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
1765
        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
1766
1767
    def test_bisect_missing(self):
1768
        """Test that bisect return None if it cannot find a path."""
1769
        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
1770
        self.assertBisect(expected, [None], state, ['foo'])
1771
        self.assertBisect(expected, [None], state, ['b/foo'])
1772
        self.assertBisect(expected, [None], state, ['bar/foo'])
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1773
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
1774
        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
1775
                          state, ['a', 'foo', 'b/d'])
2255.2.127 by John Arbash Meinel
Expand the test suite to cover more cases.
1776
1777
    def test_bisect_rename(self):
1778
        """Check that we find a renamed row."""
1779
        tree, state, expected = self.create_renamed_dirstate()
1780
1781
        # 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
1782
        self.assertBisect(expected, [['a']], state, ['a'])
1783
        self.assertBisect(expected, [['b/g']], state, ['b/g'])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1784
        self.assertBisect(expected, [['b/d']], state, ['b/d'])
1785
        self.assertBisect(expected, [['h']], state, ['h'])
1786
1787
        # What about b/d/e? shouldn't that also get 2 directory entries?
1788
        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
1789
        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.
1790
1791
    def test_bisect_dirblocks(self):
1792
        tree, state, expected = self.create_duplicated_dirstate()
1793
        self.assertBisectDirBlocks(expected,
1794
            [['', 'a', 'a2', 'b', 'b2', 'f', 'f2']], state, [''])
1795
        self.assertBisectDirBlocks(expected,
1796
            [['b/c', 'b/c2', 'b/d', 'b/d2']], state, ['b'])
1797
        self.assertBisectDirBlocks(expected,
1798
            [['b/d/e', 'b/d/e2']], state, ['b/d'])
1799
        self.assertBisectDirBlocks(expected,
1800
            [['', 'a', 'a2', 'b', 'b2', 'f', 'f2'],
1801
             ['b/c', 'b/c2', 'b/d', 'b/d2'],
1802
             ['b/d/e', 'b/d/e2'],
1803
            ], state, ['', 'b', 'b/d'])
1804
1805
    def test_bisect_dirblocks_missing(self):
1806
        tree, state, expected = self.create_basic_dirstate()
1807
        self.assertBisectDirBlocks(expected, [['b/d/e'], None],
1808
            state, ['b/d', 'b/e'])
1809
        # Files don't show up in this search
1810
        self.assertBisectDirBlocks(expected, [None], state, ['a'])
1811
        self.assertBisectDirBlocks(expected, [None], state, ['b/c'])
1812
        self.assertBisectDirBlocks(expected, [None], state, ['c'])
1813
        self.assertBisectDirBlocks(expected, [None], state, ['b/d/e'])
1814
        self.assertBisectDirBlocks(expected, [None], state, ['f'])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1815
1816
    def test_bisect_recursive_each(self):
1817
        tree, state, expected = self.create_basic_dirstate()
1818
        self.assertBisectRecursive(expected, ['a'], state, ['a'])
1819
        self.assertBisectRecursive(expected, ['b/c'], state, ['b/c'])
1820
        self.assertBisectRecursive(expected, ['b/d/e'], state, ['b/d/e'])
1821
        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
1822
                                   state, ['b/d'])
1823
        self.assertBisectRecursive(expected, ['b', 'b/c', 'b/d', 'b/d/e'],
1824
                                   state, ['b'])
1825
        self.assertBisectRecursive(expected, ['', 'a', 'b', 'f', 'b/c',
1826
                                              'b/d', 'b/d/e'],
1827
                                   state, [''])
1828
1829
    def test_bisect_recursive_multiple(self):
1830
        tree, state, expected = self.create_basic_dirstate()
1831
        self.assertBisectRecursive(expected, ['a', 'b/c'], state, ['a', 'b/c'])
1832
        self.assertBisectRecursive(expected, ['b/d', 'b/d/e'],
1833
                                   state, ['b/d', 'b/d/e'])
1834
1835
    def test_bisect_recursive_missing(self):
1836
        tree, state, expected = self.create_basic_dirstate()
1837
        self.assertBisectRecursive(expected, [], state, ['d'])
1838
        self.assertBisectRecursive(expected, [], state, ['b/e'])
1839
        self.assertBisectRecursive(expected, [], state, ['g'])
1840
        self.assertBisectRecursive(expected, ['a'], state, ['a', 'g'])
1841
1842
    def test_bisect_recursive_renamed(self):
1843
        tree, state, expected = self.create_renamed_dirstate()
1844
1845
        # Looking for either renamed item should find the other
1846
        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['a'])
1847
        self.assertBisectRecursive(expected, ['a', 'b/g'], state, ['b/g'])
1848
        # Looking in the containing directory should find the rename target,
1849
        # and anything in a subdir of the renamed target.
1850
        self.assertBisectRecursive(expected, ['a', 'b', 'b/c', 'b/d',
1851
                                              'b/d/e', 'b/g', 'h', 'h/e'],
1852
                                   state, ['b'])
1853
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1854
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1855
class TestBisectDirblock(TestCase):
1856
    """Test that bisect_dirblock() returns the expected values.
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1857
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1858
    bisect_dirblock is intended to work like bisect.bisect_left() except it
1859
    knows it is working on dirblocks and that dirblocks are sorted by ('path',
1860
    'to', 'foo') chunks rather than by raw 'path/to/foo'.
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1861
    """
1862
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1863
    def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1864
        """Assert that bisect_split works like bisect_left on the split paths.
1865
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1866
        :param dirblocks: A list of (path, [info]) pairs.
1867
        :param split_dirblocks: A list of ((split, path), [info]) pairs.
1868
        :param path: The path we are indexing.
1869
1870
        All other arguments will be passed along.
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1871
        """
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1872
        bisect_split_idx = dirstate.bisect_dirblock(dirblocks, path,
1873
                                                 *args, **kwargs)
1874
        split_dirblock = (path.split('/'), [])
1875
        bisect_left_idx = bisect.bisect_left(split_dirblocks, split_dirblock,
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1876
                                             *args)
1877
        self.assertEqual(bisect_left_idx, bisect_split_idx,
1878
                         'bisect_split disagreed. %s != %s'
1879
                         ' for key %s'
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1880
                         % (bisect_left_idx, bisect_split_idx, path)
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1881
                         )
1882
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1883
    def paths_to_dirblocks(self, paths):
1884
        """Convert a list of paths into dirblock form.
1885
1886
        Also, ensure that the paths are in proper sorted order.
1887
        """
1888
        dirblocks = [(path, []) for path in paths]
1889
        split_dirblocks = [(path.split('/'), []) for path in paths]
1890
        self.assertEqual(sorted(split_dirblocks), split_dirblocks)
1891
        return dirblocks, split_dirblocks
1892
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1893
    def test_simple(self):
1894
        """In the simple case it works just like bisect_left"""
1895
        paths = ['', 'a', 'b', 'c', 'd']
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1896
        dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1897
        for path in paths:
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1898
            self.assertBisect(dirblocks, split_dirblocks, path)
1899
        self.assertBisect(dirblocks, split_dirblocks, '_')
1900
        self.assertBisect(dirblocks, split_dirblocks, 'aa')
1901
        self.assertBisect(dirblocks, split_dirblocks, 'bb')
1902
        self.assertBisect(dirblocks, split_dirblocks, 'cc')
1903
        self.assertBisect(dirblocks, split_dirblocks, 'dd')
1904
        self.assertBisect(dirblocks, split_dirblocks, 'a/a')
1905
        self.assertBisect(dirblocks, split_dirblocks, 'b/b')
1906
        self.assertBisect(dirblocks, split_dirblocks, 'c/c')
1907
        self.assertBisect(dirblocks, split_dirblocks, 'd/d')
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1908
1909
    def test_involved(self):
1910
        """This is where bisect_left diverges slightly."""
1911
        paths = ['', 'a',
1912
                 'a/a', 'a/a/a', 'a/a/z', 'a/a-a', 'a/a-z',
1913
                 'a/z', 'a/z/a', 'a/z/z', 'a/z-a', 'a/z-z',
1914
                 'a-a', 'a-z',
1915
                 'z', 'z/a/a', 'z/a/z', 'z/a-a', 'z/a-z',
1916
                 'z/z', 'z/z/a', 'z/z/z', 'z/z-a', 'z/z-z',
1917
                 'z-a', 'z-z',
1918
                ]
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1919
        dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
1920
        for path in paths:
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1921
            self.assertBisect(dirblocks, split_dirblocks, path)
2255.8.3 by John Arbash Meinel
Add the ability to cache the split output
1922
1923
    def test_involved_cached(self):
1924
        """This is where bisect_left diverges slightly."""
1925
        paths = ['', 'a',
1926
                 'a/a', 'a/a/a', 'a/a/z', 'a/a-a', 'a/a-z',
1927
                 'a/z', 'a/z/a', 'a/z/z', 'a/z-a', 'a/z-z',
1928
                 'a-a', 'a-z',
1929
                 'z', 'z/a/a', 'z/a/z', 'z/a-a', 'z/a-z',
1930
                 'z/z', 'z/z/a', 'z/z/z', 'z/z-a', 'z/z-z',
1931
                 'z-a', 'z-z',
1932
                ]
1933
        cache = {}
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1934
        dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2255.8.3 by John Arbash Meinel
Add the ability to cache the split output
1935
        for path in paths:
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1936
            self.assertBisect(dirblocks, split_dirblocks, path, cache=cache)
1937