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
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
# Copyright (C) 2005, 2006, 2007, 2009-2012 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests of simple versioning operations"""
# TODO: test trying to commit within a directory that is not yet added
import os
from bzrlib.branch import Branch
from bzrlib.osutils import pathjoin
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
class TestMkdir(TestCaseWithTransport):
def test_mkdir_fails_cleanly(self):
"""'mkdir' fails cleanly when no working tree is available.
https://bugs.launchpad.net/bzr/+bug/138600
"""
# Since there is a safety working tree above us, we create a bare repo
# here locally.
shared_repo = self.make_repository('.')
self.run_bzr(['mkdir', 'abc'], retcode=3)
self.assertPathDoesNotExist('abc')
def test_mkdir(self):
"""Basic 'bzr mkdir' operation"""
self.make_branch_and_tree('.')
self.run_bzr(['mkdir', 'foo'])
self.assert_(os.path.isdir('foo'))
self.run_bzr(['mkdir', 'foo'], retcode=3)
wt = WorkingTree.open('.')
delta = wt.changes_from(wt.basis_tree())
self.log('delta.added = %r' % delta.added)
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'foo')
self.assertFalse(delta.modified)
def test_mkdir_in_subdir(self):
"""'bzr mkdir' operation in subdirectory"""
self.make_branch_and_tree('.')
self.run_bzr(['mkdir', 'dir'])
self.assert_(os.path.isdir('dir'))
self.log('Run mkdir in subdir')
self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
self.assert_(os.path.isdir('dir/subdir'))
wt = WorkingTree.open('.')
delta = wt.changes_from(wt.basis_tree())
self.log('delta.added = %r' % delta.added)
self.assertEquals(len(delta.added), 2)
self.assertEquals(delta.added[0][0], 'dir')
self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
self.assertFalse(delta.modified)
def test_mkdir_w_nested_trees(self):
"""'bzr mkdir' with nested trees"""
self.make_branch_and_tree('.')
self.make_branch_and_tree('a')
self.make_branch_and_tree('a/b')
self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
self.assertTrue(os.path.isdir('dir'))
self.assertTrue(os.path.isdir('a/dir'))
self.assertTrue(os.path.isdir('a/b/dir'))
wt = WorkingTree.open('.')
wt_a = WorkingTree.open('a')
wt_b = WorkingTree.open('a/b')
delta = wt.changes_from(wt.basis_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.assertFalse(delta.modified)
delta = wt_a.changes_from(wt_a.basis_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.assertFalse(delta.modified)
delta = wt_b.changes_from(wt_b.basis_tree())
self.assertEquals(len(delta.added), 1)
self.assertEquals(delta.added[0][0], 'dir')
self.assertFalse(delta.modified)
def test_mkdir_quiet(self):
"""'bzr mkdir --quiet' should not print a status message"""
self.make_branch_and_tree('.')
out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
self.assertEquals('', err)
self.assertEquals('', out)
class SubdirCommit(TestCaseWithTransport):
def test_subdir_commit(self):
"""Test committing a subdirectory, and committing a directory."""
tree = self.make_branch_and_tree('.')
b = tree.branch
self.build_tree(['a/', 'b/'])
def set_contents(contents):
self.build_tree_contents([
('a/one', contents),
('b/two', contents),
('top', contents),
])
set_contents('old contents')
tree.smart_add(['.'])
tree.commit('first revision')
set_contents('new contents')
mutter('start selective subdir commit')
self.run_bzr(['commit', 'a', '-m', 'commit a only'])
new = b.repository.revision_tree(b.get_rev_id(2))
new.lock_read()
def get_text_by_path(tree, path):
return tree.get_file_text(tree.path2id(path), path)
self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
new.unlock()
# commit from here should do nothing
self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'],
working_dir='a')
v3 = b.repository.revision_tree(b.get_rev_id(3))
v3.lock_read()
self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
v3.unlock()
# commit in subdirectory commits whole tree
self.run_bzr(['commit', '-m', 'commit whole tree from subdir'],
working_dir='a')
v4 = b.repository.revision_tree(b.get_rev_id(4))
v4.lock_read()
self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
v4.unlock()
# TODO: factor out some kind of assert_tree_state() method
|