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
25
from bzrlib.selftest import InTempDir, BzrTestBase
26
from bzrlib.branch import Branch
29
class TestVersioning(InTempDir):
32
"""Basic 'bzr mkdir' operation"""
33
from bzrlib.commands import run_bzr
36
run_bzr(['mkdir', 'foo'])
37
self.assert_(os.path.isdir('foo'))
39
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
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_add_in_unversioned(self):
54
"""Try to add a file in an unversioned directory.
56
smart_add may eventually add the parent as necessary, but simple
57
branch add doesn't do that.
59
from bzrlib.branch import Branch
60
from bzrlib.errors import NotVersionedError
62
b = Branch('.', init=True)
64
self.build_tree(['foo/',
67
self.assertRaises(NotVersionedError,
71
def test_subdir_add(self):
72
"""Add in subdirectory should add only things from there down"""
74
from bzrlib.branch import Branch
75
from bzrlib.commands import run_bzr
81
b = Branch('.', init=True)
82
self.build_tree(['src/', 'README'])
84
eq(sorted(b.unknowns()),
87
eq(run_bzr(['add', 'src']), 0)
89
self.build_tree(['src/foo.c'])
92
eq(run_bzr(['add']), 0)
94
eq(sorted(b.unknowns()),
96
eq(len(b.inventory), 3)
99
eq(run_bzr(['add']), 0)
100
eq(list(b.unknowns()), [])
103
class SubdirCommit(BzrTestBase):
105
def test_subdir_commit(self):
106
"""Test committing a subdirectory, and committing within a directory."""
107
run_bzr = self.run_bzr
108
eq = self.assertEqual
110
self.build_tree(['a/', 'b/'])
115
for fn in ('a/one', 'b/two', 'top'):
116
file(fn, 'w').write('old contents')
119
run_bzr('commit', '-m', 'first revision')
121
for fn in ('a/one', 'b/two', 'top'):
122
file(fn, 'w').write('new contents')
124
run_bzr('commit', 'a', '-m', 'commit a only')
126
old = b.revision_tree(b.lookup_revision(1))
127
new = b.revision_tree(b.lookup_revision(2))
129
eq(new.get_file_by_path('b/two').read(), 'old contents')
130
eq(new.get_file_by_path('top').read(), 'old contents')
131
eq(new.get_file_by_path('a/one').read(), 'new contents')
134
# commit from here should do nothing
135
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
136
v3 = b.revision_tree(b.lookup_revision(3))
137
eq(v3.get_file_by_path('b/two').read(), 'old contents')
138
eq(v3.get_file_by_path('top').read(), 'old contents')
139
eq(v3.get_file_by_path('a/one').read(), 'new contents')
141
# commit in subdirectory commits whole tree
142
run_bzr('commit', '-m', 'commit whole tree from subdir')
143
v4 = b.revision_tree(b.lookup_revision(4))
144
eq(v4.get_file_by_path('b/two').read(), 'new contents')
145
eq(v4.get_file_by_path('top').read(), 'new contents')
147
# TODO: factor out some kind of assert_tree_state() method
added
removed
bzrlib/selftest/versioning.py
