/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-02 05:28:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1851.
  • Revision ID: john@arbash-meinel.com-20060702052812-2edccb8f915f46b2
A couple no-op cleanups

Show diffs side-by-side

added added

removed removed

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