1
# Copyright (C) 2005 by Canonical Ltd
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.
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.
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
18
"""Tests of simple versioning operations"""
20
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
from bzrlib.branch import Branch
27
from bzrlib.trace import mutter
30
class TestVersioning(TestCaseInTempDir):
33
"""Basic 'bzr mkdir' operation"""
36
self.run_bzr('mkdir', 'foo')
37
self.assert_(os.path.isdir('foo'))
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())
47
self.log('delta.added = %r' % delta.added)
49
self.assertEquals(len(delta.added), 1)
50
self.assertEquals(delta.added[0][0], 'foo')
51
self.failIf(delta.modified)
53
def test_branch_add_in_unversioned(self):
54
"""Try to add a file in an unversioned directory.
56
"bzr add" adds the parent as necessary, but simple branch add
59
from bzrlib.branch import Branch
60
from bzrlib.errors import NotVersionedError
62
b = Branch.initialize('.')
64
self.build_tree(['foo/',
67
self.assertRaises(NotVersionedError,
73
def test_add_in_unversioned(self):
74
"""Try to add a file in an unversioned directory.
76
"bzr add" should add the parent(s) as necessary.
78
from bzrlib.branch import Branch
81
b = Branch.initialize('.')
83
self.build_tree(['inertiatic/', 'inertiatic/esp'])
84
eq(list(b.unknowns()), ['inertiatic'])
85
self.run_bzr('add', 'inertiatic/esp')
86
eq(list(b.unknowns()), [])
88
# Multiple unversioned parents
89
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
90
eq(list(b.unknowns()), ['veil'])
91
self.run_bzr('add', 'veil/cerpin/taxt')
92
eq(list(b.unknowns()), [])
94
# Check whacky paths work
95
self.build_tree(['cicatriz/', 'cicatriz/esp'])
96
eq(list(b.unknowns()), ['cicatriz'])
97
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
98
eq(list(b.unknowns()), [])
100
def test_add_in_versioned(self):
101
"""Try to add a file in a versioned directory.
103
"bzr add" should do this happily.
105
from bzrlib.branch import Branch
106
eq = self.assertEqual
108
b = Branch.initialize('.')
110
self.build_tree(['inertiatic/', 'inertiatic/esp'])
111
eq(list(b.unknowns()), ['inertiatic'])
112
self.run_bzr('add', '--no-recurse', 'inertiatic')
113
eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
114
self.run_bzr('add', 'inertiatic/esp')
115
eq(list(b.unknowns()), [])
117
def test_subdir_add(self):
118
"""Add in subdirectory should add only things from there down"""
120
from bzrlib.branch import Branch
122
eq = self.assertEqual
126
b = Branch.initialize('.')
128
self.build_tree(['src/', 'README'])
130
eq(sorted(b.unknowns()),
133
self.run_bzr('add', 'src')
135
self.build_tree(['src/foo.c'])
140
eq(sorted(b.unknowns()),
142
eq(len(t.read_working_inventory()), 3)
146
eq(list(b.unknowns()), [])
150
def check_branch(self):
151
"""After all the above changes, run the check and upgrade commands.
153
The upgrade should be a no-op."""
155
mutter('branch has %d revisions', b.revno())
157
mutter('check branch...')
158
from bzrlib.check import check
163
class SubdirCommit(TestCaseInTempDir):
165
def test_subdir_commit(self):
166
"""Test committing a subdirectory, and committing within a directory."""
167
run_bzr = self.run_bzr
168
eq = self.assertEqual
170
self.build_tree(['a/', 'b/'])
175
for fn in ('a/one', 'b/two', 'top'):
176
file(fn, 'w').write('old contents')
179
run_bzr('commit', '-m', 'first revision')
181
for fn in ('a/one', 'b/two', 'top'):
182
file(fn, 'w').write('new contents')
184
mutter('start selective subdir commit')
185
run_bzr('commit', 'a', '-m', 'commit a only')
187
old = b.revision_tree(b.get_rev_id(1))
188
new = b.revision_tree(b.get_rev_id(2))
190
eq(new.get_file_by_path('b/two').read(), 'old contents')
191
eq(new.get_file_by_path('top').read(), 'old contents')
192
eq(new.get_file_by_path('a/one').read(), 'new contents')
195
# commit from here should do nothing
196
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
197
v3 = b.revision_tree(b.get_rev_id(3))
198
eq(v3.get_file_by_path('b/two').read(), 'old contents')
199
eq(v3.get_file_by_path('top').read(), 'old contents')
200
eq(v3.get_file_by_path('a/one').read(), 'new contents')
202
# commit in subdirectory commits whole tree
203
run_bzr('commit', '-m', 'commit whole tree from subdir')
204
v4 = b.revision_tree(b.get_rev_id(4))
205
eq(v4.get_file_by_path('b/two').read(), 'new contents')
206
eq(v4.get_file_by_path('top').read(), 'new contents')
208
# TODO: factor out some kind of assert_tree_state() method
211
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
