← 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

  • Committer: Robert Collins
  • Date: 2006-06-26 16:23:10 UTC
  • mfrom: (1780.2.1 misc-fixen)
  • mto: This revision was merged to the branch mainline in revision 1815.
  • Revision ID: robertc@robertcollins.net-20060626162310-98f5b55b8cc19d46
(robertc) Misc minor typos and the like.

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