25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
26
25
from bzrlib.branch import Branch
26
from bzrlib.osutils import pathjoin
27
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
27
28
from bzrlib.trace import mutter
28
from bzrlib.osutils import pathjoin
29
29
from bzrlib.workingtree import WorkingTree
32
class TestVersioning(TestCaseInTempDir):
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')
35
45
"""Basic 'bzr mkdir' operation"""
38
self.run_bzr('mkdir', 'foo')
47
self.make_branch_and_tree('.')
48
self.run_bzr(['mkdir', 'foo'])
39
49
self.assert_(os.path.isdir('foo'))
41
self.run_bzr('mkdir', 'foo', retcode=3)
51
self.run_bzr(['mkdir', 'foo'], retcode=3)
43
from bzrlib.diff import compare_trees
44
53
wt = WorkingTree.open('.')
46
delta = compare_trees(wt.basis_tree(), wt)
55
delta = wt.changes_from(wt.basis_tree())
48
57
self.log('delta.added = %r' % delta.added)
50
59
self.assertEquals(len(delta.added), 1)
51
60
self.assertEquals(delta.added[0][0], 'foo')
52
self.failIf(delta.modified)
61
self.assertFalse(delta.modified)
54
63
def test_mkdir_in_subdir(self):
55
64
"""'bzr mkdir' operation in subdirectory"""
58
self.run_bzr('mkdir', 'dir')
66
self.make_branch_and_tree('.')
67
self.run_bzr(['mkdir', 'dir'])
59
68
self.assert_(os.path.isdir('dir'))
62
70
self.log('Run mkdir in subdir')
63
self.run_bzr('mkdir', 'subdir')
64
self.assert_(os.path.isdir('subdir'))
71
self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
72
self.assert_(os.path.isdir('dir/subdir'))
67
from bzrlib.diff import compare_trees
68
74
wt = WorkingTree.open('.')
70
delta = compare_trees(wt.basis_tree(), wt)
76
delta = wt.changes_from(wt.basis_tree())
72
78
self.log('delta.added = %r' % delta.added)
74
80
self.assertEquals(len(delta.added), 2)
75
81
self.assertEquals(delta.added[0][0], 'dir')
76
82
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
77
self.failIf(delta.modified)
83
self.assertFalse(delta.modified)
79
85
def test_mkdir_w_nested_trees(self):
80
86
"""'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
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
97
wt = WorkingTree.open('.')
98
98
wt_a = WorkingTree.open('a')
99
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):
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):
130
127
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
128
"""Test committing a subdirectory, and committing a directory."""
129
tree = self.make_branch_and_tree('.')
135
131
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')
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')
149
143
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))
144
self.run_bzr(['commit', 'a', '-m', 'commit a only'])
153
146
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')
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')
160
157
# commit from here should do nothing
161
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
158
self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'],
162
160
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')
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')
167
167
# commit in subdirectory commits whole tree
168
run_bzr('commit', '-m', 'commit whole tree from subdir')
168
self.run_bzr(['commit', '-m', 'commit whole tree from subdir'],
169
170
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')
172
self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
173
self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
173
176
# TODO: factor out some kind of assert_tree_state() method
176
if __name__ == '__main__':