← 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

- constraints on revprops
- tests for this

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