1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests of simple versioning operations"""
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
25
26
from bzrlib.branch import Branch
26
from bzrlib.osutils import pathjoin
27
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
27
from bzrlib.trace import mutter
29
from bzrlib.workingtree import WorkingTree
32
class TestMkdir(TestCaseWithTransport):
34
def test_mkdir_fails_cleanly(self):
35
"""'mkdir' fails cleanly when no working tree is available.
36
https://bugs.launchpad.net/bzr/+bug/138600
38
# Since there is a safety working tree above us, we create a bare repo
40
shared_repo = self.make_repository('.')
41
self.run_bzr(['mkdir', 'abc'], retcode=3)
42
self.failIfExists('abc')
45
30
class TestVersioning(TestCaseInTempDir):
48
33
"""Basic 'bzr mkdir' operation"""
50
35
self.run_bzr('init')
51
self.run_bzr(['mkdir', 'foo'])
36
self.run_bzr('mkdir', 'foo')
52
37
self.assert_(os.path.isdir('foo'))
54
self.run_bzr(['mkdir', 'foo'], retcode=3)
56
wt = WorkingTree.open('.')
58
delta = wt.changes_from(wt.basis_tree())
39
self.run_bzr('mkdir', 'foo', retcode=3)
41
from bzrlib.diff import compare_trees
42
from bzrlib.branch import Branch
45
delta = compare_trees(b.basis_tree(), b.working_tree())
60
47
self.log('delta.added = %r' % delta.added)
67
54
"""'bzr mkdir' operation in subdirectory"""
69
56
self.run_bzr('init')
70
self.run_bzr(['mkdir', 'dir'])
57
self.run_bzr('mkdir', 'dir')
71
58
self.assert_(os.path.isdir('dir'))
74
61
self.log('Run mkdir in subdir')
75
self.run_bzr(['mkdir', 'subdir'])
62
self.run_bzr('mkdir', 'subdir')
76
63
self.assert_(os.path.isdir('subdir'))
79
wt = WorkingTree.open('.')
81
delta = wt.changes_from(wt.basis_tree())
66
from bzrlib.diff import compare_trees
67
from bzrlib.branch import Branch
70
delta = compare_trees(b.basis_tree(), b.working_tree())
83
72
self.log('delta.added = %r' % delta.added)
85
74
self.assertEquals(len(delta.added), 2)
86
75
self.assertEquals(delta.added[0][0], 'dir')
87
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
76
self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
88
77
self.failIf(delta.modified)
90
79
def test_mkdir_w_nested_trees(self):
99
88
self.run_bzr('init')
102
self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
91
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
103
92
self.failUnless(os.path.isdir('dir'))
104
93
self.failUnless(os.path.isdir('a/dir'))
105
94
self.failUnless(os.path.isdir('a/b/dir'))
107
wt = WorkingTree.open('.')
108
wt_a = WorkingTree.open('a')
109
wt_b = WorkingTree.open('a/b')
111
delta = wt.changes_from(wt.basis_tree())
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(delta.added[0][0], 'dir')
114
self.failIf(delta.modified)
116
delta = wt_a.changes_from(wt_a.basis_tree())
117
self.assertEquals(len(delta.added), 1)
118
self.assertEquals(delta.added[0][0], 'dir')
119
self.failIf(delta.modified)
121
delta = wt_b.changes_from(wt_b.basis_tree())
122
self.assertEquals(len(delta.added), 1)
123
self.assertEquals(delta.added[0][0], 'dir')
124
self.failIf(delta.modified)
96
from bzrlib.diff import compare_trees
98
b_a = Branch.open('a')
99
b_b = Branch.open('a/b')
101
delta = compare_trees(b.basis_tree(), b.working_tree())
102
self.assertEquals(len(delta.added), 1)
103
self.assertEquals(delta.added[0][0], 'dir')
104
self.failIf(delta.modified)
106
delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
107
self.assertEquals(len(delta.added), 1)
108
self.assertEquals(delta.added[0][0], 'dir')
109
self.failIf(delta.modified)
111
delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(delta.added[0][0], 'dir')
114
self.failIf(delta.modified)
116
def test_working_tree_add_in_unversioned(self):
117
"""Try to add a file in an unversioned directory.
119
"bzr add" adds the parent as necessary, but simple working tree add
122
from bzrlib.branch import Branch
123
from bzrlib.errors import NotVersionedError
124
from bzrlib.workingtree import WorkingTree
126
b = Branch.initialize('.')
128
self.build_tree(['foo/',
131
self.assertRaises(NotVersionedError,
132
WorkingTree(b.base, b).add,
126
137
def check_branch(self):
127
138
"""After all the above changes, run the check and upgrade commands.
129
140
The upgrade should be a no-op."""
130
b = Branch.open(u'.')
131
142
mutter('branch has %d revisions', b.revno())
133
144
mutter('check branch...')
134
145
from bzrlib.check import check
138
class SubdirCommit(TestCaseWithTransport):
149
class SubdirCommit(TestCaseInTempDir):
140
151
def test_subdir_commit(self):
141
"""Test committing a subdirectory, and committing a directory."""
142
tree = self.make_branch_and_tree('.')
152
"""Test committing a subdirectory, and committing within a directory."""
153
run_bzr = self.run_bzr
154
eq = self.assertEqual
144
156
self.build_tree(['a/', 'b/'])
145
def set_contents(contents):
146
self.build_tree_contents([
151
set_contents('old contents')
152
tree.smart_add(['.'])
153
tree.commit('first revision')
154
set_contents('new contents')
161
for fn in ('a/one', 'b/two', 'top'):
162
file(fn, 'w').write('old contents')
165
run_bzr('commit', '-m', 'first revision')
167
for fn in ('a/one', 'b/two', 'top'):
168
file(fn, 'w').write('new contents')
156
170
mutter('start selective subdir commit')
157
self.run_bzr(['commit', 'a', '-m', 'commit a only'])
159
new = b.repository.revision_tree(b.get_rev_id(2))
162
self.assertEqual(new.get_file_by_path('b/two').read(), 'old contents')
163
self.assertEqual(new.get_file_by_path('top').read(), 'old contents')
164
self.assertEqual(new.get_file_by_path('a/one').read(), 'new contents')
171
run_bzr('commit', 'a', '-m', 'commit a only')
173
old = b.revision_tree(b.get_rev_id(1))
174
new = b.revision_tree(b.get_rev_id(2))
176
eq(new.get_file_by_path('b/two').read(), 'old contents')
177
eq(new.get_file_by_path('top').read(), 'old contents')
178
eq(new.get_file_by_path('a/one').read(), 'new contents')
168
181
# commit from here should do nothing
169
self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
170
v3 = b.repository.revision_tree(b.get_rev_id(3))
172
self.assertEqual(v3.get_file_by_path('b/two').read(), 'old contents')
173
self.assertEqual(v3.get_file_by_path('top').read(), 'old contents')
174
self.assertEqual(v3.get_file_by_path('a/one').read(), 'new contents')
182
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
183
v3 = b.revision_tree(b.get_rev_id(3))
184
eq(v3.get_file_by_path('b/two').read(), 'old contents')
185
eq(v3.get_file_by_path('top').read(), 'old contents')
186
eq(v3.get_file_by_path('a/one').read(), 'new contents')
177
188
# commit in subdirectory commits whole tree
178
self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
179
v4 = b.repository.revision_tree(b.get_rev_id(4))
181
self.assertEqual(v4.get_file_by_path('b/two').read(), 'new contents')
182
self.assertEqual(v4.get_file_by_path('top').read(), 'new contents')
189
run_bzr('commit', '-m', 'commit whole tree from subdir')
190
v4 = b.revision_tree(b.get_rev_id(4))
191
eq(v4.get_file_by_path('b/two').read(), 'new contents')
192
eq(v4.get_file_by_path('top').read(), 'new contents')
185
194
# TODO: factor out some kind of assert_tree_state() method
197
if __name__ == '__main__':
added
removed
bzrlib/tests/blackbox/test_versioning.py
