← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_smart_add.py

  • Committer: Martin Pool
  • Date: 2005-05-10 06:00:59 UTC
  • Revision ID: mbp@sourcefrog.net-20050510060059-bae67a465325f650
- Use AtomicFile to update statcache.
- New closed property on AtomicFile

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_smart_add.py
1
 
import os
2
 
import unittest
3
 
 
4
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
 
from bzrlib.branch import Branch
6
 
from bzrlib.errors import NotBranchError, NotVersionedError
7
 
from bzrlib.inventory import InventoryFile
8
 
 
9
 
class TestSmartAdd(TestCaseInTempDir):
10
 
 
11
 
    def test_add_dot_from_root(self):
12
 
        """Test adding . from the root of the tree.""" 
13
 
        from bzrlib.add import smart_add
14
 
        paths = ("original/", "original/file1", "original/file2")
15
 
        self.build_tree(paths)
16
 
        branch = Branch.initialize(".")
17
 
        smart_add((".",), recurse=True)
18
 
        for path in paths:
19
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
20
 
 
21
 
    def test_add_dot_from_subdir(self):
22
 
        """Test adding . from a subdir of the tree.""" 
23
 
        from bzrlib.add import smart_add
24
 
        paths = ("original/", "original/file1", "original/file2")
25
 
        self.build_tree(paths)
26
 
        branch = Branch.initialize(".")
27
 
        os.chdir("original")
28
 
        smart_add((".",), recurse=True)
29
 
        for path in paths:
30
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
31
 
 
32
 
    def test_add_tree_from_above_tree(self):
33
 
        """Test adding a tree from above the tree.""" 
34
 
        from bzrlib.add import smart_add
35
 
        paths = ("original/", "original/file1", "original/file2")
36
 
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
37
 
                        "branch/original/file2")
38
 
        self.build_tree(branch_paths)
39
 
        branch = Branch.initialize("branch")
40
 
        smart_add(("branch",))
41
 
        for path in paths:
42
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
43
 
 
44
 
    def test_add_above_tree_preserves_tree(self):
45
 
        """Test nested trees are not affect by an add above them."""
46
 
        from bzrlib.add import smart_add, add_reporter_null
47
 
        
48
 
        paths = ("original/", "original/file1", "original/file2")
49
 
        child_paths = ("path",)
50
 
        full_child_paths = ("original/child", "original/child/path")
51
 
        build_paths = ("original/", "original/file1", "original/file2", 
52
 
                       "original/child/", "original/child/path")
53
 
        
54
 
        self.build_tree(build_paths)
55
 
        branch = Branch.initialize(".")
56
 
        child_branch = Branch.initialize("original/child")
57
 
        smart_add((".",), True, add_reporter_null)
58
 
        for path in paths:
59
 
            self.assertNotEqual((path, branch.inventory.path2id(path)),
60
 
                                (path, None))
61
 
        for path in full_child_paths:
62
 
            self.assertEqual((path, branch.inventory.path2id(path)),
63
 
                             (path, None))
64
 
        for path in child_paths:
65
 
            self.assertEqual(child_branch.inventory.path2id(path), None)
66
 
 
67
 
    def test_add_paths(self):
68
 
        """Test smart-adding a list of paths."""
69
 
        from bzrlib.add import smart_add
70
 
        paths = ("file1", "file2")
71
 
        self.build_tree(paths)
72
 
        branch = Branch.initialize(".")
73
 
        smart_add(paths)
74
 
        for path in paths:
75
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
76
 
            
77
 
class TestSmartAddBranch(TestCaseInTempDir):
78
 
    """Test smart adds with a specified branch."""
79
 
 
80
 
    def test_add_dot_from_root(self):
81
 
        """Test adding . from the root of the tree.""" 
82
 
        from bzrlib.add import smart_add_branch
83
 
        paths = ("original/", "original/file1", "original/file2")
84
 
        self.build_tree(paths)
85
 
        branch = Branch.initialize(".")
86
 
        smart_add_branch(branch, (".",))
87
 
        for path in paths:
88
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
89
 
 
90
 
    def test_add_dot_from_subdir(self):
91
 
        """Test adding . from a subdir of the tree.""" 
92
 
        from bzrlib.add import smart_add_branch
93
 
        paths = ("original/", "original/file1", "original/file2")
94
 
        self.build_tree(paths)
95
 
        branch = Branch.initialize(".")
96
 
        os.chdir("original")
97
 
        smart_add_branch(branch, (".",))
98
 
        for path in paths:
99
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
100
 
 
101
 
    def test_add_tree_from_above_tree(self):
102
 
        """Test adding a tree from above the tree.""" 
103
 
        from bzrlib.add import smart_add_branch
104
 
        paths = ("original/", "original/file1", "original/file2")
105
 
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
106
 
                        "branch/original/file2")
107
 
        self.build_tree(branch_paths)
108
 
        branch = Branch.initialize("branch")
109
 
        smart_add_branch(branch, ("branch",))
110
 
        for path in paths:
111
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
112
 
 
113
 
    def test_add_above_tree_preserves_tree(self):
114
 
        """Test nested trees are not affect by an add above them."""
115
 
        from bzrlib.add import smart_add_branch
116
 
        paths = ("original/", "original/file1", "original/file2")
117
 
        child_paths = ("path")
118
 
        full_child_paths = ("original/child", "original/child/path")
119
 
        build_paths = ("original/", "original/file1", "original/file2", 
120
 
                       "original/child/", "original/child/path")
121
 
        self.build_tree(build_paths)
122
 
        branch = Branch.initialize(".")
123
 
        child_branch = Branch.initialize("original/child")
124
 
        smart_add_branch(branch, (".",))
125
 
        for path in paths:
126
 
            self.assertNotEqual((path, branch.inventory.path2id(path)),
127
 
                                (path, None))
128
 
        for path in full_child_paths:
129
 
            self.assertEqual((path, branch.inventory.path2id(path)),
130
 
                             (path, None))
131
 
        for path in child_paths:
132
 
            self.assertEqual(child_branch.inventory.path2id(path), None)
133
 
 
134
 
    def test_add_paths(self):
135
 
        """Test smart-adding a list of paths."""
136
 
        from bzrlib.add import smart_add_branch
137
 
        paths = ("file1", "file2")
138
 
        self.build_tree(paths)
139
 
        branch = Branch.initialize(".")
140
 
        smart_add_branch(branch, paths)
141
 
        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
157
 
        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")