← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_smart_add.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_smart_add.py
1
1
import os
2
2
import unittest
3
3
 
4
 
from bzrlib.add import smart_add, smart_add_tree
5
 
from bzrlib.tests import TestCaseWithTransport, TestCase
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
6
5
from bzrlib.branch import Branch
7
 
from bzrlib.errors import NotBranchError, NoSuchFile
8
 
from bzrlib.inventory import InventoryFile, Inventory
9
 
from bzrlib.workingtree import WorkingTree
 
6
from bzrlib.errors import NotBranchError, NotVersionedError
10
7
 
11
 
class TestSmartAdd(TestCaseWithTransport):
 
8
class TestSmartAdd(TestCaseInTempDir):
12
9
 
13
10
    def test_add_dot_from_root(self):
14
11
        """Test adding . from the root of the tree.""" 
15
12
        from bzrlib.add import smart_add
16
13
        paths = ("original/", "original/file1", "original/file2")
17
14
        self.build_tree(paths)
18
 
        wt = self.make_branch_and_tree('.')
19
 
        branch = wt.branch
20
 
        smart_add_tree(wt, (u".",))
 
15
        branch = Branch.initialize(".")
 
16
        smart_add((".",), recurse=True)
21
17
        for path in paths:
22
 
            self.assertNotEqual(wt.path2id(path), None)
 
18
            self.assertNotEqual(branch.inventory.path2id(path), None)
23
19
 
24
20
    def test_add_dot_from_subdir(self):
25
21
        """Test adding . from a subdir of the tree.""" 
26
22
        from bzrlib.add import smart_add
27
23
        paths = ("original/", "original/file1", "original/file2")
28
24
        self.build_tree(paths)
29
 
        wt = self.make_branch_and_tree('.')
30
 
        branch = wt.branch
 
25
        branch = Branch.initialize(".")
31
26
        os.chdir("original")
32
 
        smart_add_tree(wt, (u".",))
 
27
        smart_add((".",), recurse=True)
33
28
        for path in paths:
34
 
            self.assertNotEqual(wt.path2id(path), None)
 
29
            self.assertNotEqual(branch.inventory.path2id(path), None)
35
30
 
36
31
    def test_add_tree_from_above_tree(self):
37
32
        """Test adding a tree from above the tree.""" 
40
35
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
41
36
                        "branch/original/file2")
42
37
        self.build_tree(branch_paths)
43
 
        wt = self.make_branch_and_tree('branch')
44
 
        branch = wt.branch
45
 
        smart_add_tree(wt, ("branch",))
 
38
        branch = Branch.initialize("branch")
 
39
        smart_add(("branch",))
46
40
        for path in paths:
47
 
            self.assertNotEqual(wt.path2id(path), None)
 
41
            self.assertNotEqual(branch.inventory.path2id(path), None)
48
42
 
49
43
    def test_add_above_tree_preserves_tree(self):
50
44
        """Test nested trees are not affect by an add above them."""
51
 
        from bzrlib.add import smart_add
 
45
        from bzrlib.add import smart_add, add_reporter_null
 
46
        
52
47
        paths = ("original/", "original/file1", "original/file2")
53
48
        child_paths = ("path",)
54
49
        full_child_paths = ("original/child", "original/child/path")
56
51
                       "original/child/", "original/child/path")
57
52
        
58
53
        self.build_tree(build_paths)
59
 
        wt = self.make_branch_and_tree('.')
60
 
        branch = wt.branch
61
 
        child_tree = self.make_branch_and_tree('original/child')
62
 
        smart_add_tree(wt, (".",))
 
54
        branch = Branch.initialize(".")
 
55
        child_branch = Branch.initialize("original/child")
 
56
        smart_add((".",), True, add_reporter_null)
63
57
        for path in paths:
64
 
            self.assertNotEqual((path, wt.path2id(path)),
 
58
            self.assertNotEqual((path, branch.inventory.path2id(path)),
65
59
                                (path, None))
66
60
        for path in full_child_paths:
67
 
            self.assertEqual((path, wt.path2id(path)),
 
61
            self.assertEqual((path, branch.inventory.path2id(path)),
68
62
                             (path, None))
69
63
        for path in child_paths:
70
 
            self.assertEqual(child_tree.path2id(path), None)
 
64
            self.assertEqual(child_branch.inventory.path2id(path), None)
71
65
 
72
66
    def test_add_paths(self):
73
67
        """Test smart-adding a list of paths."""
74
68
        from bzrlib.add import smart_add
75
69
        paths = ("file1", "file2")
76
70
        self.build_tree(paths)
77
 
        wt = self.make_branch_and_tree('.')
78
 
        smart_add_tree(wt, paths)
 
71
        branch = Branch.initialize(".")
 
72
        smart_add(paths)
79
73
        for path in paths:
80
 
            self.assertNotEqual(wt.path2id(path), None)
81
 
    
82
 
    def test_add_ignored_nested_paths(self):
83
 
        """Test smart-adding a list of paths which includes ignored ones."""
84
 
        wt = self.make_branch_and_tree('.')
85
 
        tree_shape = ("adir/", "adir/CVS/", "adir/CVS/afile", "adir/CVS/afile2")
86
 
        add_paths = ("adir/CVS", "adir/CVS/afile", "adir")
87
 
        expected_paths = ("adir", "adir/CVS", "adir/CVS/afile", "adir/CVS/afile2")
88
 
        self.build_tree(tree_shape)
89
 
        smart_add_tree(wt, add_paths)
90
 
        for path in expected_paths:
91
 
            self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
92
 
 
93
 
    def test_save_false(self):
94
 
        """Test smart-adding a path with save set to false."""
95
 
        wt = self.make_branch_and_tree('.')
96
 
        self.build_tree(['file'])
97
 
        smart_add_tree(wt, ['file'], save=False)
98
 
        self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
99
 
        wt.read_working_inventory()
100
 
        self.assertEqual(wt.path2id('file'), None)
101
 
 
102
 
    def test_add_dry_run(self):
103
 
        """Test a dry run add, make sure nothing is added."""
104
 
        from bzrlib.commands import run_bzr
105
 
        eq = self.assertEqual
106
 
        wt = self.make_branch_and_tree('.')
107
 
        branch = wt.branch
108
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
109
 
        eq(list(wt.unknowns()), ['inertiatic'])
110
 
        self.capture('add --dry-run .')
111
 
        eq(list(wt.unknowns()), ['inertiatic'])
112
 
 
113
 
    def test_add_non_existant(self):
114
 
        """Test smart-adding a file that does not exist."""
115
 
        from bzrlib.add import smart_add
116
 
        wt = self.make_branch_and_tree('.')
117
 
        branch = wt.branch
118
 
        self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
119
 
 
120
 
    def test_returns(self):
121
 
        """Correctly returns added/ignored files"""
122
 
        from bzrlib.commands import run_bzr
123
 
        wt = self.make_branch_and_tree('.')
124
 
        branch = wt.branch
125
 
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS', 
126
 
                        'inertiatic/foo.pyc'])
127
 
        added, ignored = smart_add_tree(wt, u'.')
128
 
        self.assertSubset(('inertiatic', 'inertiatic/esp'), added)
129
 
        self.assertSubset(('CVS', '*.py[oc]'), ignored)
130
 
        self.assertSubset(('inertiatic/CVS',), ignored['CVS'])
131
 
        self.assertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
132
 
 
133
 
 
134
 
class TestSmartAddBranch(TestCaseWithTransport):
 
74
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
75
            
 
76
class TestSmartAddBranch(TestCaseInTempDir):
135
77
    """Test smart adds with a specified branch."""
136
78
 
137
79
    def test_add_dot_from_root(self):
138
80
        """Test adding . from the root of the tree.""" 
 
81
        from bzrlib.add import smart_add_branch
139
82
        paths = ("original/", "original/file1", "original/file2")
140
83
        self.build_tree(paths)
141
 
        wt = self.make_branch_and_tree('.')
142
 
        branch = wt.branch
143
 
        smart_add_tree(wt, (u".",))
 
84
        branch = Branch.initialize(".")
 
85
        smart_add_branch(branch, (".",))
144
86
        for path in paths:
145
 
            self.assertNotEqual(wt.path2id(path), None)
 
87
            self.assertNotEqual(branch.inventory.path2id(path), None)
146
88
 
147
89
    def test_add_dot_from_subdir(self):
148
90
        """Test adding . from a subdir of the tree.""" 
149
 
        from bzrlib.add import smart_add_tree
 
91
        from bzrlib.add import smart_add_branch
150
92
        paths = ("original/", "original/file1", "original/file2")
151
93
        self.build_tree(paths)
152
 
        wt = self.make_branch_and_tree('.')
153
 
        branch = wt.branch
 
94
        branch = Branch.initialize(".")
154
95
        os.chdir("original")
155
 
        smart_add_tree(wt, (u".",))
 
96
        smart_add_branch(branch, (".",))
156
97
        for path in paths:
157
 
            self.assertNotEqual(wt.path2id(path), None)
 
98
            self.assertNotEqual(branch.inventory.path2id(path), None)
158
99
 
159
100
    def test_add_tree_from_above_tree(self):
160
101
        """Test adding a tree from above the tree.""" 
161
 
        from bzrlib.add import smart_add_tree
 
102
        from bzrlib.add import smart_add_branch
162
103
        paths = ("original/", "original/file1", "original/file2")
163
104
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
164
105
                        "branch/original/file2")
165
106
        self.build_tree(branch_paths)
166
 
        tree = self.make_branch_and_tree('branch')
167
 
        branch = tree.branch
168
 
        smart_add_tree(tree, ("branch",))
 
107
        branch = Branch.initialize("branch")
 
108
        smart_add_branch(branch, ("branch",))
169
109
        for path in paths:
170
 
            self.assertNotEqual(tree.path2id(path), None)
 
110
            self.assertNotEqual(branch.inventory.path2id(path), None)
171
111
 
172
112
    def test_add_above_tree_preserves_tree(self):
173
113
        """Test nested trees are not affect by an add above them."""
174
 
        from bzrlib.add import smart_add_tree
 
114
        from bzrlib.add import smart_add_branch
175
115
        paths = ("original/", "original/file1", "original/file2")
176
116
        child_paths = ("path")
177
117
        full_child_paths = ("original/child", "original/child/path")
178
118
        build_paths = ("original/", "original/file1", "original/file2", 
179
119
                       "original/child/", "original/child/path")
180
120
        self.build_tree(build_paths)
181
 
        tree = self.make_branch_and_tree('.')
182
 
        branch = tree.branch
183
 
        child_tree = self.make_branch_and_tree("original/child")
184
 
        smart_add_tree(tree, (u".",))
 
121
        branch = Branch.initialize(".")
 
122
        child_branch = Branch.initialize("original/child")
 
123
        smart_add_branch(branch, (".",))
185
124
        for path in paths:
186
 
            self.assertNotEqual((path, tree.path2id(path)),
 
125
            self.assertNotEqual((path, branch.inventory.path2id(path)),
187
126
                                (path, None))
188
127
        for path in full_child_paths:
189
 
            self.assertEqual((path, tree.path2id(path)),
 
128
            self.assertEqual((path, branch.inventory.path2id(path)),
190
129
                             (path, None))
191
130
        for path in child_paths:
192
 
            self.assertEqual(child_tree.path2id(path), None)
 
131
            self.assertEqual(child_branch.inventory.path2id(path), None)
193
132
 
194
133
    def test_add_paths(self):
195
134
        """Test smart-adding a list of paths."""
196
 
        from bzrlib.add import smart_add_tree
 
135
        from bzrlib.add import smart_add_branch
197
136
        paths = ("file1", "file2")
198
137
        self.build_tree(paths)
199
 
        wt = self.make_branch_and_tree('.')
200
 
        branch = wt.branch
201
 
        smart_add_tree(wt, paths)
 
138
        branch = Branch.initialize(".")
 
139
        smart_add_branch(branch, paths)
202
140
        for path in paths:
203
 
            self.assertNotEqual(wt.path2id(path), None)
204
 
 
205
 
 
206
 
class TestAddActions(TestCase):
207
 
 
208
 
    def test_quiet(self):
209
 
        self.run_action("")
210
 
 
211
 
    def test__print(self):
212
 
        self.run_action("added path\n")
213
 
 
214
 
    def run_action(self, output):
215
 
        from bzrlib.add import AddAction, FastPath
216
 
        from cStringIO import StringIO
217
 
        inv = Inventory()
 
141
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
142
 
 
143
class TestAddCallbacks(TestCaseInTempDir):
 
144
 
 
145
    def setUp(self):
 
146
        from bzrlib.inventory import InventoryEntry
 
147
        super(TestAddCallbacks, self).setUp()
 
148
        self.entry = InventoryEntry("id", "name", "file", None)
 
149
 
 
150
    def test_null_callback(self):
 
151
        from bzrlib.add import add_reporter_null
 
152
        add_reporter_null('path', 'file', self.entry)
 
153
 
 
154
    def test_print_callback(self):
 
155
        from bzrlib.add import add_reporter_print
 
156
        from StringIO import StringIO
218
157
        stdout = StringIO()
219
 
        action = AddAction(to_file=stdout, should_print=bool(output))
220
 
 
221
 
        self.apply_redirected(None, stdout, None, action, inv, None, FastPath('path'), 'file')
222
 
        self.assertEqual(stdout.getvalue(), output)
 
158
        self.apply_redirected(None, stdout, None, add_reporter_print,
 
159
                              'path', 'file', self.entry)
 
160
        self.assertEqual(stdout.getvalue(), "added path\n")