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 adding a file whose directory is not versioned
21
# TODO: test trying to commit within a directory that is not yet added
26
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
27
from bzrlib.branch import Branch
30
logger = logging.getLogger('bzr.test.versioning')
34
class TestVersioning(TestCaseInTempDir):
37
"""Basic 'bzr mkdir' operation"""
38
from bzrlib.commands import run_bzr
41
run_bzr(['mkdir', 'foo'])
42
self.assert_(os.path.isdir('foo'))
44
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
46
from bzrlib.diff import compare_trees
47
from bzrlib.branch import Branch
50
delta = compare_trees(b.basis_tree(), b.working_tree())
52
self.log('delta.added = %r' % delta.added)
54
self.assertEquals(len(delta.added), 1)
55
self.assertEquals(delta.added[0][0], 'foo')
56
self.failIf(delta.modified)
58
def test_add_in_unversioned(self):
59
"""Try to add a file in an unversioned directory.
61
smart_add may eventually add the parent as necessary, but simple
62
branch add doesn't do that.
64
from bzrlib.branch import Branch
65
from bzrlib.errors import NotVersionedError
67
b = Branch('.', init=True)
69
self.build_tree(['foo/',
72
self.assertRaises(NotVersionedError,
79
def test_subdir_add(self):
80
"""Add in subdirectory should add only things from there down"""
82
from bzrlib.branch import Branch
83
from bzrlib.commands import run_bzr
89
b = Branch('.', init=True)
90
self.build_tree(['src/', 'README'])
92
eq(sorted(b.unknowns()),
95
eq(run_bzr(['add', 'src']), 0)
97
self.build_tree(['src/foo.c'])
100
eq(run_bzr(['add']), 0)
102
eq(sorted(b.unknowns()),
104
eq(len(b.inventory), 3)
107
eq(run_bzr(['add']), 0)
108
eq(list(b.unknowns()), [])
113
def check_branch(self):
114
"""After all the above changes, run the check and upgrade commands.
116
The upgrade should be a no-op."""
118
debug('branch has %d revisions', b.revno())
120
debug('check branch...')
121
from bzrlib.check import check
127
class SubdirCommit(TestCaseInTempDir):
129
def test_subdir_commit(self):
130
"""Test committing a subdirectory, and committing within a directory."""
131
run_bzr = self.run_bzr
132
eq = self.assertEqual
134
self.build_tree(['a/', 'b/'])
139
for fn in ('a/one', 'b/two', 'top'):
140
file(fn, 'w').write('old contents')
143
run_bzr('commit', '-m', 'first revision')
145
for fn in ('a/one', 'b/two', 'top'):
146
file(fn, 'w').write('new contents')
148
debug('start selective subdir commit')
149
run_bzr('commit', 'a', '-m', 'commit a only')
151
old = b.revision_tree(b.lookup_revision(1))
152
new = b.revision_tree(b.lookup_revision(2))
154
eq(new.get_file_by_path('b/two').read(), 'old contents')
155
eq(new.get_file_by_path('top').read(), 'old contents')
156
eq(new.get_file_by_path('a/one').read(), 'new contents')
159
# commit from here should do nothing
160
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
161
v3 = b.revision_tree(b.lookup_revision(3))
162
eq(v3.get_file_by_path('b/two').read(), 'old contents')
163
eq(v3.get_file_by_path('top').read(), 'old contents')
164
eq(v3.get_file_by_path('a/one').read(), 'new contents')
166
# commit in subdirectory commits whole tree
167
run_bzr('commit', '-m', 'commit whole tree from subdir')
168
v4 = b.revision_tree(b.lookup_revision(4))
169
eq(v4.get_file_by_path('b/two').read(), 'new contents')
170
eq(v4.get_file_by_path('top').read(), 'new contents')
172
# TODO: factor out some kind of assert_tree_state() method
175
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
