← 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-09-01 06:32:52 UTC
  • Revision ID: mbp@sourcefrog.net-20050901063252-00fc761bf1076759
- make target to build emacs TAGS file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_smart_add.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from cStringIO import StringIO
18
 
 
19
 
from bzrlib import (
20
 
    add,
21
 
    inventory,
22
 
    osutils,
23
 
    tests,
24
 
    )
25
 
 
26
 
 
27
 
class AddCustomIDAction(add.AddAction):
28
 
 
29
 
    def __call__(self, inv, parent_ie, path, kind):
30
 
        # The first part just logs if appropriate
31
 
        # Now generate a custom id
32
 
        file_id = osutils.safe_file_id(kind + '-'
33
 
                                       + path.raw_path.replace('/', '%'),
34
 
                                       warn=False)
35
 
        if self.should_print:
36
 
            self._to_file.write('added %s with id %s\n'
37
 
                                % (path.raw_path, file_id))
38
 
        return file_id
39
 
 
40
 
 
41
 
class TestAddFrom(tests.TestCaseWithTransport):
42
 
    """Tests for AddFromBaseAction"""
43
 
 
44
 
    def make_base_tree(self):
45
 
        self.base_tree = self.make_branch_and_tree('base')
46
 
        self.build_tree(['base/a', 'base/b',
47
 
                         'base/dir/', 'base/dir/a',
48
 
                         'base/dir/subdir/',
49
 
                         'base/dir/subdir/b',
50
 
                        ])
51
 
        self.base_tree.add(['a', 'b', 'dir', 'dir/a',
52
 
                            'dir/subdir', 'dir/subdir/b'])
53
 
        self.base_tree.commit('creating initial tree.')
54
 
 
55
 
    def add_helper(self, base_tree, base_path, new_tree, file_list,
56
 
                   should_print=False):
57
 
        to_file = StringIO()
58
 
        base_tree.lock_read()
59
 
        try:
60
 
            new_tree.lock_write()
61
 
            try:
62
 
                action = add.AddFromBaseAction(base_tree, base_path,
63
 
                                               to_file=to_file,
64
 
                                               should_print=should_print)
65
 
                new_tree.smart_add(file_list, action=action)
66
 
            finally:
67
 
                new_tree.unlock()
68
 
        finally:
69
 
            base_tree.unlock()
70
 
        return to_file.getvalue()
71
 
 
72
 
    def test_copy_all(self):
73
 
        self.make_base_tree()
74
 
        new_tree = self.make_branch_and_tree('new')
75
 
        files = ['a', 'b',
76
 
                 'dir/', 'dir/a',
77
 
                 'dir/subdir/',
78
 
                 'dir/subdir/b',
79
 
                ]
80
 
        self.build_tree(['new/' + fn for fn in files])
81
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
82
 
 
83
 
        for fn in files:
84
 
            base_file_id = self.base_tree.path2id(fn)
85
 
            new_file_id = new_tree.path2id(fn)
86
 
            self.assertEqual(base_file_id, new_file_id)
87
 
 
88
 
    def test_copy_from_dir(self):
89
 
        self.make_base_tree()
90
 
        new_tree = self.make_branch_and_tree('new')
91
 
 
92
 
        self.build_tree(['new/a', 'new/b', 'new/c',
93
 
                         'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
94
 
        new_tree.set_root_id(self.base_tree.get_root_id())
95
 
        self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
96
 
 
97
 
        # We know 'a' and 'b' exist in the root, and they are being added
98
 
        # in a new 'root'. Since ROOT ids have been set as the same, we will
99
 
        # use those ids
100
 
        self.assertEqual(self.base_tree.path2id('a'),
101
 
                         new_tree.path2id('a'))
102
 
        self.assertEqual(self.base_tree.path2id('b'),
103
 
                         new_tree.path2id('b'))
104
 
 
105
 
        # Because we specified 'dir/' as the base path, and we have
106
 
        # nothing named 'subdir' in the base tree, we should grab the
107
 
        # ids from there
108
 
        self.assertEqual(self.base_tree.path2id('dir/subdir'),
109
 
                         new_tree.path2id('subdir'))
110
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
111
 
                         new_tree.path2id('subdir/b'))
112
 
 
113
 
        # These should get newly generated ids
114
 
        c_id = new_tree.path2id('c')
115
 
        self.assertNotEqual(None, c_id)
116
 
        self.base_tree.lock_read()
117
 
        self.addCleanup(self.base_tree.unlock)
118
 
        self.failIf(c_id in self.base_tree)
119
 
 
120
 
        d_id = new_tree.path2id('subdir/d')
121
 
        self.assertNotEqual(None, d_id)
122
 
        self.failIf(d_id in self.base_tree)
123
 
 
124
 
    def test_copy_existing_dir(self):
125
 
        self.make_base_tree()
126
 
        new_tree = self.make_branch_and_tree('new')
127
 
        self.build_tree(['new/subby/', 'new/subby/a', 'new/subby/b'])
128
 
 
129
 
        subdir_file_id = self.base_tree.path2id('dir/subdir')
130
 
        new_tree.add(['subby'], [subdir_file_id])
131
 
        self.add_helper(self.base_tree, '', new_tree, ['new'])
132
 
        # Because 'subby' already points to subdir, we should add
133
 
        # 'b' with the same id
134
 
        self.assertEqual(self.base_tree.path2id('dir/subdir/b'),
135
 
                         new_tree.path2id('subby/b'))
136
 
 
137
 
        # 'subby/a' should be added with a new id because there is no
138
 
        # matching path or child of 'subby'.
139
 
        a_id = new_tree.path2id('subby/a')
140
 
        self.assertNotEqual(None, a_id)
141
 
        self.base_tree.lock_read()
142
 
        self.addCleanup(self.base_tree.unlock)
143
 
        self.failIf(a_id in self.base_tree)
144
 
 
145
 
 
146
 
class TestAddActions(tests.TestCase):
147
 
 
148
 
    def test_quiet(self):
149
 
        self.run_action("")
150
 
 
151
 
    def test__print(self):
152
 
        self.run_action("adding path\n")
153
 
 
154
 
    def run_action(self, output):
155
 
        from bzrlib.mutabletree import _FastPath
156
 
        inv = inventory.Inventory()
 
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
 
 
8
class TestSmartAdd(TestCaseInTempDir):
 
9
 
 
10
    def test_add_dot_from_root(self):
 
11
        """Test adding . from the root of the tree.""" 
 
12
        from bzrlib.add import smart_add
 
13
        paths = ("original/", "original/file1", "original/file2")
 
14
        self.build_tree(paths)
 
15
        branch = Branch(".", init=True)
 
16
        smart_add((".",), False, True)
 
17
        for path in paths:
 
18
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
19
 
 
20
    def test_add_dot_from_subdir(self):
 
21
        """Test adding . from a subdir of the tree.""" 
 
22
        from bzrlib.add import smart_add
 
23
        paths = ("original/", "original/file1", "original/file2")
 
24
        self.build_tree(paths)
 
25
        branch = Branch(".", init=True)
 
26
        os.chdir("original")
 
27
        smart_add((".",), False, True)
 
28
        for path in paths:
 
29
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
30
 
 
31
    def test_add_tree_from_above_tree(self):
 
32
        """Test adding a tree from above the tree.""" 
 
33
        from bzrlib.add import smart_add
 
34
        paths = ("original/", "original/file1", "original/file2")
 
35
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
36
                        "branch/original/file2")
 
37
        self.build_tree(branch_paths)
 
38
        branch = Branch("branch", init=True)
 
39
        smart_add(("branch",), False, True)
 
40
        for path in paths:
 
41
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
42
 
 
43
    def test_add_above_tree_preserves_tree(self):
 
44
        """Test nested trees are not affect by an add above them."""
 
45
        from bzrlib.add import smart_add
 
46
        paths = ("original/", "original/file1", "original/file2")
 
47
        child_paths = ("path",)
 
48
        full_child_paths = ("original/child", "original/child/path")
 
49
        build_paths = ("original/", "original/file1", "original/file2", 
 
50
                       "original/child/", "original/child/path")
 
51
        
 
52
        self.build_tree(build_paths)
 
53
        branch = Branch(".", init=True)
 
54
        child_branch = Branch("original/child", init=True)
 
55
        smart_add((".",), False, True)
 
56
        for path in paths:
 
57
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
58
                                (path, None))
 
59
        for path in full_child_paths:
 
60
            self.assertEqual((path, branch.inventory.path2id(path)),
 
61
                             (path, None))
 
62
        for path in child_paths:
 
63
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
64
 
 
65
    def test_add_paths(self):
 
66
        """Test smart-adding a list of paths."""
 
67
        from bzrlib.add import smart_add
 
68
        paths = ("file1", "file2")
 
69
        self.build_tree(paths)
 
70
        branch = Branch(".", init=True)
 
71
        smart_add(paths, False, True)
 
72
        for path in paths:
 
73
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
74
            
 
75
class TestSmartAddBranch(TestCaseInTempDir):
 
76
    """Test smart adds with a specified branch."""
 
77
 
 
78
    def test_add_dot_from_root(self):
 
79
        """Test adding . from the root of the tree.""" 
 
80
        from bzrlib.add import smart_add_branch
 
81
        paths = ("original/", "original/file1", "original/file2")
 
82
        self.build_tree(paths)
 
83
        branch = Branch(".", init=True)
 
84
        smart_add_branch(branch, (".",), False, True)
 
85
        for path in paths:
 
86
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
87
 
 
88
    def test_add_dot_from_subdir(self):
 
89
        """Test adding . from a subdir of the tree.""" 
 
90
        from bzrlib.add import smart_add_branch
 
91
        paths = ("original/", "original/file1", "original/file2")
 
92
        self.build_tree(paths)
 
93
        branch = Branch(".", init=True)
 
94
        os.chdir("original")
 
95
        smart_add_branch(branch, (".",), False, True)
 
96
        for path in paths:
 
97
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
98
 
 
99
    def test_add_tree_from_above_tree(self):
 
100
        """Test adding a tree from above the tree.""" 
 
101
        from bzrlib.add import smart_add_branch
 
102
        paths = ("original/", "original/file1", "original/file2")
 
103
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
104
                        "branch/original/file2")
 
105
        self.build_tree(branch_paths)
 
106
        branch = Branch("branch", init=True)
 
107
        smart_add_branch(branch, ("branch",), False, True)
 
108
        for path in paths:
 
109
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
110
 
 
111
    def test_add_above_tree_preserves_tree(self):
 
112
        """Test nested trees are not affect by an add above them."""
 
113
        from bzrlib.add import smart_add_branch
 
114
        paths = ("original/", "original/file1", "original/file2")
 
115
        child_paths = ("path")
 
116
        full_child_paths = ("original/child", "original/child/path")
 
117
        build_paths = ("original/", "original/file1", "original/file2", 
 
118
                       "original/child/", "original/child/path")
 
119
        self.build_tree(build_paths)
 
120
        branch = Branch(".", init=True)
 
121
        child_branch = Branch("original/child", init=True)
 
122
        smart_add_branch(branch, (".",), False, True)
 
123
        for path in paths:
 
124
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
125
                                (path, None))
 
126
        for path in full_child_paths:
 
127
            self.assertEqual((path, branch.inventory.path2id(path)),
 
128
                             (path, None))
 
129
        for path in child_paths:
 
130
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
131
 
 
132
    def test_add_paths(self):
 
133
        """Test smart-adding a list of paths."""
 
134
        from bzrlib.add import smart_add_branch
 
135
        paths = ("file1", "file2")
 
136
        self.build_tree(paths)
 
137
        branch = Branch(".", init=True)
 
138
        smart_add_branch(branch, paths, False, True)
 
139
        for path in paths:
 
140
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
141
 
 
142
class TestAddCallbacks(TestCaseInTempDir):
 
143
 
 
144
    def setUp(self):
 
145
        from bzrlib.inventory import InventoryEntry
 
146
        super(TestAddCallbacks, self).setUp()
 
147
        self.entry = InventoryEntry("id", "name", "file", None)
 
148
 
 
149
    def test_null_callback(self):
 
150
        from bzrlib.add import _NullAddCallback
 
151
        _NullAddCallback('path', 'file', self.entry)
 
152
 
 
153
    def test_print_callback(self):
 
154
        from bzrlib.add import _PrintAddCallback
 
155
        from StringIO import StringIO
157
156
        stdout = StringIO()
158
 
        action = add.AddAction(to_file=stdout, should_print=bool(output))
159
 
 
160
 
        self.apply_redirected(None, stdout, None, action, inv, None,
161
 
            _FastPath('path'), 'file')
162
 
        self.assertEqual(stdout.getvalue(), output)
 
157
        self.apply_redirected(None, stdout, None, _PrintAddCallback,
 
158
                              'path', 'file', self.entry)
 
159
        self.assertEqual(stdout.getvalue(), "added path\n")