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
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
# Copyright (C) 2006 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
"""Test the executable bit under various working tree formats."""
import os
from bzrlib import (
osutils,
)
from bzrlib.transform import TreeTransform
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
class TestExecutable(TestCaseWithWorkingTree):
def setUp(self):
super(TestExecutable, self).setUp()
self.a_id = "a-20051208024829-849e76f7968d7a86"
self.b_id = "b-20051208024829-849e76f7968d7a86"
wt = self.make_branch_and_tree('b1')
b = wt.branch
tt = TreeTransform(wt)
tt.new_file('a', tt.root, 'a test\n', self.a_id, True)
tt.new_file('b', tt.root, 'b test\n', self.b_id, False)
tt.apply()
self.wt = wt
def check_exist(self, tree):
"""Just check that both files have the right executable bits set"""
tree.lock_read()
self.assertTrue(tree.is_executable(self.a_id),
"'a' lost the execute bit")
self.assertFalse(tree.is_executable(self.b_id),
"'b' gained an execute bit")
tree.unlock()
def check_empty(self, tree, ignore_inv=False):
"""Check that the files are truly missing
:param ignore_inv: If you just delete files from a working tree
the inventory still shows them, so don't assert that
the inventory is empty, just that the tree doesn't have them
"""
tree.lock_read()
if not ignore_inv:
self.assertEqual(
[('', tree.root_inventory.root)],
list(tree.root_inventory.iter_entries()))
self.assertFalse(tree.has_id(self.a_id))
self.assertFalse(tree.has_filename('a'))
self.assertFalse(tree.has_id(self.b_id))
self.assertFalse(tree.has_filename('b'))
tree.unlock()
def commit_and_branch(self):
"""Commit the current tree, and create a second tree"""
self.wt.commit('adding a,b', rev_id='r1')
# Now make sure that 'bzr branch' also preserves the
# executable bit
# TODO: Maybe this should be a blackbox test
dir2 = self.wt.branch.bzrdir.clone('b2', revision_id='r1')
wt2 = dir2.open_workingtree()
self.assertEqual(['r1'], wt2.get_parent_ids())
self.assertEqual('r1', wt2.branch.last_revision())
return wt2
def test_01_is_executable(self):
"""Make sure that the tree was created and has the executable bit set"""
self.check_exist(self.wt)
def test_02_stays_executable(self):
"""reopen the tree and ensure it stuck."""
self.wt = self.wt.bzrdir.open_workingtree()
self.check_exist(self.wt)
def test_03_after_commit(self):
"""Commit the change, and check the history"""
self.wt.commit('adding a,b', rev_id='r1')
rev_tree = self.wt.branch.repository.revision_tree('r1')
self.check_exist(rev_tree)
def test_04_after_removed(self):
"""Make sure reverting removed files brings them back correctly"""
self.wt.commit('adding a,b', rev_id='r1')
# Make sure the entries are gone
os.remove('b1/a')
os.remove('b1/b')
self.check_empty(self.wt, ignore_inv=True)
# Make sure that revert is able to bring them back,
# and sets 'a' back to being executable
rev_tree = self.wt.branch.repository.revision_tree('r1')
self.wt.revert(['a', 'b'], rev_tree, backups=False)
self.check_exist(self.wt)
def test_05_removed_and_committed(self):
"""Check that reverting to an earlier commit restores them"""
self.wt.commit('adding a,b', rev_id='r1')
# Now remove them again, and make sure that after a
# commit, they are still marked correctly
os.remove('b1/a')
os.remove('b1/b')
self.wt.commit('removed', rev_id='r2')
self.check_empty(self.wt)
rev_tree = self.wt.branch.repository.revision_tree('r1')
# Now revert back to the previous commit
self.wt.revert(old_tree=rev_tree, backups=False)
self.check_exist(self.wt)
def test_06_branch(self):
"""branch b1=>b2 should preserve the executable bits"""
# TODO: Maybe this should be a blackbox test
wt2 = self.commit_and_branch()
self.check_exist(wt2)
def test_07_pull(self):
"""Test that pull will handle bits correctly"""
wt2 = self.commit_and_branch()
os.remove('b1/a')
os.remove('b1/b')
self.wt.commit('removed', rev_id='r2')
# now wt2 can pull and the files should be removed
# Make sure pull will delete the files
wt2.pull(self.wt.branch)
self.assertEquals(['r2'], wt2.get_parent_ids())
self.assertEquals('r2', wt2.branch.last_revision())
self.check_empty(wt2)
# Now restore the files on the first branch and commit
# so that the second branch can pull the changes
# and make sure that the executable bit has been copied
rev_tree = self.wt.branch.repository.revision_tree('r1')
self.wt.revert(old_tree=rev_tree, backups=False)
self.wt.commit('resurrected', rev_id='r3')
self.check_exist(self.wt)
wt2.pull(self.wt.branch)
self.assertEquals(['r3'], wt2.get_parent_ids())
self.assertEquals('r3', wt2.branch.last_revision())
self.check_exist(wt2)
def test_08_no_op_revert(self):
"""Just do a simple revert without anything changed
The bits shouldn't swap.
"""
self.wt.commit('adding a,b', rev_id='r1')
rev_tree = self.wt.branch.repository.revision_tree('r1')
self.wt.revert(old_tree=rev_tree, backups=False)
self.check_exist(self.wt)
def test_commit_with_exec_from_basis(self):
self.wt._is_executable_from_path_and_stat = \
self.wt._is_executable_from_path_and_stat_from_basis
rev_id1 = self.wt.commit('one')
rev_tree1 = self.wt.branch.repository.revision_tree(rev_id1)
a_executable = rev_tree1.root_inventory[self.a_id].executable
b_executable = rev_tree1.root_inventory[self.b_id].executable
self.assertIsNot(None, a_executable)
self.assertTrue(a_executable)
self.assertIsNot(None, b_executable)
self.assertFalse(b_executable)
def test_use_exec_from_basis(self):
self.wt._supports_executable = lambda: False
self.addCleanup(self.wt.lock_read().unlock)
self.assertTrue(self.wt.is_executable(self.a_id))
self.assertFalse(self.wt.is_executable(self.b_id))
|