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
|
# 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 adding a file whose directory is not versioned
# TODO: test trying to commit within a directory that is not yet added
import os
from bzrlib.selftest import InTempDir, BzrTestBase
from bzrlib.branch import Branch
class TestVersioning(InTempDir):
def test_mkdir(self):
"""Basic 'bzr mkdir' operation"""
from bzrlib.commands import run_bzr
run_bzr(['init'])
run_bzr(['mkdir', 'foo'])
self.assert_(os.path.isdir('foo'))
self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
from bzrlib.diff import compare_trees
from bzrlib.branch import Branch
b = Branch('.')
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_add_in_unversioned(self):
"""Try to add a file in an unversioned directory.
smart_add may eventually add the parent as necessary, but simple
branch add doesn't do that.
"""
from bzrlib.branch import Branch
from bzrlib.errors import NotVersionedError
b = Branch('.', init=True)
self.build_tree(['foo/',
'foo/hello'])
self.assertRaises(NotVersionedError,
b.add,
'foo/hello')
def test_subdir_add(self):
"""Add in subdirectory should add only things from there down"""
from bzrlib.branch import Branch
from bzrlib.commands import run_bzr
eq = self.assertEqual
ass = self.assert_
chdir = os.chdir
b = Branch('.', init=True)
self.build_tree(['src/', 'README'])
eq(sorted(b.unknowns()),
['README', 'src'])
eq(run_bzr(['add', 'src']), 0)
self.build_tree(['src/foo.c'])
chdir('src')
eq(run_bzr(['add']), 0)
eq(sorted(b.unknowns()),
['README'])
eq(len(b.inventory), 3)
chdir('..')
eq(run_bzr(['add']), 0)
eq(list(b.unknowns()), [])
class SubdirCommit(BzrTestBase):
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('.')
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')
run_bzr('commit', 'a', '-m', 'commit a only')
old = b.revision_tree(b.lookup_revision(1))
new = b.revision_tree(b.lookup_revision(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.lookup_revision(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.lookup_revision(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
|