← 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: Robert Collins
  • Date: 2005-08-25 01:56:02 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825015601-b4ac37f043068e82
break smart_add into smart_add and smart_add_branch which will accept a branch parameter

Show diffs side-by-side

added added

removed removed

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