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.tests import BzrTestBase, TestCaseInTempDir
26
from bzrlib.branch import Branch
27
from bzrlib.trace import mutter
28
from bzrlib.osutils import pathjoin
31
class TestVersioning(TestCaseInTempDir):
34
"""Basic 'bzr mkdir' operation"""
37
self.run_bzr('mkdir', 'foo')
38
self.assert_(os.path.isdir('foo'))
40
self.run_bzr('mkdir', 'foo', retcode=3)
42
from bzrlib.diff import compare_trees
43
from bzrlib.branch import Branch
46
delta = compare_trees(b.basis_tree(), b.working_tree())
48
self.log('delta.added = %r' % delta.added)
50
self.assertEquals(len(delta.added), 1)
51
self.assertEquals(delta.added[0][0], 'foo')
52
self.failIf(delta.modified)
54
def test_mkdir_in_subdir(self):
55
"""'bzr mkdir' operation in subdirectory"""
58
self.run_bzr('mkdir', 'dir')
59
self.assert_(os.path.isdir('dir'))
62
self.log('Run mkdir in subdir')
63
self.run_bzr('mkdir', 'subdir')
64
self.assert_(os.path.isdir('subdir'))
67
from bzrlib.diff import compare_trees
68
from bzrlib.branch import Branch
71
delta = compare_trees(b.basis_tree(), b.working_tree())
73
self.log('delta.added = %r' % delta.added)
75
self.assertEquals(len(delta.added), 2)
76
self.assertEquals(delta.added[0][0], 'dir')
77
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
78
self.failIf(delta.modified)
80
def test_mkdir_w_nested_trees(self):
81
"""'bzr mkdir' with nested trees"""
92
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
93
self.failUnless(os.path.isdir('dir'))
94
self.failUnless(os.path.isdir('a/dir'))
95
self.failUnless(os.path.isdir('a/b/dir'))
97
from bzrlib.diff import compare_trees
99
b_a = Branch.open('a')
100
b_b = Branch.open('a/b')
102
delta = compare_trees(b.basis_tree(), b.working_tree())
103
self.assertEquals(len(delta.added), 1)
104
self.assertEquals(delta.added[0][0], 'dir')
105
self.failIf(delta.modified)
107
delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
108
self.assertEquals(len(delta.added), 1)
109
self.assertEquals(delta.added[0][0], 'dir')
110
self.failIf(delta.modified)
112
delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
113
self.assertEquals(len(delta.added), 1)
114
self.assertEquals(delta.added[0][0], 'dir')
115
self.failIf(delta.modified)
117
def check_branch(self):
118
"""After all the above changes, run the check and upgrade commands.
120
The upgrade should be a no-op."""
121
b = Branch.open(u'.')
122
mutter('branch has %d revisions', b.revno())
124
mutter('check branch...')
125
from bzrlib.check import check
129
class SubdirCommit(TestCaseInTempDir):
131
def test_subdir_commit(self):
132
"""Test committing a subdirectory, and committing within a directory."""
133
run_bzr = self.run_bzr
134
eq = self.assertEqual
136
self.build_tree(['a/', 'b/'])
139
b = Branch.open(u'.')
141
for fn in ('a/one', 'b/two', 'top'):
142
file(fn, 'w').write('old contents')
145
run_bzr('commit', '-m', 'first revision')
147
for fn in ('a/one', 'b/two', 'top'):
148
file(fn, 'w').write('new contents')
150
mutter('start selective subdir commit')
151
run_bzr('commit', 'a', '-m', 'commit a only')
153
old = b.revision_tree(b.get_rev_id(1))
154
new = b.revision_tree(b.get_rev_id(2))
156
eq(new.get_file_by_path('b/two').read(), 'old contents')
157
eq(new.get_file_by_path('top').read(), 'old contents')
158
eq(new.get_file_by_path('a/one').read(), 'new contents')
161
# commit from here should do nothing
162
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
163
v3 = b.revision_tree(b.get_rev_id(3))
164
eq(v3.get_file_by_path('b/two').read(), 'old contents')
165
eq(v3.get_file_by_path('top').read(), 'old contents')
166
eq(v3.get_file_by_path('a/one').read(), 'new contents')
168
# commit in subdirectory commits whole tree
169
run_bzr('commit', '-m', 'commit whole tree from subdir')
170
v4 = b.revision_tree(b.get_rev_id(4))
171
eq(v4.get_file_by_path('b/two').read(), 'new contents')
172
eq(v4.get_file_by_path('top').read(), 'new contents')
174
# TODO: factor out some kind of assert_tree_state() method
177
if __name__ == '__main__':
added
removed
bzrlib/tests/blackbox/test_versioning.py
