← 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

- prepare for 0.0.9 release

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