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