/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
1
# Copyright (C) 2005, 2006 Canonical Ltd
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
from cStringIO import StringIO
1092.1.26 by Robert Collins
start writing star-topology test, realise we need smart-add change
18
import os
19
import unittest
20
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
21
from bzrlib import errors, ignores, osutils
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
22
from bzrlib.add import (
23
    AddAction,
24
    AddFromBaseAction,
25
    smart_add,
26
    smart_add_tree,
27
    )
1830.3.6 by John Arbash Meinel
Test that smart_add_tree does the right thing in the presence of non-normalized filenames
28
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
29
from bzrlib.errors import NoSuchFile
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
30
from bzrlib.inventory import InventoryFile, Inventory
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
31
from bzrlib.workingtree import WorkingTree
1092.1.26 by Robert Collins
start writing star-topology test, realise we need smart-add change
32
1830.3.4 by John Arbash Meinel
A couple no-op cleanups
33
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
34
class TestSmartAdd(TestCaseWithTransport):
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
35
36
    def test_add_dot_from_root(self):
37
        """Test adding . from the root of the tree.""" 
38
        paths = ("original/", "original/file1", "original/file2")
39
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
40
        wt = self.make_branch_and_tree('.')
41
        smart_add_tree(wt, (u".",))
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
42
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
43
            self.assertNotEqual(wt.path2id(path), None)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
44
45
    def test_add_dot_from_subdir(self):
46
        """Test adding . from a subdir of the tree.""" 
47
        from bzrlib.add import smart_add
48
        paths = ("original/", "original/file1", "original/file2")
49
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
50
        wt = self.make_branch_and_tree('.')
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
51
        os.chdir("original")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
52
        smart_add_tree(wt, (u".",))
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
53
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
54
            self.assertNotEqual(wt.path2id(path), None)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
55
56
    def test_add_tree_from_above_tree(self):
57
        """Test adding a tree from above the tree.""" 
58
        from bzrlib.add import smart_add
59
        paths = ("original/", "original/file1", "original/file2")
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
60
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
61
                        "branch/original/file2")
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
62
        self.build_tree(branch_paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
63
        wt = self.make_branch_and_tree('branch')
64
        smart_add_tree(wt, ("branch",))
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
65
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
66
            self.assertNotEqual(wt.path2id(path), None)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
67
68
    def test_add_above_tree_preserves_tree(self):
69
        """Test nested trees are not affect by an add above them."""
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
70
        from bzrlib.add import smart_add
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
71
        paths = ("original/", "original/file1", "original/file2")
1143 by Martin Pool
- remove dead code and remove some small errors (pychecker)
72
        child_paths = ("path",)
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
73
        full_child_paths = ("original/child", "original/child/path")
74
        build_paths = ("original/", "original/file1", "original/file2", 
75
                       "original/child/", "original/child/path")
1143 by Martin Pool
- remove dead code and remove some small errors (pychecker)
76
        
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
77
        self.build_tree(build_paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
78
        wt = self.make_branch_and_tree('.')
79
        child_tree = self.make_branch_and_tree('original/child')
1757.2.9 by Robert Collins
Remove spurious u cast from test_smart_add.py
80
        smart_add_tree(wt, (".",))
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
81
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
82
            self.assertNotEqual((path, wt.path2id(path)),
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
83
                                (path, None))
84
        for path in full_child_paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
85
            self.assertEqual((path, wt.path2id(path)),
1092.1.27 by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list
86
                             (path, None))
87
        for path in child_paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
88
            self.assertEqual(child_tree.path2id(path), None)
1092.1.28 by Robert Collins
test adding lists of paths
89
90
    def test_add_paths(self):
91
        """Test smart-adding a list of paths."""
92
        from bzrlib.add import smart_add
93
        paths = ("file1", "file2")
94
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
95
        wt = self.make_branch_and_tree('.')
96
        smart_add_tree(wt, paths)
1092.1.28 by Robert Collins
test adding lists of paths
97
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
98
            self.assertNotEqual(wt.path2id(path), None)
1757.2.5 by Robert Collins
De-dup the add list so we only walk subtrees once for add.
99
    
100
    def test_add_ignored_nested_paths(self):
101
        """Test smart-adding a list of paths which includes ignored ones."""
102
        wt = self.make_branch_and_tree('.')
103
        tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
104
        add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
105
        expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
106
        self.build_tree(tree_shape)
107
        smart_add_tree(wt, add_paths)
108
        for path in expected_paths:
109
            self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
110
111
    def test_add_dry_run(self):
112
        """Test a dry run add, make sure nothing is added."""
113
        from bzrlib.commands import run_bzr
114
        eq = self.assertEqual
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
115
        wt = self.make_branch_and_tree('.')
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
116
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
117
        eq(list(wt.unknowns()), ['inertiatic'])
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
118
        self.capture('add --dry-run .')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
119
        eq(list(wt.unknowns()), ['inertiatic'])
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
120
1185.56.2 by Michael Ellerman
Raise NoSuchFile when someone tries to add a non-existant file.
121
    def test_add_non_existant(self):
122
        """Test smart-adding a file that does not exist."""
123
        from bzrlib.add import smart_add
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
124
        wt = self.make_branch_and_tree('.')
125
        self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
126
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
127
    def test_returns_and_ignores(self):
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
128
        """Correctly returns added/ignored files"""
129
        from bzrlib.commands import run_bzr
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
130
        wt = self.make_branch_and_tree('.')
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
131
        # The default ignore list includes '*.py[co]', but not CVS
1987.1.2 by John Arbash Meinel
Remove the unneeded _set_user_ignores(['./.bazaar']) now that home has moved
132
        ignores._set_user_ignores(['*.py[co]'])
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
133
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS',
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
134
                        'inertiatic/foo.pyc'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
135
        added, ignored = smart_add_tree(wt, u'.')
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
136
        self.assertSubset(('inertiatic', 'inertiatic/esp', 'inertiatic/CVS'),
137
                          added)
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
138
        self.assertSubset(('*.py[co]',), ignored)
139
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[co]'])
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
140
141
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
142
class AddCustomIDAction(AddAction):
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
143
144
    def __call__(self, inv, parent_ie, path, kind):
145
        # The first part just logs if appropriate
146
        # Now generate a custom id
147
        file_id = kind + '-' + path.raw_path.replace('/', '%')
148
        if self.should_print:
149
            self._to_file.write('added %s with id %s\n' 
150
                                % (path.raw_path, file_id))
151
        return file_id
152
153
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
154
class TestSmartAddTree(TestCaseWithTransport):
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
155
    """Test smart adds with a specified branch."""
156
157
    def test_add_dot_from_root(self):
158
        """Test adding . from the root of the tree.""" 
159
        paths = ("original/", "original/file1", "original/file2")
160
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
161
        wt = self.make_branch_and_tree('.')
162
        smart_add_tree(wt, (u".",))
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
163
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
164
            self.assertNotEqual(wt.path2id(path), None)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
165
166
    def test_add_dot_from_subdir(self):
167
        """Test adding . from a subdir of the tree.""" 
168
        paths = ("original/", "original/file1", "original/file2")
169
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
170
        wt = self.make_branch_and_tree('.')
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
171
        os.chdir("original")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
172
        smart_add_tree(wt, (u".",))
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
173
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
174
            self.assertNotEqual(wt.path2id(path), None)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
175
176
    def test_add_tree_from_above_tree(self):
177
        """Test adding a tree from above the tree.""" 
178
        paths = ("original/", "original/file1", "original/file2")
179
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
180
                        "branch/original/file2")
181
        self.build_tree(branch_paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
182
        tree = self.make_branch_and_tree('branch')
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
183
        smart_add_tree(tree, ("branch",))
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
184
        for path in paths:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
185
            self.assertNotEqual(tree.path2id(path), None)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
186
187
    def test_add_above_tree_preserves_tree(self):
188
        """Test nested trees are not affect by an add above them."""
189
        paths = ("original/", "original/file1", "original/file2")
190
        child_paths = ("path")
191
        full_child_paths = ("original/child", "original/child/path")
192
        build_paths = ("original/", "original/file1", "original/file2", 
193
                       "original/child/", "original/child/path")
194
        self.build_tree(build_paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
195
        tree = self.make_branch_and_tree('.')
196
        child_tree = self.make_branch_and_tree("original/child")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
197
        smart_add_tree(tree, (u".",))
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
198
        for path in paths:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
199
            self.assertNotEqual((path, tree.path2id(path)),
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
200
                                (path, None))
201
        for path in full_child_paths:
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
202
            self.assertEqual((path, tree.path2id(path)),
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
203
                             (path, None))
204
        for path in child_paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
205
            self.assertEqual(child_tree.path2id(path), None)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
206
207
    def test_add_paths(self):
208
        """Test smart-adding a list of paths."""
209
        paths = ("file1", "file2")
210
        self.build_tree(paths)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
211
        wt = self.make_branch_and_tree('.')
212
        smart_add_tree(wt, paths)
1092.1.29 by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter
213
        for path in paths:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
214
            self.assertNotEqual(wt.path2id(path), None)
215
1850.2.1 by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories.
216
    def test_add_multiple_dirs(self):
217
        """Test smart adding multiple directories at once."""
218
        added_paths = ['file1', 'file2',
219
                       'dir1/', 'dir1/file3',
220
                       'dir1/subdir2/', 'dir1/subdir2/file4',
221
                       'dir2/', 'dir2/file5',
222
                      ]
223
        not_added = ['file6', 'dir3/', 'dir3/file7', 'dir3/file8']
224
        self.build_tree(added_paths)
225
        self.build_tree(not_added)
226
227
        wt = self.make_branch_and_tree('.')
228
        smart_add_tree(wt, ['file1', 'file2', 'dir1', 'dir2'])
229
230
        for path in added_paths:
231
            self.assertNotEqual(None, wt.path2id(path.rstrip('/')),
232
                    'Failed to add path: %s' % (path,))
233
        for path in not_added:
234
            self.assertEqual(None, wt.path2id(path.rstrip('/')),
235
                    'Accidentally added path: %s' % (path,))
236
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
237
    def test_custom_ids(self):
238
        sio = StringIO()
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
239
        action = AddCustomIDAction(to_file=sio, should_print=True)
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
240
        self.build_tree(['file1', 'dir1/', 'dir1/file2'])
241
242
        wt = self.make_branch_and_tree('.')
243
        smart_add_tree(wt, ['.'], action=action)
1911.3.5 by John Arbash Meinel
There is no strict ordering file addition, other than directories are added before child files
244
        # The order of adds is not strictly fixed:
245
        sio.seek(0)
246
        lines = sorted(sio.readlines())
247
        self.assertEqualDiff(['added dir1 with id directory-dir1\n',
248
                              'added dir1/file2 with id file-dir1%file2\n',
249
                              'added file1 with id file-file1\n',
250
                             ], lines)
2255.7.57 by Robert Collins
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
251
        wt.lock_read()
252
        self.addCleanup(wt.unlock)
253
        self.assertEqual([('', wt.path2id('')),
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
254
                          ('dir1', 'directory-dir1'),
255
                          ('dir1/file2', 'file-dir1%file2'),
256
                          ('file1', 'file-file1'),
257
                         ], [(path, ie.file_id) for path, ie
258
                                in wt.inventory.iter_entries()])
259
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
260
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
261
class TestAddFrom(TestCaseWithTransport):
262
    """Tests for AddFromBaseAction"""
263
264
    def make_base_tree(self):
265
        self.base_tree = self.make_branch_and_tree('base')
266
        self.build_tree(['base/a', 'base/b',
267
                         'base/dir/', 'base/dir/a',
268
                         'base/dir/subdir/',
269
                         'base/dir/subdir/b',
270
                        ])
271
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
272
                            'dir/subdir', 'dir/subdir/b'])
273
        self.base_tree.commit('creating initial tree.')
274
275
    def add_helper(self, base_tree, base_path, new_tree, file_list,
276
                   should_print=False):
277
        to_file = StringIO()
278
        base_tree.lock_read()
279
        try:
280
            new_tree.lock_write()
281
            try:
282
                action = AddFromBaseAction(base_tree, base_path,
283
                                           to_file=to_file,
284
                                           should_print=should_print)
285
                smart_add_tree(new_tree, file_list, action=action)
286
            finally:
287
                new_tree.unlock()
288
        finally:
289
            base_tree.unlock()
290
        return to_file.getvalue()
291
292
    def test_copy_all(self):
293
        self.make_base_tree()
294
        new_tree = self.make_branch_and_tree('new')
295
        files = ['a', 'b',
296
                 'dir/', 'dir/a',
297
                 'dir/subdir/',
298
                 'dir/subdir/b',
299
                ]
300
        self.build_tree(['new/' + fn for fn in files])
301
        self.add_helper(self.base_tree, '', new_tree, ['new'])
302
303
        for fn in files:
304
            base_file_id = self.base_tree.path2id(fn)
305
            new_file_id = new_tree.path2id(fn)
306
            self.assertEqual(base_file_id, new_file_id)
307
308
    def test_copy_from_dir(self):
309
        self.make_base_tree()
310
        new_tree = self.make_branch_and_tree('new')
311
312
        self.build_tree(['new/a', 'new/b', 'new/c',
313
                         'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
1731.1.46 by Aaron Bentley
merge from bzr.dev
314
        new_tree.set_root_id(self.base_tree.get_root_id())
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
315
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
316
1731.1.46 by Aaron Bentley
merge from bzr.dev
317
        # We know 'a' and 'b' exist in the root, and they are being added
318
        # in a new 'root'. Since ROOT ids have been set as the same, we will
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
319
        # use those ids
320
        self.assertEqual(self.base_tree.path2id('a'),
321
                         new_tree.path2id('a'))
322
        self.assertEqual(self.base_tree.path2id('b'),
323
                         new_tree.path2id('b'))
324
325
        # Because we specified 'dir/' as the base path, and we have
326
        # nothing named 'subdir' in the base tree, we should grab the
327
        # ids from there
328
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
329
                         new_tree.path2id('subdir'))
330
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
331
                         new_tree.path2id('subdir/b'))
332
333
        # These should get newly generated ids
334
        c_id = new_tree.path2id('c')
335
        self.assertNotEqual(None, c_id)
2255.7.57 by Robert Collins
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
336
        self.base_tree.lock_read()
337
        self.addCleanup(self.base_tree.unlock)
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
338
        self.failIf(c_id in self.base_tree)
339
340
        d_id = new_tree.path2id('subdir/d')
341
        self.assertNotEqual(None, d_id)
342
        self.failIf(d_id in self.base_tree)
343
344
    def test_copy_existing_dir(self):
345
        self.make_base_tree()
346
        new_tree = self.make_branch_and_tree('new')
347
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
348
349
        subdir_file_id = self.base_tree.path2id('dir/subdir')
350
        new_tree.add(['subby'], [subdir_file_id])
351
        self.add_helper(self.base_tree, '', new_tree, ['new'])
352
        # Because 'subby' already points to subdir, we should add
353
        # 'b' with the same id
354
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
355
                         new_tree.path2id('subby/b'))
356
357
        # 'subby/a' should be added with a new id because there is no
358
        # matching path or child of 'subby'.
359
        a_id = new_tree.path2id('subby/a')
360
        self.assertNotEqual(None, a_id)
2255.7.57 by Robert Collins
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
361
        self.base_tree.lock_read()
362
        self.addCleanup(self.base_tree.unlock)
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
363
        self.failIf(a_id in self.base_tree)
364
365
1830.3.6 by John Arbash Meinel
Test that smart_add_tree does the right thing in the presence of non-normalized filenames
366
class TestAddNonNormalized(TestCaseWithTransport):
367
368
    def make(self):
369
        try:
370
            self.build_tree([u'a\u030a'])
371
        except UnicodeError:
372
            raise TestSkipped('Filesystem cannot create unicode filenames')
373
374
        self.wt = self.make_branch_and_tree('.')
375
376
    def test_accessible_explicit(self):
377
        self.make()
378
        orig = osutils.normalized_filename
379
        osutils.normalized_filename = osutils._accessible_normalized_filename
380
        try:
381
            smart_add_tree(self.wt, [u'a\u030a'])
2255.7.57 by Robert Collins
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
382
            self.wt.lock_read()
383
            self.addCleanup(self.wt.unlock)
1907.1.3 by Aaron Bentley
Fixed unicode test cases
384
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
1830.3.17 by John Arbash Meinel
list_files() with wrong normalized_filename code raises exceptions. Fix this
385
                    [(path, ie.kind) for path,ie in 
386
                        self.wt.inventory.iter_entries()])
1830.3.6 by John Arbash Meinel
Test that smart_add_tree does the right thing in the presence of non-normalized filenames
387
        finally:
388
            osutils.normalized_filename = orig
389
390
    def test_accessible_implicit(self):
391
        self.make()
392
        orig = osutils.normalized_filename
393
        osutils.normalized_filename = osutils._accessible_normalized_filename
394
        try:
395
            smart_add_tree(self.wt, [])
2255.7.57 by Robert Collins
Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
396
            self.wt.lock_read()
397
            self.addCleanup(self.wt.unlock)
1907.1.3 by Aaron Bentley
Fixed unicode test cases
398
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
1830.3.17 by John Arbash Meinel
list_files() with wrong normalized_filename code raises exceptions. Fix this
399
                    [(path, ie.kind) for path,ie in 
400
                        self.wt.inventory.iter_entries()])
1830.3.6 by John Arbash Meinel
Test that smart_add_tree does the right thing in the presence of non-normalized filenames
401
        finally:
402
            osutils.normalized_filename = orig
403
404
    def test_inaccessible_explicit(self):
405
        self.make()
406
        orig = osutils.normalized_filename
407
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
408
        try:
409
            self.assertRaises(errors.InvalidNormalization,
410
                    smart_add_tree, self.wt, [u'a\u030a'])
411
        finally:
412
            osutils.normalized_filename = orig
413
414
    def test_inaccessible_implicit(self):
415
        self.make()
416
        orig = osutils.normalized_filename
417
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
418
        try:
419
            # TODO: jam 20060701 In the future, this should probably
420
            #       just ignore files that don't fit the normalization
421
            #       rules, rather than exploding
422
            self.assertRaises(errors.InvalidNormalization,
423
                    smart_add_tree, self.wt, [])
424
        finally:
425
            osutils.normalized_filename = orig
426
427
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
428
class TestAddActions(TestCase):
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
429
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
430
    def test_quiet(self):
431
        self.run_action("")
432
433
    def test__print(self):
434
        self.run_action("added path\n")
435
436
    def run_action(self, output):
1757.2.3 by Robert Collins
Get add tests passing.
437
        from bzrlib.add import AddAction, FastPath
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
438
        inv = Inventory()
1092.1.30 by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry
439
        stdout = StringIO()
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
440
        action = AddAction(to_file=stdout, should_print=bool(output))
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
441
1757.2.3 by Robert Collins
Get add tests passing.
442
        self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
1185.53.2 by Michael Ellerman
Add tests for bzr add --dry-run
443
        self.assertEqual(stdout.getvalue(), output)