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
29
from bzrlib.workingtree import WorkingTree
32
class TestVersioning(TestCaseInTempDir):
35
"""Basic 'bzr mkdir' operation"""
38
self.run_bzr('mkdir', 'foo')
39
self.assert_(os.path.isdir('foo'))
41
self.run_bzr('mkdir', 'foo', retcode=3)
43
from bzrlib.diff import compare_trees
44
wt = WorkingTree.open('.')
46
delta = compare_trees(wt.basis_tree(), wt)
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
wt = WorkingTree.open('.')
70
delta = compare_trees(wt.basis_tree(), wt)
72
self.log('delta.added = %r' % delta.added)
74
self.assertEquals(len(delta.added), 2)
75
self.assertEquals(delta.added[0][0], 'dir')
76
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
77
self.failIf(delta.modified)
79
def test_mkdir_w_nested_trees(self):
80
"""'bzr mkdir' with nested trees"""
91
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
92
self.failUnless(os.path.isdir('dir'))
93
self.failUnless(os.path.isdir('a/dir'))
94
self.failUnless(os.path.isdir('a/b/dir'))
96
from bzrlib.diff import compare_trees
97
wt = WorkingTree.open('.')
98
wt_a = WorkingTree.open('a')
99
wt_b = WorkingTree.open('a/b')
101
delta = compare_trees(wt.basis_tree(), wt)
102
self.assertEquals(len(delta.added), 1)
103
self.assertEquals(delta.added[0][0], 'dir')
104
self.failIf(delta.modified)
106
delta = compare_trees(wt_a.basis_tree(), wt_a)
107
self.assertEquals(len(delta.added), 1)
108
self.assertEquals(delta.added[0][0], 'dir')
109
self.failIf(delta.modified)
111
delta = compare_trees(wt_b.basis_tree(), wt_b)
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(delta.added[0][0], 'dir')
114
self.failIf(delta.modified)
116
def check_branch(self):
117
"""After all the above changes, run the check and upgrade commands.
119
The upgrade should be a no-op."""
120
b = Branch.open(u'.')
121
mutter('branch has %d revisions', b.revno())
123
mutter('check branch...')
124
from bzrlib.check import check
128
class SubdirCommit(TestCaseInTempDir):
130
def test_subdir_commit(self):
131
"""Test committing a subdirectory, and committing within a directory."""
132
run_bzr = self.run_bzr
133
eq = self.assertEqual
135
self.build_tree(['a/', 'b/'])
138
b = Branch.open(u'.')
140
for fn in ('a/one', 'b/two', 'top'):
141
file(fn, 'w').write('old contents')
144
run_bzr('commit', '-m', 'first revision')
146
for fn in ('a/one', 'b/two', 'top'):
147
file(fn, 'w').write('new contents')
149
mutter('start selective subdir commit')
150
run_bzr('commit', 'a', '-m', 'commit a only')
152
old = b.repository.revision_tree(b.get_rev_id(1))
153
new = b.repository.revision_tree(b.get_rev_id(2))
155
eq(new.get_file_by_path('b/two').read(), 'old contents')
156
eq(new.get_file_by_path('top').read(), 'old contents')
157
eq(new.get_file_by_path('a/one').read(), 'new contents')
160
# commit from here should do nothing
161
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
162
v3 = b.repository.revision_tree(b.get_rev_id(3))
163
eq(v3.get_file_by_path('b/two').read(), 'old contents')
164
eq(v3.get_file_by_path('top').read(), 'old contents')
165
eq(v3.get_file_by_path('a/one').read(), 'new contents')
167
# commit in subdirectory commits whole tree
168
run_bzr('commit', '-m', 'commit whole tree from subdir')
169
v4 = b.repository.revision_tree(b.get_rev_id(4))
170
eq(v4.get_file_by_path('b/two').read(), 'new contents')
171
eq(v4.get_file_by_path('top').read(), 'new contents')
173
# TODO: factor out some kind of assert_tree_state() method
176
if __name__ == '__main__':
added
removed
bzrlib/tests/blackbox/test_versioning.py
