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
|
# Copyright (C) 2007 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 for interface conformance of inventories of trees."""
from cStringIO import StringIO
import os
from bzrlib.diff import internal_diff
from bzrlib.mutabletree import MutableTree
from bzrlib.osutils import has_symlinks
from bzrlib.symbol_versioning import zero_ninetyone, one_zero
from bzrlib.tests import SymlinkFeature, TestSkipped
from bzrlib.tests.tree_implementations import TestCaseWithTree
from bzrlib.uncommit import uncommit
class TestPreviousHeads(TestCaseWithTree):
def setUp(self):
# we want several inventories, that respectively
# give use the following scenarios:
# A) fileid not in any inventory (A),
# B) fileid present in one inventory (B) and (A,B)
# C) fileid present in two inventories, and they
# are not mutual descendents (B, C)
# D) fileid present in two inventories and one is
# a descendent of the other. (B, D)
super(TestPreviousHeads, self).setUp()
self.wt = self.make_branch_and_tree('.')
self.branch = self.wt.branch
self.build_tree(['file'])
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
self.inv_A = self.branch.repository.get_inventory('A')
self.wt.add(['file'], ['fileid'])
self.wt.commit('add file', rev_id='B')
self.inv_B = self.branch.repository.get_inventory('B')
uncommit(self.branch, tree=self.wt)
self.assertEqual(self.branch.revision_history(), ['A'])
self.wt.commit('another add of file', rev_id='C')
self.inv_C = self.branch.repository.get_inventory('C')
self.wt.add_parent_tree_id('B')
self.wt.commit('merge in B', rev_id='D')
self.inv_D = self.branch.repository.get_inventory('D')
self.tree = self.workingtree_to_test_tree(self.wt)
self.tree.lock_read()
self.addCleanup(self.tree.unlock)
self.file_active = self.tree.inventory['fileid']
self.weave = self.branch.repository.weave_store.get_weave('fileid',
self.branch.repository.get_transaction())
def get_previous_heads(self, inventories):
return self.applyDeprecated(zero_ninetyone,
self.file_active.find_previous_heads,
inventories,
self.branch.repository.weave_store,
self.branch.repository.get_transaction())
def test_fileid_in_no_inventory(self):
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
def test_fileid_in_one_inventory(self):
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_B]))
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_A, self.inv_B]))
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_B, self.inv_A]))
def test_fileid_in_two_inventories_gives_both_entries(self):
self.assertEqual({'B':self.inv_B['fileid'],
'C':self.inv_C['fileid']},
self.get_previous_heads([self.inv_B, self.inv_C]))
self.assertEqual({'B':self.inv_B['fileid'],
'C':self.inv_C['fileid']},
self.get_previous_heads([self.inv_C, self.inv_B]))
def test_fileid_in_two_inventories_already_merged_gives_head(self):
self.assertEqual({'D':self.inv_D['fileid']},
self.get_previous_heads([self.inv_B, self.inv_D]))
self.assertEqual({'D':self.inv_D['fileid']},
self.get_previous_heads([self.inv_D, self.inv_B]))
# TODO: test two inventories with the same file revision
class TestInventory(TestCaseWithTree):
def _set_up(self):
self.tree = self.get_tree_with_subdirs_and_all_content_types()
self.tree.lock_read()
self.addCleanup(self.tree.unlock)
# Commenting out the following line still fails.
self.inv = self.tree.inventory
def test_symlink_target(self):
self.requireFeature(SymlinkFeature)
self._set_up()
if isinstance(self.tree, MutableTree):
raise TestSkipped(
'symlinks not accurately represented in working trees')
entry = self.inv[self.inv.path2id('symlink')]
self.assertEqual(entry.symlink_target, 'link-target')
def test_symlink(self):
self.requireFeature(SymlinkFeature)
self._set_up()
entry = self.inv[self.inv.path2id('symlink')]
self.assertEqual(entry.kind, 'symlink')
self.assertEqual(None, entry.text_size)
|