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 Mkdir(InTempDir):
31
"""Basic 'bzr mkdir' operation"""
32
from bzrlib.commands import run_bzr
35
run_bzr(['mkdir', 'foo'])
36
self.assert_(os.path.isdir('foo'))
38
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
40
from bzrlib.diff import compare_trees
41
from bzrlib.branch import Branch
44
delta = compare_trees(b.basis_tree(), b.working_tree())
46
self.log('delta.added = %r' % delta.added)
48
self.assertEquals(len(delta.added), 1)
49
self.assertEquals(delta.added[0][0], 'foo')
50
self.failIf(delta.modified)
54
class AddInUnversioned(InTempDir):
56
"""Try to add a file in an unversioned directory.
58
smart_add may eventually add the parent as necessary, but simple
59
branch add doesn't do that.
61
from bzrlib.branch import Branch
62
from bzrlib.errors import NotVersionedError
64
b = Branch('.', init=True)
66
self.build_tree(['foo/',
69
self.assertRaises(NotVersionedError,
74
class SubdirCommit(BzrTestBase):
76
"""Test committing a subdirectory, and committing within a directory."""
77
run_bzr = self.run_bzr
80
self.build_tree(['a/', 'b/'])
85
for fn in ('a/one', 'b/two', 'top'):
86
file(fn, 'w').write('old contents')
89
run_bzr('commit', '-m', 'first revision')
91
for fn in ('a/one', 'b/two', 'top'):
92
file(fn, 'w').write('new contents')
94
run_bzr('commit', 'a', '-m', 'commit a only')
96
old = b.revision_tree(b.lookup_revision(1))
97
new = b.revision_tree(b.lookup_revision(2))
99
eq(new.get_file_by_path('b/two').read(), 'old contents')
100
eq(new.get_file_by_path('top').read(), 'old contents')
101
eq(new.get_file_by_path('a/one').read(), 'new contents')
104
# commit from here should do nothing
105
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
106
v3 = b.revision_tree(b.lookup_revision(3))
107
eq(v3.get_file_by_path('b/two').read(), 'old contents')
108
eq(v3.get_file_by_path('top').read(), 'old contents')
109
eq(v3.get_file_by_path('a/one').read(), 'new contents')
111
# commit in subdirectory commits whole tree
112
run_bzr('commit', '-m', 'commit whole tree from subdir')
113
v4 = b.revision_tree(b.lookup_revision(4))
114
eq(v4.get_file_by_path('b/two').read(), 'new contents')
115
eq(v4.get_file_by_path('top').read(), 'new contents')
117
# TODO: factor out some kind of assert_tree_state() method
121
class SubdirAdd(InTempDir):
123
"""Add in subdirectory should add only things from there down"""
125
from bzrlib.branch import Branch
126
from bzrlib.commands import run_bzr
128
eq = self.assertEqual
132
b = Branch('.', init=True)
133
self.build_tree(['src/', 'README'])
135
eq(sorted(b.unknowns()),
138
eq(run_bzr(['add', 'src']), 0)
140
self.build_tree(['src/foo.c'])
143
eq(run_bzr(['add']), 0)
145
eq(sorted(b.unknowns()),
147
eq(len(b.inventory), 3)
150
eq(run_bzr(['add']), 0)
151
eq(list(b.unknowns()), [])
added
removed
bzrlib/selftest/versioning.py
