1
# Copyright (C) 2005 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import StringIO
20
from bzrlib.branch import Branch
21
import bzrlib.errors as errors
22
from bzrlib.diff import internal_diff
23
from bzrlib.inventory import Inventory, ROOT_ID
24
import bzrlib.inventory as inventory
25
from bzrlib.osutils import has_symlinks, rename, pathjoin
26
from bzrlib.tests import TestCase, TestCaseWithTransport
27
from bzrlib.uncommit import uncommit
30
class TestInventory(TestCase):
32
def test_is_within(self):
33
from bzrlib.osutils import is_inside_any
35
SRC_FOO_C = pathjoin('src', 'foo.c')
36
for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
40
self.assert_(is_inside_any(dirs, fn))
42
for dirs, fn in [(['src'], 'srccontrol'),
43
(['src'], 'srccontrol/foo')]:
44
self.assertFalse(is_inside_any(dirs, fn))
47
"""Test detection of files within selected directories."""
50
for args in [('src', 'directory', 'src-id'),
51
('doc', 'directory', 'doc-id'),
52
('src/hello.c', 'file'),
53
('src/bye.c', 'file', 'bye-id'),
54
('Makefile', 'file')]:
57
self.assertEqual(inv.path2id('src'), 'src-id')
58
self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
60
self.assert_('src-id' in inv)
63
def test_version(self):
64
"""Inventory remembers the text's version."""
66
ie = inv.add_path('foo.txt', 'file')
70
class TestInventoryEntry(TestCase):
72
def test_file_kind_character(self):
73
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
74
self.assertEqual(file.kind_character(), '')
76
def test_dir_kind_character(self):
77
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
78
self.assertEqual(dir.kind_character(), '/')
80
def test_link_kind_character(self):
81
dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
82
self.assertEqual(dir.kind_character(), '')
84
def test_dir_detect_changes(self):
85
left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
87
left.executable = True
88
left.symlink_target='foo'
89
right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
91
right.symlink_target='bar'
92
self.assertEqual((False, False), left.detect_changes(right))
93
self.assertEqual((False, False), right.detect_changes(left))
95
def test_file_detect_changes(self):
96
left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
98
right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
100
self.assertEqual((False, False), left.detect_changes(right))
101
self.assertEqual((False, False), right.detect_changes(left))
102
left.executable = True
103
self.assertEqual((False, True), left.detect_changes(right))
104
self.assertEqual((False, True), right.detect_changes(left))
105
right.text_sha1 = 321
106
self.assertEqual((True, True), left.detect_changes(right))
107
self.assertEqual((True, True), right.detect_changes(left))
109
def test_symlink_detect_changes(self):
110
left = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
112
left.executable = True
113
left.symlink_target='foo'
114
right = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
115
right.text_sha1 = 321
116
right.symlink_target='foo'
117
self.assertEqual((False, False), left.detect_changes(right))
118
self.assertEqual((False, False), right.detect_changes(left))
119
left.symlink_target = 'different'
120
self.assertEqual((True, False), left.detect_changes(right))
121
self.assertEqual((True, False), right.detect_changes(left))
123
def test_file_has_text(self):
124
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
125
self.failUnless(file.has_text())
127
def test_directory_has_text(self):
128
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
129
self.failIf(dir.has_text())
131
def test_link_has_text(self):
132
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
133
self.failIf(link.has_text())
136
class TestEntryDiffing(TestCaseWithTransport):
139
super(TestEntryDiffing, self).setUp()
140
self.wt = self.make_branch_and_tree('.')
141
self.branch = self.wt.branch
142
print >> open('file', 'wb'), 'foo'
143
print >> open('binfile', 'wb'), 'foo'
144
self.wt.add(['file'], ['fileid'])
145
self.wt.add(['binfile'], ['binfileid'])
147
os.symlink('target1', 'symlink')
148
self.wt.add(['symlink'], ['linkid'])
149
self.wt.commit('message_1', rev_id = '1')
150
print >> open('file', 'wb'), 'bar'
151
print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
154
os.symlink('target2', 'symlink')
155
self.tree_1 = self.branch.repository.revision_tree('1')
156
self.inv_1 = self.branch.repository.get_inventory('1')
157
self.file_1 = self.inv_1['fileid']
158
self.file_1b = self.inv_1['binfileid']
159
self.tree_2 = self.wt
160
self.inv_2 = self.tree_2.read_working_inventory()
161
self.file_2 = self.inv_2['fileid']
162
self.file_2b = self.inv_2['binfileid']
164
self.link_1 = self.inv_1['linkid']
165
self.link_2 = self.inv_2['linkid']
167
def test_file_diff_deleted(self):
169
self.file_1.diff(internal_diff,
170
"old_label", self.tree_1,
171
"/dev/null", None, None,
173
self.assertEqual(output.getvalue(), "--- old_label\t\n"
179
def test_file_diff_added(self):
181
self.file_1.diff(internal_diff,
182
"new_label", self.tree_1,
183
"/dev/null", None, None,
184
output, reverse=True)
185
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
191
def test_file_diff_changed(self):
193
self.file_1.diff(internal_diff,
194
"/dev/null", self.tree_1,
195
"new_label", self.file_2, self.tree_2,
197
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
204
def test_file_diff_binary(self):
206
self.file_1.diff(internal_diff,
207
"/dev/null", self.tree_1,
208
"new_label", self.file_2b, self.tree_2,
210
self.assertEqual(output.getvalue(),
211
"Binary files /dev/null and new_label differ\n")
212
def test_link_diff_deleted(self):
213
if not has_symlinks():
216
self.link_1.diff(internal_diff,
217
"old_label", self.tree_1,
218
"/dev/null", None, None,
220
self.assertEqual(output.getvalue(),
221
"=== target was 'target1'\n")
223
def test_link_diff_added(self):
224
if not has_symlinks():
227
self.link_1.diff(internal_diff,
228
"new_label", self.tree_1,
229
"/dev/null", None, None,
230
output, reverse=True)
231
self.assertEqual(output.getvalue(),
232
"=== target is 'target1'\n")
234
def test_link_diff_changed(self):
235
if not has_symlinks():
238
self.link_1.diff(internal_diff,
239
"/dev/null", self.tree_1,
240
"new_label", self.link_2, self.tree_2,
242
self.assertEqual(output.getvalue(),
243
"=== target changed 'target1' => 'target2'\n")
246
class TestSnapshot(TestCaseWithTransport):
249
# for full testing we'll need a branch
250
# with a subdir to test parent changes.
251
# and a file, link and dir under that.
252
# but right now I only need one attribute
253
# to change, and then test merge patterns
254
# with fake parent entries.
255
super(TestSnapshot, self).setUp()
256
self.wt = self.make_branch_and_tree('.')
257
self.branch = self.wt.branch
258
self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
259
self.wt.add(['subdir', 'subdir/file'],
263
self.wt.commit('message_1', rev_id = '1')
264
self.tree_1 = self.branch.repository.revision_tree('1')
265
self.inv_1 = self.branch.repository.get_inventory('1')
266
self.file_1 = self.inv_1['fileid']
267
self.file_active = self.wt.inventory['fileid']
269
def test_snapshot_new_revision(self):
270
# This tests that a simple commit with no parents makes a new
271
# revision value in the inventory entry
272
self.file_active.snapshot('2', 'subdir/file', {}, self.wt,
273
self.branch.repository.weave_store,
274
self.branch.get_transaction())
275
# expected outcome - file_1 has a revision id of '2', and we can get
276
# its text of 'file contents' out of the weave.
277
self.assertEqual(self.file_1.revision, '1')
278
self.assertEqual(self.file_active.revision, '2')
279
# this should be a separate test probably, but lets check it once..
280
lines = self.branch.repository.weave_store.get_weave(
282
self.branch.get_transaction()).get_lines('2')
283
self.assertEqual(lines, ['contents of subdir/file\n'])
285
def test_snapshot_unchanged(self):
286
#This tests that a simple commit does not make a new entry for
287
# an unchanged inventory entry
288
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
290
self.branch.repository.weave_store,
291
self.branch.get_transaction())
292
self.assertEqual(self.file_1.revision, '1')
293
self.assertEqual(self.file_active.revision, '1')
294
vf = self.branch.repository.weave_store.get_weave(
296
self.branch.repository.get_transaction())
297
self.assertRaises(errors.RevisionNotPresent,
301
def test_snapshot_merge_identical_different_revid(self):
302
# This tests that a commit with two identical parents, one of which has
303
# a different revision id, results in a new revision id in the entry.
304
# 1->other, commit a merge of other against 1, results in 2.
305
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
306
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
307
other_ie.revision = '1'
308
other_ie.text_sha1 = self.file_1.text_sha1
309
other_ie.text_size = self.file_1.text_size
310
self.assertEqual(self.file_1, other_ie)
311
other_ie.revision = 'other'
312
self.assertNotEqual(self.file_1, other_ie)
313
versionfile = self.branch.repository.weave_store.get_weave(
314
'fileid', self.branch.repository.get_transaction())
315
versionfile.clone_text('other', '1', ['1'])
316
self.file_active.snapshot('2', 'subdir/file',
317
{'1':self.file_1, 'other':other_ie},
319
self.branch.repository.weave_store,
320
self.branch.get_transaction())
321
self.assertEqual(self.file_active.revision, '2')
323
def test_snapshot_changed(self):
324
# This tests that a commit with one different parent results in a new
325
# revision id in the entry.
326
self.file_active.name='newname'
327
rename('subdir/file', 'subdir/newname')
328
self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1},
330
self.branch.repository.weave_store,
331
self.branch.get_transaction())
332
# expected outcome - file_1 has a revision id of '2'
333
self.assertEqual(self.file_active.revision, '2')
336
class TestPreviousHeads(TestCaseWithTransport):
339
# we want several inventories, that respectively
340
# give use the following scenarios:
341
# A) fileid not in any inventory (A),
342
# B) fileid present in one inventory (B) and (A,B)
343
# C) fileid present in two inventories, and they
344
# are not mutual descendents (B, C)
345
# D) fileid present in two inventories and one is
346
# a descendent of the other. (B, D)
347
super(TestPreviousHeads, self).setUp()
348
self.wt = self.make_branch_and_tree('.')
349
self.branch = self.wt.branch
350
self.build_tree(['file'])
351
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
352
self.inv_A = self.branch.repository.get_inventory('A')
353
self.wt.add(['file'], ['fileid'])
354
self.wt.commit('add file', rev_id='B')
355
self.inv_B = self.branch.repository.get_inventory('B')
356
uncommit(self.branch, tree=self.wt)
357
self.assertEqual(self.branch.revision_history(), ['A'])
358
self.wt.commit('another add of file', rev_id='C')
359
self.inv_C = self.branch.repository.get_inventory('C')
360
self.wt.add_pending_merge('B')
361
self.wt.commit('merge in B', rev_id='D')
362
self.inv_D = self.branch.repository.get_inventory('D')
363
self.file_active = self.wt.inventory['fileid']
364
self.weave = self.branch.repository.weave_store.get_weave('fileid',
365
self.branch.repository.get_transaction())
367
def get_previous_heads(self, inventories):
368
return self.file_active.find_previous_heads(
370
self.branch.repository.weave_store,
371
self.branch.repository.get_transaction())
373
def test_fileid_in_no_inventory(self):
374
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
376
def test_fileid_in_one_inventory(self):
377
self.assertEqual({'B':self.inv_B['fileid']},
378
self.get_previous_heads([self.inv_B]))
379
self.assertEqual({'B':self.inv_B['fileid']},
380
self.get_previous_heads([self.inv_A, self.inv_B]))
381
self.assertEqual({'B':self.inv_B['fileid']},
382
self.get_previous_heads([self.inv_B, self.inv_A]))
384
def test_fileid_in_two_inventories_gives_both_entries(self):
385
self.assertEqual({'B':self.inv_B['fileid'],
386
'C':self.inv_C['fileid']},
387
self.get_previous_heads([self.inv_B, self.inv_C]))
388
self.assertEqual({'B':self.inv_B['fileid'],
389
'C':self.inv_C['fileid']},
390
self.get_previous_heads([self.inv_C, self.inv_B]))
392
def test_fileid_in_two_inventories_already_merged_gives_head(self):
393
self.assertEqual({'D':self.inv_D['fileid']},
394
self.get_previous_heads([self.inv_B, self.inv_D]))
395
self.assertEqual({'D':self.inv_D['fileid']},
396
self.get_previous_heads([self.inv_D, self.inv_B]))
398
# TODO: test two inventories with the same file revision
401
class TestExecutable(TestCaseWithTransport):
403
def test_stays_executable(self):
404
a_id = "a-20051208024829-849e76f7968d7a86"
405
b_id = "b-20051208024829-849e76f7968d7a86"
406
wt = self.make_branch_and_tree('b1')
408
open('b1/a', 'wb').write('a test\n')
409
open('b1/b', 'wb').write('b test\n')
410
os.chmod('b1/a', 0755)
411
os.chmod('b1/b', 0644)
412
wt.add(['a', 'b'], [a_id, b_id])
413
wt.inventory[a_id].executable = True
414
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
416
# reopen the tree and ensure it stuck.
417
wt = wt.bzrdir.open_workingtree()
418
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
420
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
421
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
423
wt.commit('adding a,b', rev_id='r1')
425
rev_tree = b.repository.revision_tree('r1')
426
self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
427
self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
429
self.failUnless(rev_tree.inventory[a_id].executable)
430
self.failIf(rev_tree.inventory[b_id].executable)
432
# Make sure the entries are gone
435
self.failIf(wt.has_id(a_id))
436
self.failIf(wt.has_filename('a'))
437
self.failIf(wt.has_id(b_id))
438
self.failIf(wt.has_filename('b'))
440
# Make sure that revert is able to bring them back,
441
# and sets 'a' back to being executable
443
wt.revert(['a', 'b'], rev_tree, backups=False)
444
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
446
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
447
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
449
# Now remove them again, and make sure that after a
450
# commit, they are still marked correctly
453
wt.commit('removed', rev_id='r2')
455
self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
456
self.failIf(wt.has_id(a_id))
457
self.failIf(wt.has_filename('a'))
458
self.failIf(wt.has_id(b_id))
459
self.failIf(wt.has_filename('b'))
461
# Now revert back to the previous commit
462
wt.revert([], rev_tree, backups=False)
463
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
465
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
466
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
468
# Now make sure that 'bzr branch' also preserves the
470
# TODO: Maybe this should be a blackbox test
471
d2 = b.bzrdir.clone('b2', revision_id='r1')
472
t2 = d2.open_workingtree()
474
self.assertEquals('r1', b2.last_revision())
476
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
477
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
478
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
480
# Make sure pull will delete the files
482
self.assertEquals('r2', b2.last_revision())
483
self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
485
# Now commit the changes on the first branch
486
# so that the second branch can pull the changes
487
# and make sure that the executable bit has been copied
488
wt.commit('resurrected', rev_id='r3')
491
self.assertEquals('r3', b2.last_revision())
492
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
494
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
495
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
497
class TestRevert(TestCaseWithTransport):
498
def test_dangling_id(self):
499
wt = self.make_branch_and_tree('b1')
500
self.assertEqual(len(wt.inventory), 1)
501
open('b1/a', 'wb').write('a test\n')
503
self.assertEqual(len(wt.inventory), 2)
506
self.assertEqual(len(wt.inventory), 1)
added
removed
bzrlib/tests/test_inv.py
