← 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-02-18 02:33:47 UTC
  • mfrom: (1534.1.24 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060218023347-0952c65f668bfd68
Merge Robert Collins 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.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, (u".",))
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
        branch = wt.branch
 
79
        smart_add_tree(wt, paths)
74
80
        for path in paths:
75
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
76
 
            
77
 
class TestSmartAddBranch(TestCaseInTempDir):
 
81
            self.assertNotEqual(wt.path2id(path), None)
 
82
 
 
83
    def test_add_dry_run(self):
 
84
        """Test a dry run add, make sure nothing is added."""
 
85
        from bzrlib.commands import run_bzr
 
86
        eq = self.assertEqual
 
87
        wt = self.make_branch_and_tree('.')
 
88
        branch = wt.branch
 
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
90
        eq(list(wt.unknowns()), ['inertiatic'])
 
91
        self.capture('add --dry-run .')
 
92
        eq(list(wt.unknowns()), ['inertiatic'])
 
93
 
 
94
    def test_add_non_existant(self):
 
95
        """Test smart-adding a file that does not exist."""
 
96
        from bzrlib.add import smart_add
 
97
        wt = self.make_branch_and_tree('.')
 
98
        branch = wt.branch
 
99
        self.assertRaises(NoSuchFile, smart_add_tree, wt, 'non-existant-file')
 
100
 
 
101
    def test_returns(self):
 
102
        """Correctly returns added/ignored files"""
 
103
        from bzrlib.commands import run_bzr
 
104
        wt = self.make_branch_and_tree('.')
 
105
        branch = wt.branch
 
106
        self.build_tree(['inertiatic/', 'inertiatic/esp', 'inertiatic/CVS', 
 
107
                        'inertiatic/foo.pyc'])
 
108
        added, ignored = smart_add_tree(wt, u'.')
 
109
        self.AssertSubset(('inertiatic', 'inertiatic/esp'), added)
 
110
        self.AssertSubset(('CVS', '*.py[oc]'), ignored)
 
111
        self.AssertSubset(('inertiatic/CVS',), ignored['CVS'])
 
112
        self.AssertSubset(('inertiatic/foo.pyc',), ignored['*.py[oc]'])
 
113
 
 
114
 
 
115
class TestSmartAddBranch(TestCaseWithTransport):
78
116
    """Test smart adds with a specified branch."""
79
117
 
80
118
    def test_add_dot_from_root(self):
81
119
        """Test adding . from the root of the tree.""" 
82
 
        from bzrlib.add import smart_add_branch
83
120
        paths = ("original/", "original/file1", "original/file2")
84
121
        self.build_tree(paths)
85
 
        branch = Branch.initialize(".")
86
 
        smart_add_branch(branch, (".",))
 
122
        wt = self.make_branch_and_tree('.')
 
123
        branch = wt.branch
 
124
        smart_add_tree(wt, (u".",))
87
125
        for path in paths:
88
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
126
            self.assertNotEqual(wt.path2id(path), None)
89
127
 
90
128
    def test_add_dot_from_subdir(self):
91
129
        """Test adding . from a subdir of the tree.""" 
92
 
        from bzrlib.add import smart_add_branch
 
130
        from bzrlib.add import smart_add_tree
93
131
        paths = ("original/", "original/file1", "original/file2")
94
132
        self.build_tree(paths)
95
 
        branch = Branch.initialize(".")
 
133
        wt = self.make_branch_and_tree('.')
 
134
        branch = wt.branch
96
135
        os.chdir("original")
97
 
        smart_add_branch(branch, (".",))
 
136
        smart_add_tree(wt, (u".",))
98
137
        for path in paths:
99
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
138
            self.assertNotEqual(wt.path2id(path), None)
100
139
 
101
140
    def test_add_tree_from_above_tree(self):
102
141
        """Test adding a tree from above the tree.""" 
103
 
        from bzrlib.add import smart_add_branch
 
142
        from bzrlib.add import smart_add_tree
104
143
        paths = ("original/", "original/file1", "original/file2")
105
144
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
106
145
                        "branch/original/file2")
107
146
        self.build_tree(branch_paths)
108
 
        branch = Branch.initialize("branch")
109
 
        smart_add_branch(branch, ("branch",))
 
147
        tree = self.make_branch_and_tree('branch')
 
148
        branch = tree.branch
 
149
        smart_add_tree(tree, ("branch",))
110
150
        for path in paths:
111
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
151
            self.assertNotEqual(tree.path2id(path), None)
112
152
 
113
153
    def test_add_above_tree_preserves_tree(self):
114
154
        """Test nested trees are not affect by an add above them."""
115
 
        from bzrlib.add import smart_add_branch
 
155
        from bzrlib.add import smart_add_tree
116
156
        paths = ("original/", "original/file1", "original/file2")
117
157
        child_paths = ("path")
118
158
        full_child_paths = ("original/child", "original/child/path")
119
159
        build_paths = ("original/", "original/file1", "original/file2", 
120
160
                       "original/child/", "original/child/path")
121
161
        self.build_tree(build_paths)
122
 
        branch = Branch.initialize(".")
123
 
        child_branch = Branch.initialize("original/child")
124
 
        smart_add_branch(branch, (".",))
 
162
        tree = self.make_branch_and_tree('.')
 
163
        branch = tree.branch
 
164
        child_tree = self.make_branch_and_tree("original/child")
 
165
        smart_add_tree(tree, (u".",))
125
166
        for path in paths:
126
 
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
167
            self.assertNotEqual((path, tree.path2id(path)),
127
168
                                (path, None))
128
169
        for path in full_child_paths:
129
 
            self.assertEqual((path, branch.inventory.path2id(path)),
 
170
            self.assertEqual((path, tree.path2id(path)),
130
171
                             (path, None))
131
172
        for path in child_paths:
132
 
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
173
            self.assertEqual(child_tree.path2id(path), None)
133
174
 
134
175
    def test_add_paths(self):
135
176
        """Test smart-adding a list of paths."""
136
 
        from bzrlib.add import smart_add_branch
 
177
        from bzrlib.add import smart_add_tree
137
178
        paths = ("file1", "file2")
138
179
        self.build_tree(paths)
139
 
        branch = Branch.initialize(".")
140
 
        smart_add_branch(branch, paths)
 
180
        wt = self.make_branch_and_tree('.')
 
181
        branch = wt.branch
 
182
        smart_add_tree(wt, paths)
141
183
        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()
 
184
            self.assertNotEqual(wt.path2id(path), None)
 
185
 
 
186
 
 
187
class TestAddActions(TestCase):
 
188
 
 
189
    def test_null(self):
 
190
        from bzrlib.add import add_action_null
 
191
        self.run_action(add_action_null, "", False)
 
192
 
 
193
    def test_add(self):
148
194
        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
 
195
        from bzrlib.add import add_action_add
 
196
        self.run_action(add_action_add, "", True)
 
197
 
 
198
    def test_add_and_print(self):
 
199
        from bzrlib.add import add_action_add_and_print
 
200
        self.run_action(add_action_add_and_print, "added path\n", True)
 
201
 
 
202
    def test_print(self):
 
203
        from bzrlib.add import add_action_print
 
204
        self.run_action(add_action_print, "added path\n", False)
 
205
 
 
206
    def run_action(self, action, output, should_add):
156
207
        from StringIO import StringIO
 
208
        inv = Inventory()
157
209
        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")
 
210
 
 
211
        self.apply_redirected(None, stdout, None, action, inv, 'path', 'file')
 
212
        self.assertEqual(stdout.getvalue(), output)
 
213
 
 
214
        if should_add:
 
215
            self.assertNotEqual(inv.path2id('path'), None)
 
216
        else:
 
217
            self.assertEqual(inv.path2id('path'), None)