← 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
32
32
        """Test adding a tree from above the tree.""" 
33
33
        from bzrlib.add import smart_add
34
34
        paths = ("original/", "original/file1", "original/file2")
35
 
        branch_paths = ("branch/", "branch/original/", "branch/original/file1", "branch/original/file2")
 
35
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
36
                        "branch/original/file2")
36
37
        self.build_tree(branch_paths)
37
38
        branch = Branch("branch", init=True)
38
39
        smart_add(("branch",), False, True)
69
70
        smart_add(paths, False, True)
70
71
        for path in paths:
71
72
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
73
            
 
74
class TestSmartAddBranch(FunctionalTestCase):
 
75
    """Test smart adds with a specified branch."""
 
76
 
 
77
    def test_add_dot_from_root(self):
 
78
        """Test adding . from the root of the tree.""" 
 
79
        from bzrlib.add import smart_add_branch
 
80
        paths = ("original/", "original/file1", "original/file2")
 
81
        self.build_tree(paths)
 
82
        branch = Branch(".", init=True)
 
83
        smart_add_branch(branch, (".",), False, True)
 
84
        for path in paths:
 
85
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
86
 
 
87
    def test_add_dot_from_subdir(self):
 
88
        """Test adding . from a subdir of the tree.""" 
 
89
        from bzrlib.add import smart_add_branch
 
90
        paths = ("original/", "original/file1", "original/file2")
 
91
        self.build_tree(paths)
 
92
        branch = Branch(".", init=True)
 
93
        os.chdir("original")
 
94
        smart_add_branch(branch, (".",), False, True)
 
95
        for path in paths:
 
96
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
97
 
 
98
    def test_add_tree_from_above_tree(self):
 
99
        """Test adding a tree from above the tree.""" 
 
100
        from bzrlib.add import smart_add_branch
 
101
        paths = ("original/", "original/file1", "original/file2")
 
102
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
103
                        "branch/original/file2")
 
104
        self.build_tree(branch_paths)
 
105
        branch = Branch("branch", init=True)
 
106
        smart_add_branch(branch, ("branch",), False, True)
 
107
        for path in paths:
 
108
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
109
 
 
110
    def test_add_above_tree_preserves_tree(self):
 
111
        """Test nested trees are not affect by an add above them."""
 
112
        from bzrlib.add import smart_add_branch
 
113
        paths = ("original/", "original/file1", "original/file2")
 
114
        child_paths = ("path")
 
115
        full_child_paths = ("original/child", "original/child/path")
 
116
        build_paths = ("original/", "original/file1", "original/file2", 
 
117
                       "original/child/", "original/child/path")
 
118
        self.build_tree(build_paths)
 
119
        branch = Branch(".", init=True)
 
120
        child_branch = Branch("original/child", init=True)
 
121
        smart_add_branch(branch, (".",), False, True)
 
122
        for path in paths:
 
123
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
124
                                (path, None))
 
125
        for path in full_child_paths:
 
126
            self.assertEqual((path, branch.inventory.path2id(path)),
 
127
                             (path, None))
 
128
        for path in child_paths:
 
129
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
130
 
 
131
    def test_add_paths(self):
 
132
        """Test smart-adding a list of paths."""
 
133
        from bzrlib.add import smart_add_branch
 
134
        paths = ("file1", "file2")
 
135
        self.build_tree(paths)
 
136
        branch = Branch(".", init=True)
 
137
        smart_add_branch(branch, paths, False, True)
 
138
        for path in paths:
 
139
            self.assertNotEqual(branch.inventory.path2id(path), None)