1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests of simple versioning operations"""
# TODO: test trying to commit within a directory that is not yet added
import os
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
from bzrlib.branch import Branch
from bzrlib.trace import mutter
from bzrlib.osutils import pathjoin
class TestVersioning(TestCaseInTempDir):
def test_mkdir(self):
"""Basic 'bzr mkdir' operation"""
self.run_bzr('init')
self.run_bzr('mkdir', 'foo')
self.assert_(os.path.isdir('foo'))
self.run_bzr('mkdir', 'foo', retcode=3)
from bzrlib.diff import compare_trees
from bzrlib.branch import Branch
b = Branch.open(u'.')
delta = compare_trees(b.basis_tree(), b.working_tree())
self.log('delta.added = %r' % delta.added)
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'foo')
self.failIf(delta.modified)
def test_mkdir_in_subdir(self):
"""'bzr mkdir' operation in subdirectory"""
self.run_bzr('init')
self.run_bzr('mkdir', 'dir')
self.assert_(os.path.isdir('dir'))
os.chdir('dir')
self.log('Run mkdir in subdir')
self.run_bzr('mkdir', 'subdir')
self.assert_(os.path.isdir('subdir'))
os.chdir('..')
from bzrlib.diff import compare_trees
from bzrlib.branch import Branch
b = Branch.open(u'.')
delta = compare_trees(b.basis_tree(), b.working_tree())
self.log('delta.added = %r' % delta.added)
self.assertEquals(len(delta.added), 2)
self.assertEquals(delta.added[0][0], 'dir')
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
self.failIf(delta.modified)
def test_mkdir_w_nested_trees(self):
"""'bzr mkdir' with nested trees"""
self.run_bzr('init')
os.mkdir('a')
os.chdir('a')
self.run_bzr('init')
os.mkdir('b')
os.chdir('b')
self.run_bzr('init')
os.chdir('../..')
self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
self.failUnless(os.path.isdir('dir'))
self.failUnless(os.path.isdir('a/dir'))
self.failUnless(os.path.isdir('a/b/dir'))
from bzrlib.diff import compare_trees
b = Branch.open(u'.')
b_a = Branch.open('a')
b_b = Branch.open('a/b')
delta = compare_trees(b.basis_tree(), b.working_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.failIf(delta.modified)
delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.failIf(delta.modified)
delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.failIf(delta.modified)
def test_working_tree_add_in_unversioned(self):
"""Try to add a file in an unversioned directory.
"bzr add" adds the parent as necessary, but simple working tree add
doesn't do that.
"""
from bzrlib.branch import Branch
from bzrlib.errors import NotVersionedError
from bzrlib.workingtree import WorkingTree
b = Branch.initialize(u'.')
self.build_tree(['foo/',
'foo/hello'])
self.assertRaises(NotVersionedError,
WorkingTree(b.base, b).add,
'foo/hello')
self.check_branch()
def check_branch(self):
"""After all the above changes, run the check and upgrade commands.
The upgrade should be a no-op."""
b = Branch.open(u'.')
mutter('branch has %d revisions', b.revno())
mutter('check branch...')
from bzrlib.check import check
check(b, False)
class SubdirCommit(TestCaseInTempDir):
def test_subdir_commit(self):
"""Test committing a subdirectory, and committing within a directory."""
run_bzr = self.run_bzr
eq = self.assertEqual
self.build_tree(['a/', 'b/'])
run_bzr('init')
b = Branch.open(u'.')
for fn in ('a/one', 'b/two', 'top'):
file(fn, 'w').write('old contents')
run_bzr('add')
run_bzr('commit', '-m', 'first revision')
for fn in ('a/one', 'b/two', 'top'):
file(fn, 'w').write('new contents')
mutter('start selective subdir commit')
run_bzr('commit', 'a', '-m', 'commit a only')
old = b.revision_tree(b.get_rev_id(1))
new = b.revision_tree(b.get_rev_id(2))
eq(new.get_file_by_path('b/two').read(), 'old contents')
eq(new.get_file_by_path('top').read(), 'old contents')
eq(new.get_file_by_path('a/one').read(), 'new contents')
os.chdir('a')
# commit from here should do nothing
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
v3 = b.revision_tree(b.get_rev_id(3))
eq(v3.get_file_by_path('b/two').read(), 'old contents')
eq(v3.get_file_by_path('top').read(), 'old contents')
eq(v3.get_file_by_path('a/one').read(), 'new contents')
# commit in subdirectory commits whole tree
run_bzr('commit', '-m', 'commit whole tree from subdir')
v4 = b.revision_tree(b.get_rev_id(4))
eq(v4.get_file_by_path('b/two').read(), 'new contents')
eq(v4.get_file_by_path('top').read(), 'new contents')
# TODO: factor out some kind of assert_tree_state() method
if __name__ == '__main__':
import unittest
unittest.main()
|