/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1
# Copyright (C) 2005, 2006 Canonical Ltd
1399.1.12 by Robert Collins
add new test script
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
18
from cStringIO import StringIO
1399.1.12 by Robert Collins
add new test script
19
import os
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
20
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
21
from bzrlib import dirstate, ignores
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
22
import bzrlib
1399.1.12 by Robert Collins
add new test script
23
from bzrlib.branch import Branch
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
24
from bzrlib import bzrdir, conflicts, errors, workingtree
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
25
from bzrlib.bzrdir import BzrDir
1508.1.3 by Robert Collins
Do not consider urls to be relative paths within working trees.
26
from bzrlib.errors import NotBranchError, NotVersionedError
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
27
from bzrlib.lockdir import LockDir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
28
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
29
from bzrlib.tests import TestCaseWithTransport, TestSkipped
1399.1.12 by Robert Collins
add new test script
30
from bzrlib.trace import mutter
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
31
from bzrlib.transport import get_transport
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
32
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
33
                                WorkingTree)
1399.1.12 by Robert Collins
add new test script
34
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
35
class TestTreeDirectory(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
36
37
    def test_kind_character(self):
38
        self.assertEqual(TreeDirectory().kind_character(), '/')
39
40
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
41
class TestTreeEntry(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
42
43
    def test_kind_character(self):
44
        self.assertEqual(TreeEntry().kind_character(), '???')
45
46
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
47
class TestTreeFile(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
48
49
    def test_kind_character(self):
50
        self.assertEqual(TreeFile().kind_character(), '')
51
52
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
53
class TestTreeLink(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
54
55
    def test_kind_character(self):
56
        self.assertEqual(TreeLink().kind_character(), '')
57
58
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
59
class TestDefaultFormat(TestCaseWithTransport):
60
61
    def test_get_set_default_format(self):
62
        old_format = workingtree.WorkingTreeFormat.get_default_format()
63
        # default is 3
64
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
65
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
66
        try:
67
            # the default branch format is used by the meta dir format
68
            # which is not the default bzrdir format at this point
69
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
70
            dir.create_repository()
71
            dir.create_branch()
72
            result = dir.create_workingtree()
73
            self.assertEqual(result, 'A tree')
74
        finally:
75
            workingtree.WorkingTreeFormat.set_default_format(old_format)
76
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
77
78
79
class SampleTreeFormat(workingtree.WorkingTreeFormat):
80
    """A sample format
81
82
    this format is initializable, unsupported to aid in testing the 
83
    open and open_downlevel routines.
84
    """
85
86
    def get_format_string(self):
87
        """See WorkingTreeFormat.get_format_string()."""
88
        return "Sample tree format."
89
1508.1.24 by Robert Collins
Add update command for use with checkouts.
90
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
91
        """Sample branches cannot be created."""
92
        t = a_bzrdir.get_workingtree_transport(self)
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
93
        t.put_bytes('format', self.get_format_string())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
94
        return 'A tree'
95
96
    def is_supported(self):
97
        return False
98
99
    def open(self, transport, _found=False):
100
        return "opened tree."
101
102
103
class TestWorkingTreeFormat(TestCaseWithTransport):
104
    """Tests for the WorkingTreeFormat facility."""
105
106
    def test_find_format(self):
107
        # is the right format object found for a working tree?
108
        # create a branch with a few known format objects.
109
        self.build_tree(["foo/", "bar/"])
110
        def check_format(format, url):
111
            dir = format._matchingbzrdir.initialize(url)
112
            dir.create_repository()
113
            dir.create_branch()
114
            format.initialize(dir)
115
            t = get_transport(url)
116
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
117
            self.failUnless(isinstance(found_format, format.__class__))
118
        check_format(workingtree.WorkingTreeFormat3(), "bar")
119
        
120
    def test_find_format_no_tree(self):
121
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
122
        self.assertRaises(errors.NoWorkingTree,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
123
                          workingtree.WorkingTreeFormat.find_format,
124
                          dir)
125
126
    def test_find_format_unknown_format(self):
127
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
128
        dir.create_repository()
129
        dir.create_branch()
130
        SampleTreeFormat().initialize(dir)
131
        self.assertRaises(errors.UnknownFormatError,
132
                          workingtree.WorkingTreeFormat.find_format,
133
                          dir)
134
135
    def test_register_unregister_format(self):
136
        format = SampleTreeFormat()
137
        # make a control dir
138
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
139
        dir.create_repository()
140
        dir.create_branch()
141
        # make a branch
142
        format.initialize(dir)
143
        # register a format for it.
144
        workingtree.WorkingTreeFormat.register_format(format)
145
        # which branch.Open will refuse (not supported)
146
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
147
        # but open_downlevel will work
148
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
149
        # unregister the format
150
        workingtree.WorkingTreeFormat.unregister_format(format)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
151
152
153
class TestWorkingTreeFormat3(TestCaseWithTransport):
154
    """Tests specific to WorkingTreeFormat3."""
155
156
    def test_disk_layout(self):
157
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
158
        control.create_repository()
159
        control.create_branch()
160
        tree = workingtree.WorkingTreeFormat3().initialize(control)
161
        # we want:
162
        # format 'Bazaar-NG Working Tree format 3'
163
        # inventory = blank inventory
164
        # pending-merges = ''
165
        # stat-cache = ??
166
        # no inventory.basis yet
167
        t = control.get_workingtree_transport(None)
1553.5.81 by Martin Pool
Revert change to WorkingTreeFormat3 format string; too many things want it the old way
168
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
169
                             t.get('format').read())
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
170
        self.assertEqualDiff('<inventory format="5">\n'
171
                             '</inventory>\n',
172
                             t.get('inventory').read())
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
173
        self.assertEqualDiff('### bzr hashcache v5\n',
174
                             t.get('stat-cache').read())
175
        self.assertFalse(t.has('inventory.basis'))
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
176
        # no last-revision file means 'None' or 'NULLREVISION'
177
        self.assertFalse(t.has('last-revision'))
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
178
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
179
        # correctly and last-revision file becomes present.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
180
181
    def test_uses_lockdir(self):
182
        """WorkingTreeFormat3 uses its own LockDir:
183
            
184
            - lock is a directory
185
            - when the WorkingTree is locked, LockDir can see that
186
        """
187
        t = self.get_transport()
188
        url = self.get_url()
189
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
190
        repo = dir.create_repository()
191
        branch = dir.create_branch()
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
192
        try:
193
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
194
        except errors.NotLocalUrl:
195
            raise TestSkipped('Not a local URL')
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
196
        self.assertIsDirectory('.bzr', t)
197
        self.assertIsDirectory('.bzr/checkout', t)
198
        self.assertIsDirectory('.bzr/checkout/lock', t)
199
        our_lock = LockDir(t, '.bzr/checkout/lock')
200
        self.assertEquals(our_lock.peek(), None)
1553.5.75 by Martin Pool
Additional WorkingTree LockDir test
201
        tree.lock_write()
202
        self.assertTrue(our_lock.peek())
203
        tree.unlock()
204
        self.assertEquals(our_lock.peek(), None)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
205
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
206
    def test_missing_pending_merges(self):
207
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
208
        control.create_repository()
209
        control.create_branch()
210
        tree = workingtree.WorkingTreeFormat3().initialize(control)
211
        tree._control_files._transport.delete("pending-merges")
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
212
        self.assertEqual([], tree.get_parent_ids())
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
213
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
214
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
215
class TestWorkingTreeFormat4(TestCaseWithTransport):
216
    """Tests specific to WorkingTreeFormat4."""
217
218
    def test_disk_layout(self):
219
        control = bzrdir.BzrDir.create(self.get_url())
220
        control.create_repository()
221
        control.create_branch()
222
        tree = workingtree.WorkingTreeFormat4().initialize(control)
223
        # we want:
224
        # format 'Bazaar-NG Working Tree format 4'
225
        # inventory = blank inventory
226
        # pending-merges = ''
227
        # stat-cache = ??
228
        # no inventory.basis yet
229
        t = control.get_workingtree_transport(None)
230
        self.assertEqualDiff('Bazaar-NG Working Tree format 4',
231
                             t.get('format').read())
232
        self.assertEqualDiff('<inventory format="5">\n'
233
                             '</inventory>\n',
234
                             t.get('inventory').read())
235
        self.assertEqualDiff('### bzr hashcache v5\n',
236
                             t.get('stat-cache').read())
237
        self.assertFalse(t.has('inventory.basis'))
238
        # no last-revision file means 'None' or 'NULLREVISION'
239
        self.assertFalse(t.has('last-revision'))
240
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
241
        # correctly and last-revision file becomes present.
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
242
        # manually make a dirstate toc check the format is as desired.
243
        state = dirstate.DirState.on_file(t.local_abspath('dirstate'))
244
        self.assertEqual([], state.get_parent_ids())
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
245
246
    def test_uses_lockdir(self):
247
        """WorkingTreeFormat4 uses its own LockDir:
248
            
249
            - lock is a directory
250
            - when the WorkingTree is locked, LockDir can see that
251
        """
252
        # this test could be factored into a subclass of tests common to both
253
        # format 3 and 4, but for now its not much of an issue as there is only one in common.
254
        t = self.get_transport()
1852.13.18 by Robert Collins
Write top level acceptance test for dirstate.
255
        tree = self.make_workingtree()
256
        self.assertIsDirectory('.bzr', t)
257
        self.assertIsDirectory('.bzr/checkout', t)
258
        self.assertIsDirectory('.bzr/checkout/lock', t)
259
        our_lock = LockDir(t, '.bzr/checkout/lock')
260
        self.assertEquals(our_lock.peek(), None)
261
        tree.lock_write()
262
        self.assertTrue(our_lock.peek())
263
        tree.unlock()
264
        self.assertEquals(our_lock.peek(), None)
265
266
    def make_workingtree(self):
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
267
        url = self.get_url()
268
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
269
        repo = dir.create_repository()
270
        branch = dir.create_branch()
271
        try:
1852.13.18 by Robert Collins
Write top level acceptance test for dirstate.
272
            return workingtree.WorkingTreeFormat4().initialize(dir)
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
273
        except errors.NotLocalUrl:
274
            raise TestSkipped('Not a local URL')
1852.13.18 by Robert Collins
Write top level acceptance test for dirstate.
275
276
    # TODO: test that dirstate also stores & retrieves the parent list of 
277
    # workingtree-parent revisions, including when they have multiple parents.
278
    # (in other words, the case when we're constructing a merge of 
279
    # revisions which are themselves merges.)
280
281
    # The simplest case is that the the workingtree's primary 
282
    # parent tree can be retrieved.  This is required for all WorkingTrees, 
283
    # and covered by the generic tests.
284
285
    def test_dirstate_stores_all_parent_inventories(self):
286
        tree = self.make_workingtree()
287
288
        # We're going to build in tree a working tree 
289
        # with three parent trees, with some files in common.  
290
    
291
        # We really don't want to do commit or merge in the new dirstate-based
292
        # tree, because that might not work yet.  So instead we build
293
        # revisions elsewhere and pull them across, doing by hand part of the
294
        # work that merge would do.
295
296
        subtree = self.make_branch_and_tree('subdir')
297
        self.build_tree(['subdir/file-a',])
298
        subtree.add(['file-a'], ['id-a'])
299
        rev1 = subtree.commit('commit in subdir')
300
        rev1_tree = subtree.basis_tree()
301
302
        subtree2 = subtree.bzrdir.sprout('subdir2').open_workingtree()
303
        self.build_tree(['subdir2/file-b'])
304
        subtree2.add(['file-b'], ['id-b'])
305
        rev2 = subtree2.commit('commit in subdir2')
306
        rev2_tree = subtree2.basis_tree()
307
308
        subtree.merge_from_branch(subtree2.branch)
309
        rev3 = subtree.commit('merge from subdir2')
310
        rev3_tree = subtree.basis_tree()
311
312
        repo = tree.branch.repository
313
        repo.fetch(subtree.branch.repository, rev3)
314
        # will also pull the others...
315
316
        # tree doesn't contain a text merge yet but we'll just
317
        # set the parents as if a merge had taken place. 
318
        # this should cause the tree data to be folded into the 
319
        # dirstate.
320
        ## import pdb;pdb.set_trace()
321
        tree.set_parent_trees([
322
            (rev1, rev1_tree),
323
            (rev2, rev2_tree),
324
            (rev3, rev3_tree), ])
325
326
        # now we should be able to get them back out
327
        self.assertTreesEqual(tree.revision_tree(rev1), rev1_tree)
328
        self.assertTreesEqual(tree.revision_tree(rev2), rev2_tree)
329
        self.assertTreesEqual(tree.revision_tree(rev3), rev3_tree)
330
331
    def test_dirstate_doesnt_read_parents_from_repo_when_setting(self):
332
        """Setting parent trees on a dirstate working tree takes
333
        the trees it's given and doesn't need to read them from the 
334
        repository.
335
        """
336
        tree = self.make_workingtree()
337
338
        subtree = self.make_branch_and_tree('subdir')
339
        rev1 = subtree.commit('commit in subdir')
340
        rev1_tree = subtree.basis_tree()
341
342
        tree.branch.pull(subtree.branch)
343
344
        # break the repository's legs to make sure it only uses the trees
345
        # it's given; any calls to forbidden methods will raise an 
346
        # AssertionError
347
        repo = tree.branch.repository
348
        repo.get_revision = self.fail
349
        repo.get_inventory = self.fail
350
        repo.get_inventory_xml = self.fail
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
351
        # try to set the parent trees.
1852.13.18 by Robert Collins
Write top level acceptance test for dirstate.
352
        tree.set_parent_trees([(rev1, rev1_tree)])
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
353
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
354
    def test_dirstate_doesnt_read_from_repo_when_returning_cache_tree(self):
355
        """Getting parent trees from a dirstate tree does not read from the 
356
        repos inventory store. This is an important part of the dirstate
357
        performance optimisation work.
358
        """
359
        tree = self.make_workingtree()
360
361
        subtree = self.make_branch_and_tree('subdir')
362
        rev1 = subtree.commit('commit in subdir')
363
        rev1_tree = subtree.basis_tree()
364
        rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
365
        rev2_tree = subtree.basis_tree()
366
367
        tree.branch.pull(subtree.branch)
368
369
        # break the repository's legs to make sure it only uses the trees
370
        # it's given; any calls to forbidden methods will raise an 
371
        # AssertionError
372
        repo = tree.branch.repository
373
        repo.get_revision = self.fail
374
        repo.get_inventory = self.fail
375
        repo.get_inventory_xml = self.fail
376
        # set the parent trees.
377
        tree.set_parent_trees([(rev1, rev1_tree), (rev2, rev2_tree)])
378
        # read the first tree
379
        result_rev1_tree = tree.revision_tree(rev1)
380
        # read the second
381
        result_rev2_tree = tree.revision_tree(rev2)
382
        # compare - there should be no differences between the handed and 
383
        # returned trees
384
        self.assertTreesEqual(rev1_tree, result_rev1_tree)
385
        self.assertTreesEqual(rev2_tree, result_rev2_tree)
386
387
    def test_dirstate_doesnt_cache_non_parent_trees(self):
388
        """Getting parent trees from a dirstate tree does not read from the 
389
        repos inventory store. This is an important part of the dirstate
390
        performance optimisation work.
391
        """
392
        tree = self.make_workingtree()
393
394
        # make a tree that we can try for, which is able to be returned but
395
        # must not be
396
        subtree = self.make_branch_and_tree('subdir')
397
        rev1 = subtree.commit('commit in subdir')
398
        tree.branch.pull(subtree.branch)
399
        # check it fails
400
        self.assertRaises(errors.NoSuchRevision, tree.revision_tree, rev1)
401
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
402
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
403
class TestFormat2WorkingTree(TestCaseWithTransport):
404
    """Tests that are specific to format 2 trees."""
405
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
406
    def create_format2_tree(self, url):
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
407
        return self.make_branch_and_tree(
408
            url, format=bzrlib.bzrdir.BzrDirFormat6())
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
409
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
410
    def test_conflicts(self):
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
411
        # test backwards compatability
412
        tree = self.create_format2_tree('.')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
413
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
414
                          None)
415
        file('lala.BASE', 'wb').write('labase')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
416
        expected = conflicts.ContentsConflict('lala')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
417
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
418
        file('lala', 'wb').write('la')
419
        tree.add('lala', 'lala-id')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
420
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
421
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
422
        file('lala.THIS', 'wb').write('lathis')
423
        file('lala.OTHER', 'wb').write('laother')
424
        # When "text conflict"s happen, stem, THIS and OTHER are text
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
425
        expected = conflicts.TextConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
426
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
427
        os.unlink('lala.OTHER')
428
        os.mkdir('lala.OTHER')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
429
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
430
        self.assertEqual(list(tree.conflicts()), [expected])
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
431
432
433
class TestNonFormatSpecificCode(TestCaseWithTransport):
434
    """This class contains tests of workingtree that are not format specific."""
435
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
436
    
437
    def test_gen_file_id(self):
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
438
        gen_file_id = bzrlib.workingtree.gen_file_id
439
440
        # We try to use the filename if possible
441
        self.assertStartsWith(gen_file_id('bar'), 'bar-')
442
443
        # but we squash capitalization, and remove non word characters
444
        self.assertStartsWith(gen_file_id('Mwoo oof\t m'), 'mwoooofm-')
445
446
        # We also remove leading '.' characters to prevent hidden file-ids
447
        self.assertStartsWith(gen_file_id('..gam.py'), 'gam.py-')
448
        self.assertStartsWith(gen_file_id('..Mwoo oof\t m'), 'mwoooofm-')
449
450
        # we remove unicode characters, and still don't end up with a 
451
        # hidden file id
452
        self.assertStartsWith(gen_file_id(u'\xe5\xb5.txt'), 'txt-')
453
        
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
454
        # Our current method of generating unique ids adds 33 characters
455
        # plus an serial number (log10(N) characters)
456
        # to the end of the filename. We now restrict the filename portion to
457
        # be <= 20 characters, so the maximum length should now be approx < 60
458
459
        # Test both case squashing and length restriction
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
460
        fid = gen_file_id('A'*50 + '.txt')
461
        self.assertStartsWith(fid, 'a'*20 + '-')
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
462
        self.failUnless(len(fid) < 60)
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
463
464
        # restricting length happens after the other actions, so
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
465
        # we preserve as much as possible
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
466
        fid = gen_file_id('\xe5\xb5..aBcd\tefGhijKLMnop\tqrstuvwxyz')
467
        self.assertStartsWith(fid, 'abcdefghijklmnopqrst-')
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
468
        self.failUnless(len(fid) < 60)
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
469
470
    def test_next_id_suffix(self):
471
        bzrlib.workingtree._gen_id_suffix = None
472
        bzrlib.workingtree._next_id_suffix()
473
        self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
474
        bzrlib.workingtree._gen_id_suffix = "foo-"
475
        bzrlib.workingtree._gen_id_serial = 1
476
        self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
477
        self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
478
        self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
479
        self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
480
        self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
481
        self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
482
        self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
483
        self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
484
        self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())
1714.1.2 by Robert Collins
Combine the ignore rules into a single regex rather than looping over them
485
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
486
    def test__translate_ignore_rule(self):
487
        tree = self.make_branch_and_tree('.')
488
        # translation should return the regex, the number of groups in it,
489
        # and the original rule in a tuple.
490
        # there are three sorts of ignore rules:
491
        # root only - regex is the rule itself without the leading ./
492
        self.assertEqual(
493
            "(rootdirrule$)", 
494
            tree._translate_ignore_rule("./rootdirrule"))
495
        # full path - regex is the rule itself
496
        self.assertEqual(
497
            "(path\\/to\\/file$)",
498
            tree._translate_ignore_rule("path/to/file"))
499
        # basename only rule - regex is a rule that ignores everything up
500
        # to the last / in the filename
501
        self.assertEqual(
502
            "((?:.*/)?(?!.*/)basenamerule$)",
503
            tree._translate_ignore_rule("basenamerule"))
504
505
    def test__combine_ignore_rules(self):
506
        tree = self.make_branch_and_tree('.')
507
        # the combined ignore regexs need the outer group indices
508
        # placed in a dictionary with the rules that were combined.
509
        # an empty set of rules
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
510
        # this is returned as a list of combined regex,rule sets, because
511
        # python has a limit of 100 combined regexes.
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
512
        compiled_rules = tree._combine_ignore_rules([])
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
513
        self.assertEqual([], compiled_rules)
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
514
        # one of each type of rule.
515
        compiled_rules = tree._combine_ignore_rules(
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
516
            ["rule1", "rule/two", "./three"])[0]
517
        # what type *is* the compiled regex to do an isinstance of ?
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
518
        self.assertEqual(3, compiled_rules[0].groups)
519
        self.assertEqual(
520
            {0:"rule1",1:"rule/two",2:"./three"},
521
            compiled_rules[1])
522
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
523
    def test__combine_ignore_rules_grouping(self):
524
        tree = self.make_branch_and_tree('.')
525
        # when there are too many rules, the output is split into groups of 100
526
        rules = []
527
        for index in range(198):
528
            rules.append('foo')
529
        self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
530
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
531
    def test__get_ignore_rules_as_regex(self):
532
        tree = self.make_branch_and_tree('.')
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
533
        # Setup the default ignore list to be empty
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
534
        ignores._set_user_ignores([])
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
535
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
536
        # some plugins (shelf) modifies the DEFAULT_IGNORE list in memory
537
        # which causes this test to fail so force the DEFAULT_IGNORE
538
        # list to be empty
539
        orig_default = bzrlib.DEFAULT_IGNORE
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
540
        # Also make sure the runtime ignore list is empty
541
        orig_runtime = ignores._runtime_ignores
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
542
        try:
543
            bzrlib.DEFAULT_IGNORE = []
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
544
            ignores._runtime_ignores = set()
545
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
546
            self.build_tree_contents([('.bzrignore', 'CVS\n.hg\n')])
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
547
            reference_output = tree._combine_ignore_rules(
548
                                    set(['CVS', '.hg']))[0]
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
549
            regex_rules = tree._get_ignore_rules_as_regex()[0]
550
            self.assertEqual(len(reference_output[1]), regex_rules[0].groups)
551
            self.assertEqual(reference_output[1], regex_rules[1])
552
        finally:
553
            bzrlib.DEFAULT_IGNORE = orig_default
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
554
            ignores._runtime_ignores = orig_runtime