18
18
"""Tests of simple versioning operations"""
21
from bzrlib.selftest import InTempDir
23
class Mkdir(InTempDir):
20
# TODO: test adding a file whose directory is not versioned
21
# TODO: test trying to commit within a directory that is not yet added
25
from bzrlib.selftest import InTempDir, BzrTestBase
26
from bzrlib.branch import Branch
29
class TestVersioning(InTempDir):
25
32
"""Basic 'bzr mkdir' operation"""
26
33
from bzrlib.commands import run_bzr
30
36
run_bzr(['mkdir', 'foo'])
33
39
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
35
from bzrlib.diff import compare_trees, TreeDelta
41
from bzrlib.diff import compare_trees
36
42
from bzrlib.branch import Branch
39
45
delta = compare_trees(b.basis_tree(), b.working_tree())
47
self.log('delta.added = %r' % delta.added)
41
49
self.assertEquals(len(delta.added), 1)
42
50
self.assertEquals(delta.added[0][0], 'foo')
43
51
self.failIf(delta.modified)
47
class AddInUnversioned(InTempDir):
53
def test_add_in_unversioned(self):
49
54
"""Try to add a file in an unversioned directory.
51
56
smart_add may eventually add the parent as necessary, but simple
52
57
branch add doesn't do that.
54
59
from bzrlib.branch import Branch
56
60
from bzrlib.errors import NotVersionedError
58
62
b = Branch('.', init=True)
68
class SubdirCommit(InTempDir):
70
"""Various commits from a subdirectory"""
71
def test_subdir_add(self):
72
"""Add in subdirectory should add only things from there down"""
72
74
from bzrlib.branch import Branch
73
75
from bzrlib.commands import run_bzr
76
81
b = Branch('.', init=True)
77
self.build_tree(['src/', 'src/foo.c', 'README'])
79
self.assertEqual(sorted(b.unknowns()),
82
self.assertEqual(run_bzr(['version']), 0)
84
self.assertEqual(run_bzr(['add']), 0)
82
self.build_tree(['src/', 'README'])
84
eq(sorted(b.unknowns()),
87
eq(run_bzr(['add', 'src']), 0)
89
self.build_tree(['src/foo.c'])
92
eq(run_bzr(['add']), 0)
94
eq(sorted(b.unknowns()),
96
eq(len(b.inventory), 3)
99
eq(run_bzr(['add']), 0)
100
eq(list(b.unknowns()), [])
103
class SubdirCommit(BzrTestBase):
105
def test_subdir_commit(self):
106
"""Test committing a subdirectory, and committing within a directory."""
107
run_bzr = self.run_bzr
108
eq = self.assertEqual
110
self.build_tree(['a/', 'b/'])
115
for fn in ('a/one', 'b/two', 'top'):
116
file(fn, 'w').write('old contents')
119
run_bzr('commit', '-m', 'first revision')
121
for fn in ('a/one', 'b/two', 'top'):
122
file(fn, 'w').write('new contents')
124
run_bzr('commit', 'a', '-m', 'commit a only')
126
old = b.revision_tree(b.lookup_revision(1))
127
new = b.revision_tree(b.lookup_revision(2))
129
eq(new.get_file_by_path('b/two').read(), 'old contents')
130
eq(new.get_file_by_path('top').read(), 'old contents')
131
eq(new.get_file_by_path('a/one').read(), 'new contents')
134
# commit from here should do nothing
135
run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
136
v3 = b.revision_tree(b.lookup_revision(3))
137
eq(v3.get_file_by_path('b/two').read(), 'old contents')
138
eq(v3.get_file_by_path('top').read(), 'old contents')
139
eq(v3.get_file_by_path('a/one').read(), 'new contents')
141
# commit in subdirectory commits whole tree
142
run_bzr('commit', '-m', 'commit whole tree from subdir')
143
v4 = b.revision_tree(b.lookup_revision(4))
144
eq(v4.get_file_by_path('b/two').read(), 'new contents')
145
eq(v4.get_file_by_path('top').read(), 'new contents')
147
# TODO: factor out some kind of assert_tree_state() method
added
removed
bzrlib/selftest/versioning.py
