← 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: Canonical.com Patch Queue Manager
  • Date: 2006-06-29 18:21:57 UTC
  • mfrom: (1711.2.72 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
(jam) add run_bzr_error, clean up remerge tests

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