~bzr-pqm/bzr/bzr.dev

963 by Martin Pool
- add the start of a test for inventory file-id matching
1
# Copyright (C) 2005 by Canonical Ltd
2
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.
7
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.
12
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
16
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
17
from cStringIO import StringIO
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
18
import os
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
19
20
from bzrlib.branch import Branch
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
21
import bzrlib.errors as errors
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
22
from bzrlib.diff import internal_diff
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
23
from bzrlib.inventory import Inventory, ROOT_ID
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
24
import bzrlib.inventory as inventory
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
25
from bzrlib.osutils import has_symlinks, rename
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
26
from bzrlib.tests import TestCase, TestCaseInTempDir
963 by Martin Pool
- add the start of a test for inventory file-id matching
27
969 by Martin Pool
- Add less-sucky is_within_any
28
1102 by Martin Pool
- merge test refactoring from robertc
29
class TestInventory(TestCase):
30
31
    def test_is_within(self):
968 by Martin Pool
- add some passing tests for is_inside_any
32
        from bzrlib.osutils import is_inside_any
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
33
34
        SRC_FOO_C = os.path.join('src', 'foo.c')
35
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
36
                         (['src'], SRC_FOO_C),
968 by Martin Pool
- add some passing tests for is_inside_any
37
                         (['src'], 'src'),
38
                         ]:
39
            self.assert_(is_inside_any(dirs, fn))
40
            
969 by Martin Pool
- Add less-sucky is_within_any
41
        for dirs, fn in [(['src'], 'srccontrol'),
42
                         (['src'], 'srccontrol/foo')]:
43
            self.assertFalse(is_inside_any(dirs, fn))
44
            
1102 by Martin Pool
- merge test refactoring from robertc
45
    def test_ids(self):
963 by Martin Pool
- add the start of a test for inventory file-id matching
46
        """Test detection of files within selected directories."""
47
        inv = Inventory()
48
        
49
        for args in [('src', 'directory', 'src-id'), 
50
                     ('doc', 'directory', 'doc-id'), 
51
                     ('src/hello.c', 'file'),
52
                     ('src/bye.c', 'file', 'bye-id'),
53
                     ('Makefile', 'file')]:
54
            inv.add_path(*args)
55
            
56
        self.assertEqual(inv.path2id('src'), 'src-id')
57
        self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
58
        
59
        self.assert_('src-id' in inv)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
60
61
62
    def test_version(self):
63
        """Inventory remembers the text's version."""
64
        inv = Inventory()
65
        ie = inv.add_path('foo.txt', 'file')
66
        ## XXX
67
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
68
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
69
class TestInventoryEntry(TestCase):
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
70
71
    def test_file_kind_character(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
72
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
73
        self.assertEqual(file.kind_character(), '')
74
75
    def test_dir_kind_character(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
76
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
77
        self.assertEqual(dir.kind_character(), '/')
78
79
    def test_link_kind_character(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
80
        dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
81
        self.assertEqual(dir.kind_character(), '')
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
82
83
    def test_dir_detect_changes(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
84
        left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
85
        left.text_sha1 = 123
86
        left.executable = True
87
        left.symlink_target='foo'
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
88
        right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
89
        right.text_sha1 = 321
90
        right.symlink_target='bar'
91
        self.assertEqual((False, False), left.detect_changes(right))
92
        self.assertEqual((False, False), right.detect_changes(left))
93
94
    def test_file_detect_changes(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
95
        left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
96
        left.text_sha1 = 123
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
97
        right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
98
        right.text_sha1 = 123
99
        self.assertEqual((False, False), left.detect_changes(right))
100
        self.assertEqual((False, False), right.detect_changes(left))
101
        left.executable = True
102
        self.assertEqual((False, True), left.detect_changes(right))
103
        self.assertEqual((False, True), right.detect_changes(left))
104
        right.text_sha1 = 321
105
        self.assertEqual((True, True), left.detect_changes(right))
106
        self.assertEqual((True, True), right.detect_changes(left))
107
108
    def test_symlink_detect_changes(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
109
        left = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
110
        left.text_sha1 = 123
111
        left.executable = True
112
        left.symlink_target='foo'
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
113
        right = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
114
        right.text_sha1 = 321
115
        right.symlink_target='foo'
116
        self.assertEqual((False, False), left.detect_changes(right))
117
        self.assertEqual((False, False), right.detect_changes(left))
118
        left.symlink_target = 'different'
119
        self.assertEqual((True, False), left.detect_changes(right))
120
        self.assertEqual((True, False), right.detect_changes(left))
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
121
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
122
    def test_file_has_text(self):
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
123
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
124
        self.failUnless(file.has_text())
125
126
    def test_directory_has_text(self):
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
127
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
128
        self.failIf(dir.has_text())
129
130
    def test_link_has_text(self):
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
131
        link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
1399.1.5 by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py
132
        self.failIf(link.has_text())
133
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
134
135
class TestEntryDiffing(TestCaseInTempDir):
136
137
    def setUp(self):
138
        super(TestEntryDiffing, self).setUp()
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
139
        self.branch = Branch.initialize(u'.')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
140
        self.wt = self.branch.working_tree()
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
141
        print >> open('file', 'wb'), 'foo'
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
142
        self.branch.working_tree().add(['file'], ['fileid'])
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
143
        if has_symlinks():
144
            os.symlink('target1', 'symlink')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
145
            self.branch.working_tree().add(['symlink'], ['linkid'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
146
        self.wt.commit('message_1', rev_id = '1')
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
147
        print >> open('file', 'wb'), 'bar'
148
        if has_symlinks():
149
            os.unlink('symlink')
150
            os.symlink('target2', 'symlink')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
151
        self.tree_1 = self.branch.repository.revision_tree('1')
152
        self.inv_1 = self.branch.repository.get_inventory('1')
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
153
        self.file_1 = self.inv_1['fileid']
154
        self.tree_2 = self.branch.working_tree()
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
155
        self.inv_2 = self.tree_2.read_working_inventory()
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
156
        self.file_2 = self.inv_2['fileid']
157
        if has_symlinks():
158
            self.link_1 = self.inv_1['linkid']
159
            self.link_2 = self.inv_2['linkid']
160
161
    def test_file_diff_deleted(self):
162
        output = StringIO()
163
        self.file_1.diff(internal_diff, 
164
                          "old_label", self.tree_1,
165
                          "/dev/null", None, None,
166
                          output)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
167
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
168
                                            "+++ /dev/null\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
169
                                            "@@ -1,1 +0,0 @@\n"
170
                                            "-foo\n"
171
                                            "\n")
172
173
    def test_file_diff_added(self):
174
        output = StringIO()
175
        self.file_1.diff(internal_diff, 
176
                          "new_label", self.tree_1,
177
                          "/dev/null", None, None,
178
                          output, reverse=True)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
179
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
180
                                            "+++ new_label\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
181
                                            "@@ -0,0 +1,1 @@\n"
182
                                            "+foo\n"
183
                                            "\n")
184
185
    def test_file_diff_changed(self):
186
        output = StringIO()
187
        self.file_1.diff(internal_diff, 
188
                          "/dev/null", self.tree_1, 
189
                          "new_label", self.file_2, self.tree_2,
190
                          output)
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
191
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
192
                                            "+++ new_label\t\n"
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
193
                                            "@@ -1,1 +1,1 @@\n"
194
                                            "-foo\n"
195
                                            "+bar\n"
196
                                            "\n")
197
        
198
    def test_link_diff_deleted(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
199
        if not has_symlinks():
200
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
201
        output = StringIO()
202
        self.link_1.diff(internal_diff, 
203
                          "old_label", self.tree_1,
204
                          "/dev/null", None, None,
205
                          output)
206
        self.assertEqual(output.getvalue(),
207
                         "=== target was 'target1'\n")
208
209
    def test_link_diff_added(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
210
        if not has_symlinks():
211
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
212
        output = StringIO()
213
        self.link_1.diff(internal_diff, 
214
                          "new_label", self.tree_1,
215
                          "/dev/null", None, None,
216
                          output, reverse=True)
217
        self.assertEqual(output.getvalue(),
218
                         "=== target is 'target1'\n")
219
220
    def test_link_diff_changed(self):
1431 by Robert Collins
BUGFIX: disable symlink support tests when no symlink support is present on the system.
221
        if not has_symlinks():
222
            return
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
223
        output = StringIO()
224
        self.link_1.diff(internal_diff, 
225
                          "/dev/null", self.tree_1, 
226
                          "new_label", self.link_2, self.tree_2,
227
                          output)
228
        self.assertEqual(output.getvalue(),
229
                         "=== target changed 'target1' => 'target2'\n")
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
230
231
232
class TestSnapshot(TestCaseInTempDir):
233
234
    def setUp(self):
235
        # for full testing we'll need a branch
236
        # with a subdir to test parent changes.
237
        # and a file, link and dir under that.
238
        # but right now I only need one attribute
239
        # to change, and then test merge patterns
240
        # with fake parent entries.
241
        super(TestSnapshot, self).setUp()
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
242
        self.branch = Branch.initialize(u'.')
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
243
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
244
        self.branch.working_tree().add(['subdir', 'subdir/file'],
245
                                       ['dirid', 'fileid'])
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
246
        if has_symlinks():
247
            pass
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
248
        self.wt = self.branch.working_tree()
249
        self.wt.commit('message_1', rev_id = '1')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
250
        self.tree_1 = self.branch.repository.revision_tree('1')
251
        self.inv_1 = self.branch.repository.get_inventory('1')
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
252
        self.file_1 = self.inv_1['fileid']
253
        self.work_tree = self.branch.working_tree()
254
        self.file_active = self.work_tree.inventory['fileid']
255
256
    def test_snapshot_new_revision(self):
257
        # This tests that a simple commit with no parents makes a new
258
        # revision value in the inventory entry
259
        self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
260
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
261
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
262
        # expected outcome - file_1 has a revision id of '2', and we can get
263
        # its text of 'file contents' out of the weave.
264
        self.assertEqual(self.file_1.revision, '1')
265
        self.assertEqual(self.file_active.revision, '2')
266
        # this should be a separate test probably, but lets check it once..
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
267
        lines = self.branch.repository.weave_store.get_lines('fileid','2',
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
268
            self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
269
        self.assertEqual(lines, ['contents of subdir/file\n'])
270
271
    def test_snapshot_unchanged(self):
272
        #This tests that a simple commit does not make a new entry for
273
        # an unchanged inventory entry
274
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
275
                                  self.work_tree, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
276
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
277
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
278
        self.assertEqual(self.file_1.revision, '1')
279
        self.assertEqual(self.file_active.revision, '1')
280
        self.assertRaises(errors.WeaveError,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
281
                          self.branch.repository.weave_store.get_lines, 
282
                          'fileid', '2', self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
283
284
    def test_snapshot_merge_identical_different_revid(self):
285
        # This tests that a commit with two identical parents, one of which has
286
        # a different revision id, results in a new revision id in the entry.
1408 by Robert Collins
we do not need revision_trees in commit, parent inventories are sufficient
287
        # 1->other, commit a merge of other against 1, results in 2.
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
288
        other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
289
        other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
290
        other_ie.revision = '1'
291
        other_ie.text_sha1 = self.file_1.text_sha1
292
        other_ie.text_size = self.file_1.text_size
293
        self.assertEqual(self.file_1, other_ie)
294
        other_ie.revision = 'other'
295
        self.assertNotEqual(self.file_1, other_ie)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
296
        self.branch.repository.weave_store.add_identical_text('fileid', '1', 
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
297
            'other', ['1'], self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
298
        self.file_active.snapshot('2', 'subdir/file', 
299
                                  {'1':self.file_1, 'other':other_ie},
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
300
                                  self.work_tree, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
301
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
302
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
303
        self.assertEqual(self.file_active.revision, '2')
304
305
    def test_snapshot_changed(self):
306
        # This tests that a commit with one different parent results in a new
307
        # revision id in the entry.
308
        self.file_active.name='newname'
309
        rename('subdir/file', 'subdir/newname')
310
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
311
                                  self.work_tree, 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
312
                                  self.branch.repository.weave_store,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
313
                                  self.branch.get_transaction())
1407 by Robert Collins
define some expected behaviour for inventory_entry.snapshot
314
        # expected outcome - file_1 has a revision id of '2'
315
        self.assertEqual(self.file_active.revision, '2')
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
316
317
318
class TestPreviousHeads(TestCaseInTempDir):
319
320
    def setUp(self):
321
        # we want several inventories, that respectively
322
        # give use the following scenarios:
323
        # A) fileid not in any inventory (A),
324
        # B) fileid present in one inventory (B) and (A,B)
325
        # C) fileid present in two inventories, and they
326
        #   are not mutual descendents (B, C)
327
        # D) fileid present in two inventories and one is
328
        #   a descendent of the other. (B, D)
329
        super(TestPreviousHeads, self).setUp()
330
        self.build_tree(['file'])
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
331
        self.branch = Branch.initialize(u'.')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
332
        self.wt = self.branch.working_tree()
333
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
334
        self.inv_A = self.branch.repository.get_inventory('A')
1185.65.13 by Robert Collins
Merge from integration
335
        self.wt.add(['file'], ['fileid'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
336
        self.wt.commit('add file', rev_id='B')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
337
        self.inv_B = self.branch.repository.get_inventory('B')
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
338
        self.branch.control_files.put_utf8('revision-history', 'A\n')
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
339
        self.assertEqual(self.branch.revision_history(), ['A'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
340
        self.wt.commit('another add of file', rev_id='C')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
341
        self.inv_C = self.branch.repository.get_inventory('C')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
342
        self.wt.add_pending_merge('B')
343
        self.wt.commit('merge in B', rev_id='D')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
344
        self.inv_D = self.branch.repository.get_inventory('D')
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
345
        self.file_active = self.branch.working_tree().inventory['fileid']
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
346
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
347
            self.branch.get_transaction())
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
348
        
349
    def get_previous_heads(self, inventories):
350
        return self.file_active.find_previous_heads(inventories, self.weave)
351
        
352
    def test_fileid_in_no_inventory(self):
353
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
354
355
    def test_fileid_in_one_inventory(self):
356
        self.assertEqual({'B':self.inv_B['fileid']},
357
                         self.get_previous_heads([self.inv_B]))
358
        self.assertEqual({'B':self.inv_B['fileid']},
359
                         self.get_previous_heads([self.inv_A, self.inv_B]))
360
        self.assertEqual({'B':self.inv_B['fileid']},
361
                         self.get_previous_heads([self.inv_B, self.inv_A]))
362
363
    def test_fileid_in_two_inventories_gives_both_entries(self):
364
        self.assertEqual({'B':self.inv_B['fileid'],
365
                          'C':self.inv_C['fileid']},
366
                          self.get_previous_heads([self.inv_B, self.inv_C]))
367
        self.assertEqual({'B':self.inv_B['fileid'],
368
                          'C':self.inv_C['fileid']},
369
                          self.get_previous_heads([self.inv_C, self.inv_B]))
370
371
    def test_fileid_in_two_inventories_already_merged_gives_head(self):
372
        self.assertEqual({'D':self.inv_D['fileid']},
373
                         self.get_previous_heads([self.inv_B, self.inv_D]))
374
        self.assertEqual({'D':self.inv_D['fileid']},
375
                         self.get_previous_heads([self.inv_D, self.inv_B]))
376
377
    # TODO: test two inventories with the same file revision