← 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 integration.

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
7
 
from bzrlib.inventory import InventoryFile
 
6
from bzrlib.errors import NotBranchError, NoSuchFile
 
7
from bzrlib.inventory import InventoryFile, Inventory
8
8
from bzrlib.workingtree import WorkingTree
 
9
from bzrlib.add import smart_add
9
10
 
10
11
class TestSmartAdd(TestCaseInTempDir):
11
12
 
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(".")
18
 
        smart_add((".",), recurse=True)
 
18
        branch = Branch.initialize(u".")
 
19
        smart_add((u".",))
19
20
        for path in paths:
20
21
            self.assertNotEqual(branch.working_tree().path2id(path), None)
21
22
 
24
25
        from bzrlib.add import smart_add
25
26
        paths = ("original/", "original/file1", "original/file2")
26
27
        self.build_tree(paths)
27
 
        branch = Branch.initialize(".")
 
28
        branch = Branch.initialize(u".")
28
29
        os.chdir("original")
29
 
        smart_add((".",), recurse=True)
 
30
        smart_add((u".",))
30
31
        for path in paths:
31
32
            self.assertNotEqual(branch.working_tree().path2id(path), None)
32
33
 
44
45
 
45
46
    def test_add_above_tree_preserves_tree(self):
46
47
        """Test nested trees are not affect by an add above them."""
47
 
        from bzrlib.add import smart_add, add_reporter_null
48
 
        
 
48
        from bzrlib.add import smart_add
49
49
        paths = ("original/", "original/file1", "original/file2")
50
50
        child_paths = ("path",)
51
51
        full_child_paths = ("original/child", "original/child/path")
53
53
                       "original/child/", "original/child/path")
54
54
        
55
55
        self.build_tree(build_paths)
56
 
        branch = Branch.initialize(".")
 
56
        branch = Branch.initialize(u".")
57
57
        child_branch = Branch.initialize("original/child")
58
 
        smart_add((".",), True, add_reporter_null)
 
58
        smart_add((u".",))
59
59
        for path in paths:
60
60
            self.assertNotEqual((path, branch.working_tree().path2id(path)),
61
61
                                (path, None))
70
70
        from bzrlib.add import smart_add
71
71
        paths = ("file1", "file2")
72
72
        self.build_tree(paths)
73
 
        branch = Branch.initialize(".")
 
73
        branch = Branch.initialize(u".")
74
74
        smart_add(paths)
75
75
        for path in paths:
76
76
            self.assertNotEqual(branch.working_tree().path2id(path), None)
77
 
            
 
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
 
78
109
class TestSmartAddBranch(TestCaseInTempDir):
79
110
    """Test smart adds with a specified branch."""
80
111
 
83
114
        from bzrlib.add import smart_add_tree
84
115
        paths = ("original/", "original/file1", "original/file2")
85
116
        self.build_tree(paths)
86
 
        Branch.initialize(".")
 
117
        Branch.initialize(u".")
87
118
        tree = WorkingTree()
88
 
        smart_add_tree(tree, (".",))
 
119
        smart_add_tree(tree, (u".",))
89
120
        for path in paths:
90
121
            self.assertNotEqual(tree.path2id(path), None)
91
122
 
94
125
        from bzrlib.add import smart_add_tree
95
126
        paths = ("original/", "original/file1", "original/file2")
96
127
        self.build_tree(paths)
97
 
        Branch.initialize(".")
 
128
        Branch.initialize(u".")
98
129
        tree = WorkingTree()
99
130
        os.chdir("original")
100
 
        smart_add_tree(tree, (".",))
 
131
        smart_add_tree(tree, (u".",))
101
132
        for path in paths:
102
133
            self.assertNotEqual(tree.path2id(path), None)
103
134
 
123
154
        build_paths = ("original/", "original/file1", "original/file2", 
124
155
                       "original/child/", "original/child/path")
125
156
        self.build_tree(build_paths)
126
 
        Branch.initialize(".")
 
157
        Branch.initialize(u".")
127
158
        tree = WorkingTree()
128
159
        child_branch = Branch.initialize("original/child")
129
 
        smart_add_tree(tree, (".",))
 
160
        smart_add_tree(tree, (u".",))
130
161
        for path in paths:
131
162
            self.assertNotEqual((path, tree.path2id(path)),
132
163
                                (path, None))
141
172
        from bzrlib.add import smart_add_tree
142
173
        paths = ("file1", "file2")
143
174
        self.build_tree(paths)
144
 
        Branch.initialize(".")
 
175
        Branch.initialize(u".")
145
176
        tree = WorkingTree()
146
177
        smart_add_tree(tree, paths)
147
178
        for path in paths:
148
179
            self.assertNotEqual(tree.path2id(path), None)
149
180
 
150
 
class TestAddCallbacks(TestCaseInTempDir):
151
 
 
152
 
    def setUp(self):
153
 
        super(TestAddCallbacks, self).setUp()
 
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):
154
189
        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
 
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):
162
202
        from StringIO import StringIO
 
203
        inv = Inventory()
163
204
        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")
 
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)