18
18
"""Tests of simple versioning operations"""
20
# TODO: test adding a file whose directory is not versioned
21
20
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.selftest import InTempDir, BzrTestBase
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
29
class Mkdir(InTempDir):
29
logger = logging.getLogger('bzr.test.versioning')
33
class TestVersioning(TestCaseInTempDir):
31
36
"""Basic 'bzr mkdir' operation"""
32
37
from bzrlib.commands import run_bzr
49
54
self.assertEquals(delta.added[0][0], 'foo')
50
55
self.failIf(delta.modified)
54
class AddInUnversioned(InTempDir):
57
def test_branch_add_in_unversioned(self):
56
58
"""Try to add a file in an unversioned directory.
58
smart_add may eventually add the parent as necessary, but simple
59
branch add doesn't do that.
60
"bzr add" adds the parent as necessary, but simple branch add
61
63
from bzrlib.branch import Branch
62
64
from bzrlib.errors import NotVersionedError
64
b = Branch('.', init=True)
66
b = Branch.initialize('.')
66
68
self.build_tree(['foo/',
74
class SubdirCommit(BzrTestBase):
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):
171
def test_subdir_commit(self):
76
172
"""Test committing a subdirectory, and committing within a directory."""
77
173
run_bzr = self.run_bzr
78
174
eq = self.assertEqual
91
187
for fn in ('a/one', 'b/two', 'top'):
92
188
file(fn, 'w').write('new contents')
190
debug('start selective subdir commit')
94
191
run_bzr('commit', 'a', '-m', 'commit a only')
96
old = b.revision_tree(b.lookup_revision(1))
97
new = b.revision_tree(b.lookup_revision(2))
193
old = b.revision_tree(b.get_rev_id(1))
194
new = b.revision_tree(b.get_rev_id(2))
99
196
eq(new.get_file_by_path('b/two').read(), 'old contents')
100
197
eq(new.get_file_by_path('top').read(), 'old contents')
104
201
# commit from here should do nothing
105
202
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
106
v3 = b.revision_tree(b.lookup_revision(3))
203
v3 = b.revision_tree(b.get_rev_id(3))
107
204
eq(v3.get_file_by_path('b/two').read(), 'old contents')
108
205
eq(v3.get_file_by_path('top').read(), 'old contents')
109
206
eq(v3.get_file_by_path('a/one').read(), 'new contents')
111
208
# commit in subdirectory commits whole tree
112
209
run_bzr('commit', '-m', 'commit whole tree from subdir')
113
v4 = b.revision_tree(b.lookup_revision(4))
210
v4 = b.revision_tree(b.get_rev_id(4))
114
211
eq(v4.get_file_by_path('b/two').read(), 'new contents')
115
212
eq(v4.get_file_by_path('top').read(), 'new contents')
117
214
# TODO: factor out some kind of assert_tree_state() method
121
class SubdirAdd(InTempDir):
123
"""Add in subdirectory should add only things from there down"""
125
from bzrlib.branch import Branch
126
from bzrlib.commands import run_bzr
128
eq = self.assertEqual
132
b = Branch('.', init=True)
133
self.build_tree(['src/', 'README'])
135
eq(sorted(b.unknowns()),
138
eq(run_bzr(['add', 'src']), 0)
140
self.build_tree(['src/foo.c'])
143
eq(run_bzr(['add']), 0)
145
eq(sorted(b.unknowns()),
147
eq(len(b.inventory), 3)
150
eq(run_bzr(['add']), 0)
151
eq(list(b.unknowns()), [])
217
if __name__ == '__main__':
added
removed
bzrlib/selftest/versioning.py
