25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
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.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')
29
logger = logging.getLogger('bzr.test.versioning')
33
class TestVersioning(TestCaseInTempDir):
45
36
"""Basic 'bzr mkdir' operation"""
37
from bzrlib.commands import run_bzr
47
self.make_branch_and_tree('.')
48
self.run_bzr(['mkdir', 'foo'])
40
run_bzr(['mkdir', 'foo'])
49
41
self.assert_(os.path.isdir('foo'))
51
self.run_bzr(['mkdir', 'foo'], retcode=3)
53
wt = WorkingTree.open('.')
55
delta = wt.changes_from(wt.basis_tree())
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())
57
51
self.log('delta.added = %r' % delta.added)
59
53
self.assertEquals(len(delta.added), 1)
60
54
self.assertEquals(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.assert_(os.path.isdir('dir'))
70
self.log('Run mkdir in subdir')
71
self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
72
self.assert_(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.assertEquals(len(delta.added), 2)
81
self.assertEquals(delta.added[0][0], 'dir')
82
self.assertEquals(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.assertEquals(len(delta.added), 1)
103
self.assertEquals(delta.added[0][0], 'dir')
104
self.assertFalse(delta.modified)
106
delta = wt_a.changes_from(wt_a.basis_tree())
107
self.assertEquals(len(delta.added), 1)
108
self.assertEquals(delta.added[0][0], 'dir')
109
self.assertFalse(delta.modified)
111
delta = wt_b.changes_from(wt_b.basis_tree())
112
self.assertEquals(len(delta.added), 1)
113
self.assertEquals(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.assertEquals('', err)
122
self.assertEquals('', out)
125
class SubdirCommit(TestCaseWithTransport):
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,
75
self.check_and_upgrade()
78
def test_add_in_unversioned(self):
79
"""Try to add a file in an unversioned directory.
81
"bzr add" should add the parent(s) as necessary.
83
from bzrlib.branch import Branch
84
from bzrlib.commands import run_bzr
87
b = Branch.initialize('.')
89
self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
eq(list(b.unknowns()), ['inertiatic'])
91
run_bzr(['add', 'inertiatic/esp'])
92
eq(list(b.unknowns()), [])
94
# Multiple unversioned parents
95
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
96
eq(list(b.unknowns()), ['veil'])
97
run_bzr(['add', 'veil/cerpin/taxt'])
98
eq(list(b.unknowns()), [])
100
# Check whacky paths work
101
self.build_tree(['cicatriz/', 'cicatriz/esp'])
102
eq(list(b.unknowns()), ['cicatriz'])
103
run_bzr(['add', 'inertiatic/../cicatriz/esp'])
104
eq(list(b.unknowns()), [])
106
def test_add_in_versioned(self):
107
"""Try to add a file in a versioned directory.
109
"bzr add" should do this happily.
111
from bzrlib.branch import Branch
112
from bzrlib.commands import run_bzr
113
eq = self.assertEqual
115
b = Branch.initialize('.')
117
self.build_tree(['inertiatic/', 'inertiatic/esp'])
118
eq(list(b.unknowns()), ['inertiatic'])
119
run_bzr(['add', '--no-recurse', 'inertiatic'])
120
eq(list(b.unknowns()), ['inertiatic/esp'])
121
run_bzr(['add', 'inertiatic/esp'])
122
eq(list(b.unknowns()), [])
124
def test_subdir_add(self):
125
"""Add in subdirectory should add only things from there down"""
127
from bzrlib.branch import Branch
128
from bzrlib.commands import run_bzr
130
eq = self.assertEqual
134
b = Branch.initialize('.')
135
self.build_tree(['src/', 'README'])
137
eq(sorted(b.unknowns()),
140
eq(run_bzr(['add', 'src']), 0)
142
self.build_tree(['src/foo.c'])
145
eq(run_bzr(['add']), 0)
147
eq(sorted(b.unknowns()),
149
eq(len(b.inventory), 3)
152
eq(run_bzr(['add']), 0)
153
eq(list(b.unknowns()), [])
155
self.check_and_upgrade()
158
def check_and_upgrade(self):
159
"""After all the above changes, run the check and upgrade commands.
161
The upgrade should be a no-op."""
163
debug('branch has %d revisions', b.revno())
165
debug('check branch...')
166
from bzrlib.check import check
169
debug('upgrade branch...')
170
from bzrlib.upgrade import upgrade
173
debug('check branch...')
174
from bzrlib.check import check
179
class SubdirCommit(TestCaseInTempDir):
127
181
def test_subdir_commit(self):
128
"""Test committing a subdirectory, and committing a directory."""
129
tree = self.make_branch_and_tree('.')
182
"""Test committing a subdirectory, and committing within a directory."""
183
run_bzr = self.run_bzr
184
eq = self.assertEqual
131
186
self.build_tree(['a/', 'b/'])
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')
191
for fn in ('a/one', 'b/two', 'top'):
192
file(fn, 'w').write('old contents')
195
run_bzr('commit', '-m', 'first revision')
197
for fn in ('a/one', 'b/two', 'top'):
198
file(fn, 'w').write('new contents')
200
run_bzr('commit', 'a', '-m', 'commit a only')
202
old = b.revision_tree(b.get_rev_id(1))
203
new = b.revision_tree(b.get_rev_id(2))
205
eq(new.get_file_by_path('b/two').read(), 'old contents')
206
eq(new.get_file_by_path('top').read(), 'old contents')
207
eq(new.get_file_by_path('a/one').read(), 'new contents')
157
210
# commit from here should do nothing
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')
211
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
212
v3 = b.revision_tree(b.get_rev_id(3))
213
eq(v3.get_file_by_path('b/two').read(), 'old contents')
214
eq(v3.get_file_by_path('top').read(), 'old contents')
215
eq(v3.get_file_by_path('a/one').read(), 'new contents')
167
217
# commit in subdirectory commits whole tree
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')
218
run_bzr('commit', '-m', 'commit whole tree from subdir')
219
v4 = b.revision_tree(b.get_rev_id(4))
220
eq(v4.get_file_by_path('b/two').read(), 'new contents')
221
eq(v4.get_file_by_path('top').read(), 'new contents')
176
223
# TODO: factor out some kind of assert_tree_state() method