25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
25
from bzrlib.branch import Branch
29
logger = logging.getLogger('bzr.test.versioning')
33
class TestVersioning(TestCaseInTempDir):
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.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.assertPathDoesNotExist('abc')
36
45
"""Basic 'bzr mkdir' operation"""
37
from bzrlib.commands import run_bzr
40
run_bzr(['mkdir', 'foo'])
41
self.assert_(os.path.isdir('foo'))
43
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
45
from bzrlib.diff import compare_trees
46
from bzrlib.branch import Branch
49
delta = compare_trees(b.basis_tree(), b.working_tree())
51
self.log('delta.added = %r' % delta.added)
53
self.assertEquals(len(delta.added), 1)
54
self.assertEquals(delta.added[0][0], 'foo')
55
self.failIf(delta.modified)
57
def test_branch_add_in_unversioned(self):
58
"""Try to add a file in an unversioned directory.
60
"bzr add" adds the parent as necessary, but simple branch add
63
from bzrlib.branch import Branch
64
from bzrlib.errors import NotVersionedError
66
b = Branch.initialize('.')
68
self.build_tree(['foo/',
71
self.assertRaises(NotVersionedError,
77
def test_add_in_unversioned(self):
78
"""Try to add a file in an unversioned directory.
80
"bzr add" should add the parent(s) as necessary.
82
from bzrlib.branch import Branch
83
from bzrlib.commands import run_bzr
86
b = Branch.initialize('.')
88
self.build_tree(['inertiatic/', 'inertiatic/esp'])
89
eq(list(b.unknowns()), ['inertiatic'])
90
run_bzr(['add', 'inertiatic/esp'])
91
eq(list(b.unknowns()), [])
93
# Multiple unversioned parents
94
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
95
eq(list(b.unknowns()), ['veil'])
96
run_bzr(['add', 'veil/cerpin/taxt'])
97
eq(list(b.unknowns()), [])
99
# Check whacky paths work
100
self.build_tree(['cicatriz/', 'cicatriz/esp'])
101
eq(list(b.unknowns()), ['cicatriz'])
102
run_bzr(['add', 'inertiatic/../cicatriz/esp'])
103
eq(list(b.unknowns()), [])
105
def test_add_in_versioned(self):
106
"""Try to add a file in a versioned directory.
108
"bzr add" should do this happily.
110
from bzrlib.branch import Branch
111
from bzrlib.commands import run_bzr
112
eq = self.assertEqual
114
b = Branch.initialize('.')
116
self.build_tree(['inertiatic/', 'inertiatic/esp'])
117
eq(list(b.unknowns()), ['inertiatic'])
118
run_bzr(['add', '--no-recurse', 'inertiatic'])
119
eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
120
run_bzr(['add', 'inertiatic/esp'])
121
eq(list(b.unknowns()), [])
123
def test_subdir_add(self):
124
"""Add in subdirectory should add only things from there down"""
126
from bzrlib.branch import Branch
127
from bzrlib.commands import run_bzr
129
eq = self.assertEqual
133
b = Branch.initialize('.')
134
self.build_tree(['src/', 'README'])
136
eq(sorted(b.unknowns()),
139
eq(run_bzr(['add', 'src']), 0)
141
self.build_tree(['src/foo.c'])
144
eq(run_bzr(['add']), 0)
146
eq(sorted(b.unknowns()),
148
eq(len(b.inventory), 3)
151
eq(run_bzr(['add']), 0)
152
eq(list(b.unknowns()), [])
156
def check_branch(self):
157
"""After all the above changes, run the check and upgrade commands.
159
The upgrade should be a no-op."""
161
debug('branch has %d revisions', b.revno())
163
debug('check branch...')
164
from bzrlib.check import check
169
class SubdirCommit(TestCaseInTempDir):
47
self.make_branch_and_tree('.')
48
self.run_bzr(['mkdir', 'foo'])
49
self.assertTrue(os.path.isdir('foo'))
51
self.run_bzr(['mkdir', 'foo'], retcode=3)
53
wt = WorkingTree.open('.')
55
delta = wt.changes_from(wt.basis_tree())
57
self.log('delta.added = %r' % delta.added)
59
self.assertEqual(len(delta.added), 1)
60
self.assertEqual(delta.added[0][0], 'foo')
61
self.assertFalse(delta.modified)
63
def test_mkdir_in_subdir(self):
64
"""'bzr mkdir' operation in subdirectory"""
66
self.make_branch_and_tree('.')
67
self.run_bzr(['mkdir', 'dir'])
68
self.assertTrue(os.path.isdir('dir'))
70
self.log('Run mkdir in subdir')
71
self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
72
self.assertTrue(os.path.isdir('dir/subdir'))
74
wt = WorkingTree.open('.')
76
delta = wt.changes_from(wt.basis_tree())
78
self.log('delta.added = %r' % delta.added)
80
self.assertEqual(len(delta.added), 2)
81
self.assertEqual(delta.added[0][0], 'dir')
82
self.assertEqual(delta.added[1][0], pathjoin('dir','subdir'))
83
self.assertFalse(delta.modified)
85
def test_mkdir_w_nested_trees(self):
86
"""'bzr mkdir' with nested trees"""
88
self.make_branch_and_tree('.')
89
self.make_branch_and_tree('a')
90
self.make_branch_and_tree('a/b')
92
self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
93
self.assertTrue(os.path.isdir('dir'))
94
self.assertTrue(os.path.isdir('a/dir'))
95
self.assertTrue(os.path.isdir('a/b/dir'))
97
wt = WorkingTree.open('.')
98
wt_a = WorkingTree.open('a')
99
wt_b = WorkingTree.open('a/b')
101
delta = wt.changes_from(wt.basis_tree())
102
self.assertEqual(len(delta.added), 1)
103
self.assertEqual(delta.added[0][0], 'dir')
104
self.assertFalse(delta.modified)
106
delta = wt_a.changes_from(wt_a.basis_tree())
107
self.assertEqual(len(delta.added), 1)
108
self.assertEqual(delta.added[0][0], 'dir')
109
self.assertFalse(delta.modified)
111
delta = wt_b.changes_from(wt_b.basis_tree())
112
self.assertEqual(len(delta.added), 1)
113
self.assertEqual(delta.added[0][0], 'dir')
114
self.assertFalse(delta.modified)
116
def test_mkdir_quiet(self):
117
"""'bzr mkdir --quiet' should not print a status message"""
119
self.make_branch_and_tree('.')
120
out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
121
self.assertEqual('', err)
122
self.assertEqual('', out)
125
class SubdirCommit(TestCaseWithTransport):
171
127
def test_subdir_commit(self):
172
"""Test committing a subdirectory, and committing within a directory."""
173
run_bzr = self.run_bzr
174
eq = self.assertEqual
128
"""Test committing a subdirectory, and committing a directory."""
129
tree = self.make_branch_and_tree('.')
176
131
self.build_tree(['a/', 'b/'])
181
for fn in ('a/one', 'b/two', 'top'):
182
file(fn, 'w').write('old contents')
185
run_bzr('commit', '-m', 'first revision')
187
for fn in ('a/one', 'b/two', 'top'):
188
file(fn, 'w').write('new contents')
190
debug('start selective subdir commit')
191
run_bzr('commit', 'a', '-m', 'commit a only')
193
old = b.revision_tree(b.get_rev_id(1))
194
new = b.revision_tree(b.get_rev_id(2))
196
eq(new.get_file_by_path('b/two').read(), 'old contents')
197
eq(new.get_file_by_path('top').read(), 'old contents')
198
eq(new.get_file_by_path('a/one').read(), 'new contents')
132
def set_contents(contents):
133
self.build_tree_contents([
138
set_contents('old contents')
139
tree.smart_add(['.'])
140
tree.commit('first revision')
141
set_contents('new contents')
143
mutter('start selective subdir commit')
144
self.run_bzr(['commit', 'a', '-m', 'commit a only'])
146
new = b.repository.revision_tree(b.get_rev_id(2))
149
def get_text_by_path(tree, path):
150
return tree.get_file_text(tree.path2id(path), path)
152
self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
153
self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
154
self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
201
157
# commit from here should do nothing
202
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
203
v3 = b.revision_tree(b.get_rev_id(3))
204
eq(v3.get_file_by_path('b/two').read(), 'old contents')
205
eq(v3.get_file_by_path('top').read(), 'old contents')
206
eq(v3.get_file_by_path('a/one').read(), 'new contents')
158
self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'],
160
v3 = b.repository.revision_tree(b.get_rev_id(3))
162
self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
163
self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
164
self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
208
167
# commit in subdirectory commits whole tree
209
run_bzr('commit', '-m', 'commit whole tree from subdir')
210
v4 = b.revision_tree(b.get_rev_id(4))
211
eq(v4.get_file_by_path('b/two').read(), 'new contents')
212
eq(v4.get_file_by_path('top').read(), 'new contents')
168
self.run_bzr(['commit', '-m', 'commit whole tree from subdir'],
170
v4 = b.repository.revision_tree(b.get_rev_id(4))
172
self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
173
self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
214
176
# TODO: factor out some kind of assert_tree_state() method
217
if __name__ == '__main__':