1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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.selftest import InTempDir, BzrTestBase
25
26
from bzrlib.branch import Branch
26
from bzrlib.osutils import pathjoin
27
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
from bzrlib.trace import mutter
29
from bzrlib.workingtree import WorkingTree
32
class TestMkdir(TestCaseWithTransport):
34
def test_mkdir_fails_cleanly(self):
35
"""'mkdir' fails cleanly when no working tree is available.
36
https://bugs.edge.launchpad.net/bzr/+bug/138600
38
# Since there is a safety working tree above us, we create a bare repo
40
shared_repo = self.make_repository('.')
41
self.run_bzr(['mkdir', 'abc'], retcode=3)
42
self.failIfExists('abc')
45
class TestVersioning(TestCaseInTempDir):
29
class Mkdir(InTempDir):
48
31
"""Basic 'bzr mkdir' operation"""
32
from bzrlib.commands import run_bzr
51
self.run_bzr(['mkdir', 'foo'])
35
run_bzr(['mkdir', 'foo'])
52
36
self.assert_(os.path.isdir('foo'))
54
self.run_bzr(['mkdir', 'foo'], retcode=3)
56
wt = WorkingTree.open('.')
58
delta = wt.changes_from(wt.basis_tree())
60
self.log('delta.added = %r' % delta.added)
38
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
40
from bzrlib.diff import compare_trees, TreeDelta
41
from bzrlib.branch import Branch
44
delta = compare_trees(b.basis_tree(), b.working_tree())
62
46
self.assertEquals(len(delta.added), 1)
63
47
self.assertEquals(delta.added[0][0], 'foo')
64
48
self.failIf(delta.modified)
66
def test_mkdir_in_subdir(self):
67
"""'bzr mkdir' operation in subdirectory"""
70
self.run_bzr(['mkdir', 'dir'])
71
self.assert_(os.path.isdir('dir'))
74
self.log('Run mkdir in subdir')
75
self.run_bzr(['mkdir', 'subdir'])
76
self.assert_(os.path.isdir('subdir'))
79
wt = WorkingTree.open('.')
81
delta = wt.changes_from(wt.basis_tree())
83
self.log('delta.added = %r' % delta.added)
85
self.assertEquals(len(delta.added), 2)
86
self.assertEquals(delta.added[0][0], 'dir')
87
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
88
self.failIf(delta.modified)
90
def test_mkdir_w_nested_trees(self):
91
"""'bzr mkdir' with nested trees"""
102
self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
103
self.failUnless(os.path.isdir('dir'))
104
self.failUnless(os.path.isdir('a/dir'))
105
self.failUnless(os.path.isdir('a/b/dir'))
107
wt = WorkingTree.open('.')
108
wt_a = WorkingTree.open('a')
109
wt_b = WorkingTree.open('a/b')
111
delta = wt.changes_from(wt.basis_tree())
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(delta.added[0][0], 'dir')
114
self.failIf(delta.modified)
116
delta = wt_a.changes_from(wt_a.basis_tree())
117
self.assertEquals(len(delta.added), 1)
118
self.assertEquals(delta.added[0][0], 'dir')
119
self.failIf(delta.modified)
121
delta = wt_b.changes_from(wt_b.basis_tree())
122
self.assertEquals(len(delta.added), 1)
123
self.assertEquals(delta.added[0][0], 'dir')
124
self.failIf(delta.modified)
126
def check_branch(self):
127
"""After all the above changes, run the check and upgrade commands.
129
The upgrade should be a no-op."""
130
b = Branch.open(u'.')
131
mutter('branch has %d revisions', b.revno())
133
mutter('check branch...')
134
from bzrlib.check import check
138
class SubdirCommit(TestCaseWithTransport):
140
def test_subdir_commit(self):
141
"""Test committing a subdirectory, and committing a directory."""
142
tree = self.make_branch_and_tree('.')
52
class AddInUnversioned(InTempDir):
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,
72
class SubdirCommit(BzrTestBase):
74
"""Test committing a subdirectory, and committing within a directory."""
75
run_bzr = self.run_bzr
144
78
self.build_tree(['a/', 'b/'])
145
def set_contents(contents):
146
self.build_tree_contents([
151
set_contents('old contents')
152
tree.smart_add(['.'])
153
tree.commit('first revision')
154
set_contents('new contents')
156
mutter('start selective subdir commit')
157
self.run_bzr(['commit', 'a', '-m', 'commit a only'])
159
new = b.repository.revision_tree(b.get_rev_id(2))
162
self.assertEqual(new.get_file_by_path('b/two').read(), 'old contents')
163
self.assertEqual(new.get_file_by_path('top').read(), 'old contents')
164
self.assertEqual(new.get_file_by_path('a/one').read(), 'new contents')
83
for fn in ('a/one', 'b/two', 'top'):
84
file(fn, 'w').write('old contents')
87
run_bzr('commit', '-m', 'first revision')
89
for fn in ('a/one', 'b/two', 'top'):
90
file(fn, 'w').write('new contents')
92
run_bzr('commit', 'a', '-m', 'commit a only')
94
old = b.revision_tree(b.lookup_revision(1))
95
new = b.revision_tree(b.lookup_revision(2))
97
eq(new.get_file_by_path('b/two').read(), 'old contents')
98
eq(new.get_file_by_path('top').read(), 'old contents')
99
eq(new.get_file_by_path('a/one').read(), 'new contents')
168
102
# commit from here should do nothing
169
self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
170
v3 = b.repository.revision_tree(b.get_rev_id(3))
172
self.assertEqual(v3.get_file_by_path('b/two').read(), 'old contents')
173
self.assertEqual(v3.get_file_by_path('top').read(), 'old contents')
174
self.assertEqual(v3.get_file_by_path('a/one').read(), 'new contents')
103
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
104
v3 = b.revision_tree(b.lookup_revision(3))
105
eq(v3.get_file_by_path('b/two').read(), 'old contents')
106
eq(v3.get_file_by_path('top').read(), 'old contents')
107
eq(v3.get_file_by_path('a/one').read(), 'new contents')
177
109
# commit in subdirectory commits whole tree
178
self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
179
v4 = b.repository.revision_tree(b.get_rev_id(4))
181
self.assertEqual(v4.get_file_by_path('b/two').read(), 'new contents')
182
self.assertEqual(v4.get_file_by_path('top').read(), 'new contents')
110
run_bzr('commit', '-m', 'commit whole tree from subdir')
111
v4 = b.revision_tree(b.lookup_revision(4))
112
eq(v4.get_file_by_path('b/two').read(), 'new contents')
113
eq(v4.get_file_by_path('top').read(), 'new contents')
185
115
# TODO: factor out some kind of assert_tree_state() method
119
class SubdirAdd(InTempDir):
121
"""Add in subdirectory should add only things from there down"""
123
from bzrlib.branch import Branch
124
from bzrlib.commands import run_bzr
126
eq = self.assertEqual
130
b = Branch('.', init=True)
131
self.build_tree(['src/', 'README'])
133
eq(sorted(b.unknowns()),
136
eq(run_bzr(['add', 'src']), 0)
138
self.build_tree(['src/foo.c'])
141
eq(run_bzr(['add']), 0)
143
eq(sorted(b.unknowns()),
145
eq(len(b.inventory), 3)
148
eq(run_bzr(['add']), 0)
149
eq(list(b.unknowns()), [])
b'\\ No newline at end of file'
added
removed
bzrlib/selftest/versioning.py
