← 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 from jam-storage.

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