← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

Merge repository so I dont trample on myself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
1
1
import os
2
2
import unittest
3
3
 
4
 
from bzrlib.tests import TestCaseInTempDir, TestCase
 
4
from bzrlib.add import smart_add, smart_add_tree
 
5
from bzrlib.tests import TestCaseWithTransport, TestCase
5
6
from bzrlib.branch import Branch
6
 
from bzrlib.errors import NotBranchError
7
 
from bzrlib.inventory import InventoryFile
 
7
from bzrlib.errors import NotBranchError, NoSuchFile
 
8
from bzrlib.inventory import InventoryFile, Inventory
8
9
from bzrlib.workingtree import WorkingTree
9
10
 
10
 
class TestSmartAdd(TestCaseInTempDir):
 
11
class TestSmartAdd(TestCaseWithTransport):
11
12
 
12
13
    def test_add_dot_from_root(self):
13
14
        """Test adding . from the root of the tree.""" 
14
15
        from bzrlib.add import smart_add
15
16
        paths = ("original/", "original/file1", "original/file2")
16
17
        self.build_tree(paths)
17
 
        branch = Branch.initialize(u".")
18
 
        smart_add((u".",), recurse=True)
 
18
        wt = self.make_branch_and_tree('.')
 
19
        branch = wt.branch
 
20
        smart_add_tree(wt, (u".",))
19
21
        for path in paths:
20
 
            self.assertNotEqual(branch.working_tree().path2id(path), None)
 
22
            self.assertNotEqual(wt.path2id(path), None)
21
23
 
22
24
    def test_add_dot_from_subdir(self):
23
25
        """Test adding . from a subdir of the tree.""" 
24
26
        from bzrlib.add import smart_add
25
27
        paths = ("original/", "original/file1", "original/file2")
26
28
        self.build_tree(paths)
27
 
        branch = Branch.initialize(u".")
 
29
        wt = self.make_branch_and_tree('.')
 
30
        branch = wt.branch
28
31
        os.chdir("original")
29
 
        smart_add((u".",), recurse=True)
 
32
        smart_add_tree(wt, (u".",))
30
33
        for path in paths:
31
 
            self.assertNotEqual(branch.working_tree().path2id(path), None)
 
34
            self.assertNotEqual(wt.path2id(path), None)
32
35
 
33
36
    def test_add_tree_from_above_tree(self):
34
37
        """Test adding a tree from above the tree.""" 
37
40
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
38
41
                        "branch/original/file2")
39
42
        self.build_tree(branch_paths)
40
 
        branch = Branch.initialize("branch")
41
 
        smart_add(("branch",))
 
43
        wt = self.make_branch_and_tree('branch')
 
44
        branch = wt.branch
 
45
        smart_add_tree(wt, ("branch",))
42
46
        for path in paths:
43
 
            self.assertNotEqual(branch.working_tree().path2id(path), None)
 
47
            self.assertNotEqual(wt.path2id(path), None)
44
48
 
45
49
    def test_add_above_tree_preserves_tree(self):
46
50
        """Test nested trees are not affect by an add above them."""
47
 
        from bzrlib.add import smart_add, add_reporter_null
48
 
        
 
51
        from bzrlib.add import smart_add
49
52
        paths = ("original/", "original/file1", "original/file2")
50
53
        child_paths = ("path",)
51
54
        full_child_paths = ("original/child", "original/child/path")
53
56
                       "original/child/", "original/child/path")
54
57
        
55
58
        self.build_tree(build_paths)
56
 
        branch = Branch.initialize(u".")
57
 
        child_branch = Branch.initialize("original/child")
58
 
        smart_add((u".",), True, add_reporter_null)
 
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".",))
59
63
        for path in paths:
60
 
            self.assertNotEqual((path, branch.working_tree().path2id(path)),
 
64
            self.assertNotEqual((path, wt.path2id(path)),
61
65
                                (path, None))
62
66
        for path in full_child_paths:
63
 
            self.assertEqual((path, branch.working_tree().path2id(path)),
 
67
            self.assertEqual((path, wt.path2id(path)),
64
68
                             (path, None))
65
69
        for path in child_paths:
66
 
            self.assertEqual(child_branch.working_tree().path2id(path), None)
 
70
            self.assertEqual(child_tree.path2id(path), None)
67
71
 
68
72
    def test_add_paths(self):
69
73
        """Test smart-adding a list of paths."""
70
74
        from bzrlib.add import smart_add
71
75
        paths = ("file1", "file2")
72
76
        self.build_tree(paths)
73
 
        branch = Branch.initialize(u".")
74
 
        smart_add(paths)
 
77
        wt = self.make_branch_and_tree('.')
 
78
        branch = wt.branch
 
79
        smart_add_tree(wt, paths)
75
80
        for path in paths:
76
 
            self.assertNotEqual(branch.working_tree().path2id(path), None)
77
 
            
78
 
class TestSmartAddBranch(TestCaseInTempDir):
 
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):
79
116
    """Test smart adds with a specified branch."""
80
117
 
81
118
    def test_add_dot_from_root(self):
82
119
        """Test adding . from the root of the tree.""" 
83
 
        from bzrlib.add import smart_add_tree
84
120
        paths = ("original/", "original/file1", "original/file2")
85
121
        self.build_tree(paths)
86
 
        Branch.initialize(u".")
87
 
        tree = WorkingTree()
88
 
        smart_add_tree(tree, (u".",))
 
122
        wt = self.make_branch_and_tree('.')
 
123
        branch = wt.branch
 
124
        smart_add_tree(wt, (u".",))
89
125
        for path in paths:
90
 
            self.assertNotEqual(tree.path2id(path), None)
 
126
            self.assertNotEqual(wt.path2id(path), None)
91
127
 
92
128
    def test_add_dot_from_subdir(self):
93
129
        """Test adding . from a subdir of the tree.""" 
94
130
        from bzrlib.add import smart_add_tree
95
131
        paths = ("original/", "original/file1", "original/file2")
96
132
        self.build_tree(paths)
97
 
        Branch.initialize(u".")
98
 
        tree = WorkingTree()
 
133
        wt = self.make_branch_and_tree('.')
 
134
        branch = wt.branch
99
135
        os.chdir("original")
100
 
        smart_add_tree(tree, (u".",))
 
136
        smart_add_tree(wt, (u".",))
101
137
        for path in paths:
102
 
            self.assertNotEqual(tree.path2id(path), None)
 
138
            self.assertNotEqual(wt.path2id(path), None)
103
139
 
104
140
    def test_add_tree_from_above_tree(self):
105
141
        """Test adding a tree from above the tree.""" 
108
144
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
109
145
                        "branch/original/file2")
110
146
        self.build_tree(branch_paths)
111
 
        Branch.initialize("branch")
112
 
        tree = WorkingTree("branch")
 
147
        tree = self.make_branch_and_tree('branch')
 
148
        branch = tree.branch
113
149
        smart_add_tree(tree, ("branch",))
114
150
        for path in paths:
115
151
            self.assertNotEqual(tree.path2id(path), None)
123
159
        build_paths = ("original/", "original/file1", "original/file2", 
124
160
                       "original/child/", "original/child/path")
125
161
        self.build_tree(build_paths)
126
 
        Branch.initialize(u".")
127
 
        tree = WorkingTree()
128
 
        child_branch = Branch.initialize("original/child")
 
162
        tree = self.make_branch_and_tree('.')
 
163
        branch = tree.branch
 
164
        child_tree = self.make_branch_and_tree("original/child")
129
165
        smart_add_tree(tree, (u".",))
130
166
        for path in paths:
131
167
            self.assertNotEqual((path, tree.path2id(path)),
134
170
            self.assertEqual((path, tree.path2id(path)),
135
171
                             (path, None))
136
172
        for path in child_paths:
137
 
            self.assertEqual(child_branch.working_tree().path2id(path), None)
 
173
            self.assertEqual(child_tree.path2id(path), None)
138
174
 
139
175
    def test_add_paths(self):
140
176
        """Test smart-adding a list of paths."""
141
177
        from bzrlib.add import smart_add_tree
142
178
        paths = ("file1", "file2")
143
179
        self.build_tree(paths)
144
 
        Branch.initialize(u".")
145
 
        tree = WorkingTree()
146
 
        smart_add_tree(tree, paths)
 
180
        wt = self.make_branch_and_tree('.')
 
181
        branch = wt.branch
 
182
        smart_add_tree(wt, paths)
147
183
        for path in paths:
148
 
            self.assertNotEqual(tree.path2id(path), None)
149
 
 
150
 
class TestAddCallbacks(TestCaseInTempDir):
151
 
 
152
 
    def setUp(self):
153
 
        super(TestAddCallbacks, self).setUp()
 
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):
154
194
        self.entry = InventoryFile("id", "name", None)
155
 
 
156
 
    def test_null_callback(self):
157
 
        from bzrlib.add import add_reporter_null
158
 
        add_reporter_null('path', 'file', self.entry)
159
 
 
160
 
    def test_print_callback(self):
161
 
        from bzrlib.add import add_reporter_print
 
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):
162
207
        from StringIO import StringIO
 
208
        inv = Inventory()
163
209
        stdout = StringIO()
164
 
        self.apply_redirected(None, stdout, None, add_reporter_print,
165
 
                              'path', 'file', self.entry)
166
 
        self.assertEqual(stdout.getvalue(), "added path\n")
 
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)