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  | 
|
| 
1836.1.15
by John Arbash Meinel
 Updated WorkingTree to use the new user-level ignores.  | 
21  | 
from bzrlib import 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  | 
|
215  | 
class TestFormat2WorkingTree(TestCaseWithTransport):  | 
|
216  | 
"""Tests that are specific to format 2 trees."""  | 
|
217  | 
||
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
218  | 
def create_format2_tree(self, url):  | 
| 
1666.1.4
by Robert Collins
 * 'Metadir' is now the default disk format. This improves behaviour in  | 
219  | 
return self.make_branch_and_tree(  | 
220  | 
url, format=bzrlib.bzrdir.BzrDirFormat6())  | 
|
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
221  | 
|
| 
1666.1.4
by Robert Collins
 * 'Metadir' is now the default disk format. This improves behaviour in  | 
222  | 
def test_conflicts(self):  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
223  | 
        # test backwards compatability
 | 
224  | 
tree = self.create_format2_tree('.')  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
225  | 
self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
226  | 
None)  | 
227  | 
file('lala.BASE', 'wb').write('labase')  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
228  | 
expected = conflicts.ContentsConflict('lala')  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
229  | 
self.assertEqual(list(tree.conflicts()), [expected])  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
230  | 
file('lala', 'wb').write('la')  | 
231  | 
tree.add('lala', 'lala-id')  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
232  | 
expected = conflicts.ContentsConflict('lala', file_id='lala-id')  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
233  | 
self.assertEqual(list(tree.conflicts()), [expected])  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
234  | 
file('lala.THIS', 'wb').write('lathis')  | 
235  | 
file('lala.OTHER', 'wb').write('laother')  | 
|
236  | 
        # When "text conflict"s happen, stem, THIS and OTHER are text
 | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
237  | 
expected = conflicts.TextConflict('lala', file_id='lala-id')  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
238  | 
self.assertEqual(list(tree.conflicts()), [expected])  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
239  | 
os.unlink('lala.OTHER')  | 
240  | 
os.mkdir('lala.OTHER')  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
241  | 
expected = conflicts.ContentsConflict('lala', file_id='lala-id')  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
242  | 
self.assertEqual(list(tree.conflicts()), [expected])  | 
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
243  | 
|
244  | 
||
245  | 
class TestNonFormatSpecificCode(TestCaseWithTransport):  | 
|
246  | 
"""This class contains tests of workingtree that are not format specific."""  | 
|
247  | 
||
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
248  | 
|
249  | 
def test_gen_file_id(self):  | 
|
| 
1864.4.1
by John Arbash Meinel
 Fix bug #43801 by squashing file ids a little bit more.  | 
250  | 
gen_file_id = bzrlib.workingtree.gen_file_id  | 
251  | 
||
252  | 
        # We try to use the filename if possible
 | 
|
253  | 
self.assertStartsWith(gen_file_id('bar'), 'bar-')  | 
|
254  | 
||
255  | 
        # but we squash capitalization, and remove non word characters
 | 
|
256  | 
self.assertStartsWith(gen_file_id('Mwoo oof\t m'), 'mwoooofm-')  | 
|
257  | 
||
258  | 
        # We also remove leading '.' characters to prevent hidden file-ids
 | 
|
259  | 
self.assertStartsWith(gen_file_id('..gam.py'), 'gam.py-')  | 
|
260  | 
self.assertStartsWith(gen_file_id('..Mwoo oof\t m'), 'mwoooofm-')  | 
|
261  | 
||
262  | 
        # we remove unicode characters, and still don't end up with a 
 | 
|
263  | 
        # hidden file id
 | 
|
264  | 
self.assertStartsWith(gen_file_id(u'\xe5\xb5.txt'), 'txt-')  | 
|
265  | 
||
| 
1864.4.2
by John Arbash Meinel
 Update the tests to verify the length of the file id, as suggested by mbp  | 
266  | 
        # Our current method of generating unique ids adds 33 characters
 | 
267  | 
        # plus an serial number (log10(N) characters)
 | 
|
268  | 
        # to the end of the filename. We now restrict the filename portion to
 | 
|
269  | 
        # be <= 20 characters, so the maximum length should now be approx < 60
 | 
|
270  | 
||
271  | 
        # 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.  | 
272  | 
fid = gen_file_id('A'*50 + '.txt')  | 
273  | 
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  | 
274  | 
self.failUnless(len(fid) < 60)  | 
| 
1864.4.1
by John Arbash Meinel
 Fix bug #43801 by squashing file ids a little bit more.  | 
275  | 
|
276  | 
        # 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  | 
277  | 
        # we preserve as much as possible
 | 
| 
1864.4.1
by John Arbash Meinel
 Fix bug #43801 by squashing file ids a little bit more.  | 
278  | 
fid = gen_file_id('\xe5\xb5..aBcd\tefGhijKLMnop\tqrstuvwxyz')  | 
279  | 
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  | 
280  | 
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'.  | 
281  | 
|
282  | 
def test_next_id_suffix(self):  | 
|
283  | 
bzrlib.workingtree._gen_id_suffix = None  | 
|
284  | 
bzrlib.workingtree._next_id_suffix()  | 
|
285  | 
self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)  | 
|
286  | 
bzrlib.workingtree._gen_id_suffix = "foo-"  | 
|
287  | 
bzrlib.workingtree._gen_id_serial = 1  | 
|
288  | 
self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())  | 
|
289  | 
self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())  | 
|
290  | 
self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())  | 
|
291  | 
self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())  | 
|
292  | 
self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())  | 
|
293  | 
self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())  | 
|
294  | 
self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())  | 
|
295  | 
self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())  | 
|
296  | 
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  | 
297  | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
298  | 
def test__translate_ignore_rule(self):  | 
299  | 
tree = self.make_branch_and_tree('.')  | 
|
300  | 
        # translation should return the regex, the number of groups in it,
 | 
|
301  | 
        # and the original rule in a tuple.
 | 
|
302  | 
        # there are three sorts of ignore rules:
 | 
|
303  | 
        # root only - regex is the rule itself without the leading ./
 | 
|
304  | 
self.assertEqual(  | 
|
305  | 
"(rootdirrule$)",  | 
|
306  | 
tree._translate_ignore_rule("./rootdirrule"))  | 
|
307  | 
        # full path - regex is the rule itself
 | 
|
308  | 
self.assertEqual(  | 
|
309  | 
"(path\\/to\\/file$)",  | 
|
310  | 
tree._translate_ignore_rule("path/to/file"))  | 
|
311  | 
        # basename only rule - regex is a rule that ignores everything up
 | 
|
312  | 
        # to the last / in the filename
 | 
|
313  | 
self.assertEqual(  | 
|
314  | 
"((?:.*/)?(?!.*/)basenamerule$)",  | 
|
315  | 
tree._translate_ignore_rule("basenamerule"))  | 
|
316  | 
||
317  | 
def test__combine_ignore_rules(self):  | 
|
318  | 
tree = self.make_branch_and_tree('.')  | 
|
319  | 
        # the combined ignore regexs need the outer group indices
 | 
|
320  | 
        # placed in a dictionary with the rules that were combined.
 | 
|
321  | 
        # an empty set of rules
 | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
322  | 
        # this is returned as a list of combined regex,rule sets, because
 | 
323  | 
        # 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.  | 
324  | 
compiled_rules = tree._combine_ignore_rules([])  | 
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
325  | 
self.assertEqual([], compiled_rules)  | 
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
326  | 
        # one of each type of rule.
 | 
327  | 
compiled_rules = tree._combine_ignore_rules(  | 
|
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
328  | 
["rule1", "rule/two", "./three"])[0]  | 
329  | 
        # 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.  | 
330  | 
self.assertEqual(3, compiled_rules[0].groups)  | 
331  | 
self.assertEqual(  | 
|
332  | 
{0:"rule1",1:"rule/two",2:"./three"},  | 
|
333  | 
compiled_rules[1])  | 
|
334  | 
||
| 
1713.2.5
by Robert Collins
 Support more than 100 ignore rules.  | 
335  | 
def test__combine_ignore_rules_grouping(self):  | 
336  | 
tree = self.make_branch_and_tree('.')  | 
|
337  | 
        # when there are too many rules, the output is split into groups of 100
 | 
|
338  | 
rules = []  | 
|
339  | 
for index in range(198):  | 
|
340  | 
rules.append('foo')  | 
|
341  | 
self.assertEqual(2, len(tree._combine_ignore_rules(rules)))  | 
|
342  | 
||
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
343  | 
def test__get_ignore_rules_as_regex(self):  | 
344  | 
tree = self.make_branch_and_tree('.')  | 
|
| 
1836.1.15
by John Arbash Meinel
 Updated WorkingTree to use the new user-level ignores.  | 
345  | 
        # 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.  | 
346  | 
ignores._set_user_ignores([])  | 
| 
1836.1.15
by John Arbash Meinel
 Updated WorkingTree to use the new user-level ignores.  | 
347  | 
|
| 
1836.1.23
by John Arbash Meinel
 Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.  | 
348  | 
        # some plugins (shelf) modifies the DEFAULT_IGNORE list in memory
 | 
349  | 
        # which causes this test to fail so force the DEFAULT_IGNORE
 | 
|
350  | 
        # list to be empty
 | 
|
351  | 
orig_default = bzrlib.DEFAULT_IGNORE  | 
|
| 
1836.1.28
by John Arbash Meinel
 Add a function for adding runtime ignores.  | 
352  | 
        # Also make sure the runtime ignore list is empty
 | 
353  | 
orig_runtime = ignores._runtime_ignores  | 
|
| 
1836.1.23
by John Arbash Meinel
 Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.  | 
354  | 
try:  | 
355  | 
bzrlib.DEFAULT_IGNORE = []  | 
|
| 
1836.1.28
by John Arbash Meinel
 Add a function for adding runtime ignores.  | 
356  | 
ignores._runtime_ignores = set()  | 
357  | 
||
| 
1836.1.23
by John Arbash Meinel
 Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.  | 
358  | 
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.  | 
359  | 
reference_output = tree._combine_ignore_rules(  | 
360  | 
set(['CVS', '.hg']))[0]  | 
|
| 
1836.1.23
by John Arbash Meinel
 Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.  | 
361  | 
regex_rules = tree._get_ignore_rules_as_regex()[0]  | 
362  | 
self.assertEqual(len(reference_output[1]), regex_rules[0].groups)  | 
|
363  | 
self.assertEqual(reference_output[1], regex_rules[1])  | 
|
364  | 
finally:  | 
|
365  | 
bzrlib.DEFAULT_IGNORE = orig_default  | 
|
| 
1836.1.28
by John Arbash Meinel
 Add a function for adding runtime ignores.  | 
366  | 
ignores._runtime_ignores = orig_runtime  |