1
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests of simple versioning operations"""
20
# TODO: test adding a file whose directory is not versioned
20
21
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
26
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
27
from bzrlib.branch import Branch
27
from bzrlib.trace import mutter
28
from bzrlib.osutils import pathjoin
29
from bzrlib.workingtree import WorkingTree
30
logger = logging.getLogger('bzr.test.versioning')
32
34
class TestVersioning(TestCaseInTempDir):
34
36
def test_mkdir(self):
35
37
"""Basic 'bzr mkdir' operation"""
38
from bzrlib.commands import run_bzr
38
self.run_bzr('mkdir', 'foo')
41
run_bzr(['mkdir', 'foo'])
39
42
self.assert_(os.path.isdir('foo'))
41
self.run_bzr('mkdir', 'foo', retcode=3)
44
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
43
wt = WorkingTree.open('.')
46
from bzrlib.diff import compare_trees
47
from bzrlib.branch import Branch
45
delta = wt.changes_from(wt.basis_tree())
50
delta = compare_trees(b.basis_tree(), b.working_tree())
47
52
self.log('delta.added = %r' % delta.added)
50
55
self.assertEquals(delta.added[0][0], 'foo')
51
56
self.failIf(delta.modified)
53
def test_mkdir_in_subdir(self):
54
"""'bzr mkdir' operation in subdirectory"""
57
self.run_bzr('mkdir', 'dir')
58
self.assert_(os.path.isdir('dir'))
61
self.log('Run mkdir in subdir')
62
self.run_bzr('mkdir', 'subdir')
63
self.assert_(os.path.isdir('subdir'))
66
wt = WorkingTree.open('.')
68
delta = wt.changes_from(wt.basis_tree())
70
self.log('delta.added = %r' % delta.added)
72
self.assertEquals(len(delta.added), 2)
73
self.assertEquals(delta.added[0][0], 'dir')
74
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
75
self.failIf(delta.modified)
77
def test_mkdir_w_nested_trees(self):
78
"""'bzr mkdir' with nested trees"""
89
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
90
self.failUnless(os.path.isdir('dir'))
91
self.failUnless(os.path.isdir('a/dir'))
92
self.failUnless(os.path.isdir('a/b/dir'))
94
wt = WorkingTree.open('.')
95
wt_a = WorkingTree.open('a')
96
wt_b = WorkingTree.open('a/b')
98
delta = wt.changes_from(wt.basis_tree())
99
self.assertEquals(len(delta.added), 1)
100
self.assertEquals(delta.added[0][0], 'dir')
101
self.failIf(delta.modified)
103
delta = wt_a.changes_from(wt_a.basis_tree())
104
self.assertEquals(len(delta.added), 1)
105
self.assertEquals(delta.added[0][0], 'dir')
106
self.failIf(delta.modified)
108
delta = wt_b.changes_from(wt_b.basis_tree())
109
self.assertEquals(len(delta.added), 1)
110
self.assertEquals(delta.added[0][0], 'dir')
111
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
113
def check_branch(self):
114
114
"""After all the above changes, run the check and upgrade commands.
116
116
The upgrade should be a no-op."""
117
b = Branch.open(u'.')
118
mutter('branch has %d revisions', b.revno())
118
debug('branch has %d revisions', b.revno())
120
mutter('check branch...')
120
debug('check branch...')
121
121
from bzrlib.check import check
125
127
class SubdirCommit(TestCaseInTempDir):
127
129
def test_subdir_commit(self):
143
145
for fn in ('a/one', 'b/two', 'top'):
144
146
file(fn, 'w').write('new contents')
146
mutter('start selective subdir commit')
148
debug('start selective subdir commit')
147
149
run_bzr('commit', 'a', '-m', 'commit a only')
149
old = b.repository.revision_tree(b.get_rev_id(1))
150
new = b.repository.revision_tree(b.get_rev_id(2))
151
old = b.revision_tree(b.lookup_revision(1))
152
new = b.revision_tree(b.lookup_revision(2))
152
154
eq(new.get_file_by_path('b/two').read(), 'old contents')
153
155
eq(new.get_file_by_path('top').read(), 'old contents')
157
159
# commit from here should do nothing
158
160
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
159
v3 = b.repository.revision_tree(b.get_rev_id(3))
161
v3 = b.revision_tree(b.lookup_revision(3))
160
162
eq(v3.get_file_by_path('b/two').read(), 'old contents')
161
163
eq(v3.get_file_by_path('top').read(), 'old contents')
162
164
eq(v3.get_file_by_path('a/one').read(), 'new contents')
164
166
# commit in subdirectory commits whole tree
165
167
run_bzr('commit', '-m', 'commit whole tree from subdir')
166
v4 = b.repository.revision_tree(b.get_rev_id(4))
168
v4 = b.revision_tree(b.lookup_revision(4))
167
169
eq(v4.get_file_by_path('b/two').read(), 'new contents')
168
170
eq(v4.get_file_by_path('top').read(), 'new contents')
added
removed
bzrlib/selftest/versioning.py
