← 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: 2008-04-07 07:52:50 UTC
  • mfrom: (3340.1.1 208418-1.4)
  • Revision ID: pqm@pqm.ubuntu.com-20080407075250-phs53xnslo8boaeo
Return the correct knit serialisation method in _StreamAccess.
        (Andrew Bennetts, Martin Pool, Robert Collins)

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.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
 
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
from cStringIO import StringIO
 
18
 
 
19
from bzrlib import osutils
 
20
from bzrlib.add import (
 
21
    AddAction,
 
22
    AddFromBaseAction,
 
23
    )
 
24
from bzrlib.tests import TestCase, TestCaseWithTransport
 
25
from bzrlib.inventory import Inventory
 
26
 
 
27
 
 
28
class AddCustomIDAction(AddAction):
 
29
 
 
30
    def __call__(self, inv, parent_ie, path, kind):
 
31
        # The first part just logs if appropriate
 
32
        # Now generate a custom id
 
33
        file_id = osutils.safe_file_id(kind + '-'
 
34
                                       + path.raw_path.replace('/', '%'),
 
35
                                       warn=False)
 
36
        if self.should_print:
 
37
            self._to_file.write('added %s with id %s\n'
 
38
                                % (path.raw_path, file_id))
 
39
        return file_id
 
40
 
 
41
 
 
42
class TestAddFrom(TestCaseWithTransport):
 
43
    """Tests for AddFromBaseAction"""
 
44
 
 
45
    def make_base_tree(self):
 
46
        self.base_tree = self.make_branch_and_tree('base')
 
47
        self.build_tree(['base/a', 'base/b',
 
48
                         'base/dir/', 'base/dir/a',
 
49
                         'base/dir/subdir/',
 
50
                         'base/dir/subdir/b',
 
51
                        ])
 
52
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
 
53
                            'dir/subdir', 'dir/subdir/b'])
 
54
        self.base_tree.commit('creating initial tree.')
 
55
 
 
56
    def add_helper(self, base_tree, base_path, new_tree, file_list,
 
57
                   should_print=False):
 
58
        to_file = StringIO()
 
59
        base_tree.lock_read()
 
60
        try:
 
61
            new_tree.lock_write()
 
62
            try:
 
63
                action = AddFromBaseAction(base_tree, base_path,
 
64
                                           to_file=to_file,
 
65
                                           should_print=should_print)
 
66
                new_tree.smart_add(file_list, action=action)
 
67
            finally:
 
68
                new_tree.unlock()
 
69
        finally:
 
70
            base_tree.unlock()
 
71
        return to_file.getvalue()
 
72
 
 
73
    def test_copy_all(self):
 
74
        self.make_base_tree()
 
75
        new_tree = self.make_branch_and_tree('new')
 
76
        files = ['a', 'b',
 
77
                 'dir/', 'dir/a',
 
78
                 'dir/subdir/',
 
79
                 'dir/subdir/b',
 
80
                ]
 
81
        self.build_tree(['new/' + fn for fn in files])
 
82
        self.add_helper(self.base_tree, '', new_tree, ['new'])
 
83
 
 
84
        for fn in files:
 
85
            base_file_id = self.base_tree.path2id(fn)
 
86
            new_file_id = new_tree.path2id(fn)
 
87
            self.assertEqual(base_file_id, new_file_id)
 
88
 
 
89
    def test_copy_from_dir(self):
 
90
        self.make_base_tree()
 
91
        new_tree = self.make_branch_and_tree('new')
 
92
 
 
93
        self.build_tree(['new/a', 'new/b', 'new/c',
 
94
                         'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
 
95
        new_tree.set_root_id(self.base_tree.get_root_id())
 
96
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
 
97
 
 
98
        # We know 'a' and 'b' exist in the root, and they are being added
 
99
        # in a new 'root'. Since ROOT ids have been set as the same, we will
 
100
        # use those ids
 
101
        self.assertEqual(self.base_tree.path2id('a'),
 
102
                         new_tree.path2id('a'))
 
103
        self.assertEqual(self.base_tree.path2id('b'),
 
104
                         new_tree.path2id('b'))
 
105
 
 
106
        # Because we specified 'dir/' as the base path, and we have
 
107
        # nothing named 'subdir' in the base tree, we should grab the
 
108
        # ids from there
 
109
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
 
110
                         new_tree.path2id('subdir'))
 
111
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
 
112
                         new_tree.path2id('subdir/b'))
 
113
 
 
114
        # These should get newly generated ids
 
115
        c_id = new_tree.path2id('c')
 
116
        self.assertNotEqual(None, c_id)
 
117
        self.base_tree.lock_read()
 
118
        self.addCleanup(self.base_tree.unlock)
 
119
        self.failIf(c_id in self.base_tree)
 
120
 
 
121
        d_id = new_tree.path2id('subdir/d')
 
122
        self.assertNotEqual(None, d_id)
 
123
        self.failIf(d_id in self.base_tree)
 
124
 
 
125
    def test_copy_existing_dir(self):
 
126
        self.make_base_tree()
 
127
        new_tree = self.make_branch_and_tree('new')
 
128
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
 
129
 
 
130
        subdir_file_id = self.base_tree.path2id('dir/subdir')
 
131
        new_tree.add(['subby'], [subdir_file_id])
 
132
        self.add_helper(self.base_tree, '', new_tree, ['new'])
 
133
        # Because 'subby' already points to subdir, we should add
 
134
        # 'b' with the same id
 
135
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
 
136
                         new_tree.path2id('subby/b'))
 
137
 
 
138
        # 'subby/a' should be added with a new id because there is no
 
139
        # matching path or child of 'subby'.
 
140
        a_id = new_tree.path2id('subby/a')
 
141
        self.assertNotEqual(None, a_id)
 
142
        self.base_tree.lock_read()
 
143
        self.addCleanup(self.base_tree.unlock)
 
144
        self.failIf(a_id in self.base_tree)
 
145
 
 
146
 
 
147
class TestAddActions(TestCase):
 
148
 
 
149
    def test_quiet(self):
 
150
        self.run_action("")
 
151
 
 
152
    def test__print(self):
 
153
        self.run_action("added path\n")
 
154
 
 
155
    def run_action(self, output):
 
156
        from bzrlib.add import AddAction
 
157
        from bzrlib.mutabletree import _FastPath
 
158
        inv = Inventory()
157
159
        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")
 
160
        action = AddAction(to_file=stdout, should_print=bool(output))
 
161
 
 
162
        self.apply_redirected(None, stdout, None, action, inv, None,
 
163
            _FastPath('path'), 'file')
 
164
        self.assertEqual(stdout.getvalue(), output)