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
26
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
27
26
from bzrlib.branch import Branch
30
logger = logging.getLogger('bzr.test.versioning')
27
from bzrlib.trace import mutter
28
from bzrlib.osutils import pathjoin
29
from bzrlib.workingtree import WorkingTree
34
32
class TestVersioning(TestCaseInTempDir):
36
34
def test_mkdir(self):
37
35
"""Basic 'bzr mkdir' operation"""
38
from bzrlib.commands import run_bzr
41
run_bzr(['mkdir', 'foo'])
38
self.run_bzr('mkdir', 'foo')
42
39
self.assert_(os.path.isdir('foo'))
44
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
41
self.run_bzr('mkdir', 'foo', retcode=3)
46
43
from bzrlib.diff import compare_trees
47
from bzrlib.branch import Branch
44
wt = WorkingTree.open('.')
50
delta = compare_trees(b.basis_tree(), b.working_tree())
46
delta = compare_trees(wt.basis_tree(), wt)
52
48
self.log('delta.added = %r' % delta.added)
55
51
self.assertEquals(delta.added[0][0], 'foo')
56
52
self.failIf(delta.modified)
58
def test_add_in_unversioned(self):
59
"""Try to add a file in an unversioned directory.
61
smart_add may eventually add the parent as necessary, but simple
62
branch add doesn't do that.
64
from bzrlib.branch import Branch
65
from bzrlib.errors import NotVersionedError
67
b = Branch('.', init=True)
69
self.build_tree(['foo/',
72
self.assertRaises(NotVersionedError,
76
self.check_and_upgrade()
79
def test_subdir_add(self):
80
"""Add in subdirectory should add only things from there down"""
82
from bzrlib.branch import Branch
83
from bzrlib.commands import run_bzr
89
b = Branch('.', init=True)
90
self.build_tree(['src/', 'README'])
92
eq(sorted(b.unknowns()),
95
eq(run_bzr(['add', 'src']), 0)
97
self.build_tree(['src/foo.c'])
100
eq(run_bzr(['add']), 0)
102
eq(sorted(b.unknowns()),
104
eq(len(b.inventory), 3)
107
eq(run_bzr(['add']), 0)
108
eq(list(b.unknowns()), [])
110
self.check_and_upgrade()
113
def check_and_upgrade(self):
54
def test_mkdir_in_subdir(self):
55
"""'bzr mkdir' operation in subdirectory"""
58
self.run_bzr('mkdir', 'dir')
59
self.assert_(os.path.isdir('dir'))
62
self.log('Run mkdir in subdir')
63
self.run_bzr('mkdir', 'subdir')
64
self.assert_(os.path.isdir('subdir'))
67
from bzrlib.diff import compare_trees
68
wt = WorkingTree.open('.')
70
delta = compare_trees(wt.basis_tree(), wt)
72
self.log('delta.added = %r' % delta.added)
74
self.assertEquals(len(delta.added), 2)
75
self.assertEquals(delta.added[0][0], 'dir')
76
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
77
self.failIf(delta.modified)
79
def test_mkdir_w_nested_trees(self):
80
"""'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
97
wt = WorkingTree.open('.')
98
wt_a = WorkingTree.open('a')
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):
114
117
"""After all the above changes, run the check and upgrade commands.
116
119
The upgrade should be a no-op."""
118
debug('branch has %d revisions', b.revno())
120
debug('check branch...')
121
from bzrlib.check import check
124
debug('upgrade branch...')
125
from bzrlib.upgrade import upgrade
128
debug('check branch...')
129
from bzrlib.check import check
120
b = Branch.open(u'.')
121
mutter('branch has %d revisions', b.revno())
123
mutter('check branch...')
124
from bzrlib.check import check
135
128
class SubdirCommit(TestCaseInTempDir):
137
130
def test_subdir_commit(self):
153
146
for fn in ('a/one', 'b/two', 'top'):
154
147
file(fn, 'w').write('new contents')
149
mutter('start selective subdir commit')
156
150
run_bzr('commit', 'a', '-m', 'commit a only')
158
old = b.revision_tree(b.lookup_revision(1))
159
new = b.revision_tree(b.lookup_revision(2))
152
old = b.repository.revision_tree(b.get_rev_id(1))
153
new = b.repository.revision_tree(b.get_rev_id(2))
161
155
eq(new.get_file_by_path('b/two').read(), 'old contents')
162
156
eq(new.get_file_by_path('top').read(), 'old contents')
166
160
# commit from here should do nothing
167
161
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
168
v3 = b.revision_tree(b.lookup_revision(3))
162
v3 = b.repository.revision_tree(b.get_rev_id(3))
169
163
eq(v3.get_file_by_path('b/two').read(), 'old contents')
170
164
eq(v3.get_file_by_path('top').read(), 'old contents')
171
165
eq(v3.get_file_by_path('a/one').read(), 'new contents')
173
167
# commit in subdirectory commits whole tree
174
168
run_bzr('commit', '-m', 'commit whole tree from subdir')
175
v4 = b.revision_tree(b.lookup_revision(4))
169
v4 = b.repository.revision_tree(b.get_rev_id(4))
176
170
eq(v4.get_file_by_path('b/two').read(), 'new contents')
177
171
eq(v4.get_file_by_path('top').read(), 'new contents')
179
173
# TODO: factor out some kind of assert_tree_state() method
176
if __name__ == '__main__':
added
removed
bzrlib/tests/blackbox/test_versioning.py
