18
18
"""Tests of simple versioning operations"""
20
# TODO: test adding a file whose directory is not versioned
20
21
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
25
from bzrlib.selftest import InTempDir, BzrTestBase
26
26
from bzrlib.branch import Branch
29
logger = logging.getLogger('bzr.test.versioning')
33
class TestVersioning(TestCaseInTempDir):
29
class TestVersioning(InTempDir):
35
31
def test_mkdir(self):
36
32
"""Basic 'bzr mkdir' operation"""
54
50
self.assertEquals(delta.added[0][0], 'foo')
55
51
self.failIf(delta.modified)
57
def test_branch_add_in_unversioned(self):
53
def test_add_in_unversioned(self):
58
54
"""Try to add a file in an unversioned directory.
60
"bzr add" adds the parent as necessary, but simple branch add
56
smart_add may eventually add the parent as necessary, but simple
57
branch add doesn't do that.
63
59
from bzrlib.branch import Branch
64
60
from bzrlib.errors import 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('.', init=True)
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('.', init=True)
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
71
def test_subdir_add(self):
125
72
"""Add in subdirectory should add only things from there down"""
152
99
eq(run_bzr(['add']), 0)
153
100
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):
103
class SubdirCommit(BzrTestBase):
181
105
def test_subdir_commit(self):
182
106
"""Test committing a subdirectory, and committing within a directory."""
added
removed
bzrlib/selftest/versioning.py
