← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Martin Pool
  • Date: 2006-03-21 12:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060321122654-514047ed65795a17
New developer commands 'weave-list' and 'weave-join'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by Canonical Ltd
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib import errors, inventory, osutils
18
 
from bzrlib.inventory import (Inventory, ROOT_ID, InventoryFile,
19
 
    InventoryDirectory, InventoryEntry, TreeReference)
20
 
from bzrlib.osutils import (pathjoin, is_inside_any, 
21
 
    is_inside_or_parent_of_any)
22
 
from bzrlib.tests import TestCase
 
17
from cStringIO import StringIO
 
18
import os
 
19
 
 
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
23
27
 
24
28
 
25
29
class TestInventory(TestCase):
26
30
 
27
 
    def test_add_path(self):
28
 
 
29
 
        inv = Inventory(root_id=None)
30
 
        self.assertIs(None, inv.root)
31
 
        ie = inv.add_path("", "directory", "my-root")
32
 
        self.assertEqual("my-root", ie.file_id)
33
 
        self.assertIs(ie, inv.root)
34
 
 
35
31
    def test_is_within(self):
 
32
        from bzrlib.osutils import is_inside_any
36
33
 
37
34
        SRC_FOO_C = pathjoin('src', 'foo.c')
38
35
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
44
41
        for dirs, fn in [(['src'], 'srccontrol'),
45
42
                         (['src'], 'srccontrol/foo')]:
46
43
            self.assertFalse(is_inside_any(dirs, fn))
47
 
 
48
 
    def test_is_within_or_parent(self):
49
 
        for dirs, fn in [(['src', 'doc'], 'src/foo.c'),
50
 
                         (['src'], 'src/foo.c'),
51
 
                         (['src/bar.c'], 'src'),
52
 
                         (['src/bar.c', 'bla/foo.c'], 'src'),
53
 
                         (['src'], 'src'),
54
 
                         ]:
55
 
            self.assert_(is_inside_or_parent_of_any(dirs, fn))
56
44
            
57
 
        for dirs, fn in [(['src'], 'srccontrol'),
58
 
                         (['srccontrol/foo.c'], 'src'),
59
 
                         (['src'], 'srccontrol/foo')]:
60
 
            self.assertFalse(is_inside_or_parent_of_any(dirs, fn))
61
 
 
62
45
    def test_ids(self):
63
46
        """Test detection of files within selected directories."""
64
47
        inv = Inventory()
75
58
        
76
59
        self.assert_('src-id' in inv)
77
60
 
78
 
    def test_non_directory_children(self):
79
 
        """Test path2id when a parent directory has no children"""
80
 
        inv = inventory.Inventory('tree_root')
81
 
        inv.add(inventory.InventoryFile('file-id','file', 
82
 
                                        parent_id='tree_root'))
83
 
        inv.add(inventory.InventoryLink('link-id','link', 
84
 
                                        parent_id='tree_root'))
85
 
        self.assertIs(None, inv.path2id('file/subfile'))
86
 
        self.assertIs(None, inv.path2id('link/subfile'))
87
 
 
88
 
    def test_iter_entries(self):
89
 
        inv = Inventory()
90
 
        
91
 
        for args in [('src', 'directory', 'src-id'), 
92
 
                     ('doc', 'directory', 'doc-id'), 
93
 
                     ('src/hello.c', 'file', 'hello-id'),
94
 
                     ('src/bye.c', 'file', 'bye-id'),
95
 
                     ('Makefile', 'file', 'makefile-id')]:
96
 
            inv.add_path(*args)
97
 
 
98
 
        self.assertEqual([
99
 
            ('', ROOT_ID),
100
 
            ('Makefile', 'makefile-id'),
101
 
            ('doc', 'doc-id'),
102
 
            ('src', 'src-id'),
103
 
            ('src/bye.c', 'bye-id'),
104
 
            ('src/hello.c', 'hello-id'),
105
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries()])
106
 
            
107
 
    def test_iter_entries_by_dir(self):
108
 
        inv = Inventory()
109
 
        
110
 
        for args in [('src', 'directory', 'src-id'), 
111
 
                     ('doc', 'directory', 'doc-id'), 
112
 
                     ('src/hello.c', 'file', 'hello-id'),
113
 
                     ('src/bye.c', 'file', 'bye-id'),
114
 
                     ('zz', 'file', 'zz-id'),
115
 
                     ('src/sub/', 'directory', 'sub-id'),
116
 
                     ('src/zz.c', 'file', 'zzc-id'),
117
 
                     ('src/sub/a', 'file', 'a-id'),
118
 
                     ('Makefile', 'file', 'makefile-id')]:
119
 
            inv.add_path(*args)
120
 
 
121
 
        self.assertEqual([
122
 
            ('', ROOT_ID),
123
 
            ('Makefile', 'makefile-id'),
124
 
            ('doc', 'doc-id'),
125
 
            ('src', 'src-id'),
126
 
            ('zz', 'zz-id'),
127
 
            ('src/bye.c', 'bye-id'),
128
 
            ('src/hello.c', 'hello-id'),
129
 
            ('src/sub', 'sub-id'),
130
 
            ('src/zz.c', 'zzc-id'),
131
 
            ('src/sub/a', 'a-id'),
132
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir()])
133
 
            
134
 
        self.assertEqual([
135
 
            ('', ROOT_ID),
136
 
            ('Makefile', 'makefile-id'),
137
 
            ('doc', 'doc-id'),
138
 
            ('src', 'src-id'),
139
 
            ('zz', 'zz-id'),
140
 
            ('src/bye.c', 'bye-id'),
141
 
            ('src/hello.c', 'hello-id'),
142
 
            ('src/sub', 'sub-id'),
143
 
            ('src/zz.c', 'zzc-id'),
144
 
            ('src/sub/a', 'a-id'),
145
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
146
 
                specific_file_ids=('a-id', 'zzc-id', 'doc-id', ROOT_ID,
147
 
                'hello-id', 'bye-id', 'zz-id', 'src-id', 'makefile-id', 
148
 
                'sub-id'))])
149
 
 
150
 
        self.assertEqual([
151
 
            ('Makefile', 'makefile-id'),
152
 
            ('doc', 'doc-id'),
153
 
            ('zz', 'zz-id'),
154
 
            ('src/bye.c', 'bye-id'),
155
 
            ('src/hello.c', 'hello-id'),
156
 
            ('src/zz.c', 'zzc-id'),
157
 
            ('src/sub/a', 'a-id'),
158
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
159
 
                specific_file_ids=('a-id', 'zzc-id', 'doc-id',
160
 
                'hello-id', 'bye-id', 'zz-id', 'makefile-id'))])
161
 
 
162
 
        self.assertEqual([
163
 
            ('Makefile', 'makefile-id'),
164
 
            ('src/bye.c', 'bye-id'),
165
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
166
 
                specific_file_ids=('bye-id', 'makefile-id'))])
167
 
 
168
 
        self.assertEqual([
169
 
            ('Makefile', 'makefile-id'),
170
 
            ('src/bye.c', 'bye-id'),
171
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
172
 
                specific_file_ids=('bye-id', 'makefile-id'))])
173
 
 
174
 
        self.assertEqual([
175
 
            ('src/bye.c', 'bye-id'),
176
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
177
 
                specific_file_ids=('bye-id',))])
178
 
 
179
 
    def test_add_recursive(self):
180
 
        parent = InventoryDirectory('src-id', 'src', ROOT_ID)
181
 
        child = InventoryFile('hello-id', 'hello.c', 'src-id')
182
 
        parent.children[child.file_id] = child
183
 
        inv = Inventory()
184
 
        inv.add(parent)
185
 
        self.assertEqual('src/hello.c', inv.id2path('hello-id'))
 
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
186
67
 
187
68
 
188
69
class TestInventoryEntry(TestCase):
250
131
        link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
251
132
        self.failIf(link.has_text())
252
133
 
253
 
    def test_make_entry(self):
254
 
        self.assertIsInstance(inventory.make_entry("file", "name", ROOT_ID),
255
 
            inventory.InventoryFile)
256
 
        self.assertIsInstance(inventory.make_entry("symlink", "name", ROOT_ID),
257
 
            inventory.InventoryLink)
258
 
        self.assertIsInstance(inventory.make_entry("directory", "name", ROOT_ID),
259
 
            inventory.InventoryDirectory)
260
 
 
261
 
    def test_make_entry_non_normalized(self):
262
 
        orig_normalized_filename = osutils.normalized_filename
263
 
 
 
134
 
 
135
class TestEntryDiffing(TestCaseWithTransport):
 
136
 
 
137
    def setUp(self):
 
138
        super(TestEntryDiffing, self).setUp()
 
139
        self.wt = self.make_branch_and_tree('.')
 
140
        self.branch = self.wt.branch
 
141
        print >> open('file', 'wb'), 'foo'
 
142
        self.wt.add(['file'], ['fileid'])
 
143
        if has_symlinks():
 
144
            os.symlink('target1', 'symlink')
 
145
            self.wt.add(['symlink'], ['linkid'])
 
146
        self.wt.commit('message_1', rev_id = '1')
 
147
        print >> open('file', 'wb'), 'bar'
 
148
        if has_symlinks():
 
149
            os.unlink('symlink')
 
150
            os.symlink('target2', 'symlink')
 
151
        self.tree_1 = self.branch.repository.revision_tree('1')
 
152
        self.inv_1 = self.branch.repository.get_inventory('1')
 
153
        self.file_1 = self.inv_1['fileid']
 
154
        self.tree_2 = self.wt
 
155
        self.inv_2 = self.tree_2.read_working_inventory()
 
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)
 
167
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
168
                                            "+++ /dev/null\t\n"
 
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)
 
179
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
180
                                            "+++ new_label\t\n"
 
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)
 
191
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
192
                                            "+++ new_label\t\n"
 
193
                                            "@@ -1,1 +1,1 @@\n"
 
194
                                            "-foo\n"
 
195
                                            "+bar\n"
 
196
                                            "\n")
 
197
        
 
198
    def test_link_diff_deleted(self):
 
199
        if not has_symlinks():
 
200
            return
 
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):
 
210
        if not has_symlinks():
 
211
            return
 
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):
 
221
        if not has_symlinks():
 
222
            return
 
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")
 
230
 
 
231
 
 
232
class TestSnapshot(TestCaseWithTransport):
 
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()
 
242
        self.wt = self.make_branch_and_tree('.')
 
243
        self.branch = self.wt.branch
 
244
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
 
245
        self.wt.add(['subdir', 'subdir/file'],
 
246
                                       ['dirid', 'fileid'])
 
247
        if has_symlinks():
 
248
            pass
 
249
        self.wt.commit('message_1', rev_id = '1')
 
250
        self.tree_1 = self.branch.repository.revision_tree('1')
 
251
        self.inv_1 = self.branch.repository.get_inventory('1')
 
252
        self.file_1 = self.inv_1['fileid']
 
253
        self.file_active = self.wt.inventory['fileid']
 
254
 
 
255
    def test_snapshot_new_revision(self):
 
256
        # This tests that a simple commit with no parents makes a new
 
257
        # revision value in the inventory entry
 
258
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
 
259
                                  self.branch.repository.weave_store,
 
260
                                  self.branch.get_transaction())
 
261
        # expected outcome - file_1 has a revision id of '2', and we can get
 
262
        # its text of 'file contents' out of the weave.
 
263
        self.assertEqual(self.file_1.revision, '1')
 
264
        self.assertEqual(self.file_active.revision, '2')
 
265
        # this should be a separate test probably, but lets check it once..
 
266
        lines = self.branch.repository.weave_store.get_weave(
 
267
            'fileid', 
 
268
            self.branch.get_transaction()).get_lines('2')
 
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},
 
275
                                  self.wt, 
 
276
                                  self.branch.repository.weave_store,
 
277
                                  self.branch.get_transaction())
 
278
        self.assertEqual(self.file_1.revision, '1')
 
279
        self.assertEqual(self.file_active.revision, '1')
 
280
        vf = self.branch.repository.weave_store.get_weave(
 
281
            'fileid', 
 
282
            self.branch.repository.get_transaction())
 
283
        self.assertRaises(errors.RevisionNotPresent,
 
284
                          vf.get_lines,
 
285
                          '2')
 
286
 
 
287
    def test_snapshot_merge_identical_different_revid(self):
 
288
        # This tests that a commit with two identical parents, one of which has
 
289
        # a different revision id, results in a new revision id in the entry.
 
290
        # 1->other, commit a merge of other against 1, results in 2.
 
291
        other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
 
292
        other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
 
293
        other_ie.revision = '1'
 
294
        other_ie.text_sha1 = self.file_1.text_sha1
 
295
        other_ie.text_size = self.file_1.text_size
 
296
        self.assertEqual(self.file_1, other_ie)
 
297
        other_ie.revision = 'other'
 
298
        self.assertNotEqual(self.file_1, other_ie)
 
299
        versionfile = self.branch.repository.weave_store.get_weave(
 
300
            'fileid', self.branch.repository.get_transaction())
 
301
        versionfile.clone_text('other', '1', ['1'])
 
302
        self.file_active.snapshot('2', 'subdir/file', 
 
303
                                  {'1':self.file_1, 'other':other_ie},
 
304
                                  self.wt, 
 
305
                                  self.branch.repository.weave_store,
 
306
                                  self.branch.get_transaction())
 
307
        self.assertEqual(self.file_active.revision, '2')
 
308
 
 
309
    def test_snapshot_changed(self):
 
310
        # This tests that a commit with one different parent results in a new
 
311
        # revision id in the entry.
 
312
        self.file_active.name='newname'
 
313
        rename('subdir/file', 'subdir/newname')
 
314
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
 
315
                                  self.wt,
 
316
                                  self.branch.repository.weave_store,
 
317
                                  self.branch.get_transaction())
 
318
        # expected outcome - file_1 has a revision id of '2'
 
319
        self.assertEqual(self.file_active.revision, '2')
 
320
 
 
321
 
 
322
class TestPreviousHeads(TestCaseWithTransport):
 
323
 
 
324
    def setUp(self):
 
325
        # we want several inventories, that respectively
 
326
        # give use the following scenarios:
 
327
        # A) fileid not in any inventory (A),
 
328
        # B) fileid present in one inventory (B) and (A,B)
 
329
        # C) fileid present in two inventories, and they
 
330
        #   are not mutual descendents (B, C)
 
331
        # D) fileid present in two inventories and one is
 
332
        #   a descendent of the other. (B, D)
 
333
        super(TestPreviousHeads, self).setUp()
 
334
        self.wt = self.make_branch_and_tree('.')
 
335
        self.branch = self.wt.branch
 
336
        self.build_tree(['file'])
 
337
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
 
338
        self.inv_A = self.branch.repository.get_inventory('A')
 
339
        self.wt.add(['file'], ['fileid'])
 
340
        self.wt.commit('add file', rev_id='B')
 
341
        self.inv_B = self.branch.repository.get_inventory('B')
 
342
        self.branch.lock_write()
264
343
        try:
265
 
            osutils.normalized_filename = osutils._accessible_normalized_filename
266
 
            entry = inventory.make_entry("file", u'a\u030a', ROOT_ID)
267
 
            self.assertEqual(u'\xe5', entry.name)
268
 
            self.assertIsInstance(entry, inventory.InventoryFile)
269
 
 
270
 
            osutils.normalized_filename = osutils._inaccessible_normalized_filename
271
 
            self.assertRaises(errors.InvalidNormalization,
272
 
                    inventory.make_entry, 'file', u'a\u030a', ROOT_ID)
 
344
            self.branch.control_files.put_utf8('revision-history', 'A\n')
273
345
        finally:
274
 
            osutils.normalized_filename = orig_normalized_filename
275
 
 
276
 
 
277
 
class TestDescribeChanges(TestCase):
278
 
 
279
 
    def test_describe_change(self):
280
 
        # we need to test the following change combinations:
281
 
        # rename
282
 
        # reparent
283
 
        # modify
284
 
        # gone
285
 
        # added
286
 
        # renamed/reparented and modified
287
 
        # change kind (perhaps can't be done yet?)
288
 
        # also, merged in combination with all of these?
289
 
        old_a = InventoryFile('a-id', 'a_file', ROOT_ID)
290
 
        old_a.text_sha1 = '123132'
291
 
        old_a.text_size = 0
292
 
        new_a = InventoryFile('a-id', 'a_file', ROOT_ID)
293
 
        new_a.text_sha1 = '123132'
294
 
        new_a.text_size = 0
295
 
 
296
 
        self.assertChangeDescription('unchanged', old_a, new_a)
297
 
 
298
 
        new_a.text_size = 10
299
 
        new_a.text_sha1 = 'abcabc'
300
 
        self.assertChangeDescription('modified', old_a, new_a)
301
 
 
302
 
        self.assertChangeDescription('added', None, new_a)
303
 
        self.assertChangeDescription('removed', old_a, None)
304
 
        # perhaps a bit questionable but seems like the most reasonable thing...
305
 
        self.assertChangeDescription('unchanged', None, None)
306
 
 
307
 
        # in this case it's both renamed and modified; show a rename and 
308
 
        # modification:
309
 
        new_a.name = 'newfilename'
310
 
        self.assertChangeDescription('modified and renamed', old_a, new_a)
311
 
 
312
 
        # reparenting is 'renaming'
313
 
        new_a.name = old_a.name
314
 
        new_a.parent_id = 'somedir-id'
315
 
        self.assertChangeDescription('modified and renamed', old_a, new_a)
316
 
 
317
 
        # reset the content values so its not modified
318
 
        new_a.text_size = old_a.text_size
319
 
        new_a.text_sha1 = old_a.text_sha1
320
 
        new_a.name = old_a.name
321
 
 
322
 
        new_a.name = 'newfilename'
323
 
        self.assertChangeDescription('renamed', old_a, new_a)
324
 
 
325
 
        # reparenting is 'renaming'
326
 
        new_a.name = old_a.name
327
 
        new_a.parent_id = 'somedir-id'
328
 
        self.assertChangeDescription('renamed', old_a, new_a)
329
 
 
330
 
    def assertChangeDescription(self, expected_change, old_ie, new_ie):
331
 
        change = InventoryEntry.describe_change(old_ie, new_ie)
332
 
        self.assertEqual(expected_change, change)
333
 
 
334
 
 
335
 
class TestIsRoot(TestCase):
336
 
    """Ensure our root-checking code is accurate."""
337
 
 
338
 
    def test_is_root(self):
339
 
        inv = Inventory('TREE_ROOT')
340
 
        self.assertTrue(inv.is_root('TREE_ROOT'))
341
 
        self.assertFalse(inv.is_root('booga'))
342
 
        inv.root.file_id = 'booga'
343
 
        self.assertFalse(inv.is_root('TREE_ROOT'))
344
 
        self.assertTrue(inv.is_root('booga'))
345
 
        # works properly even if no root is set
346
 
        inv.root = None
347
 
        self.assertFalse(inv.is_root('TREE_ROOT'))
348
 
        self.assertFalse(inv.is_root('booga'))
349
 
 
350
 
 
351
 
class TestTreeReference(TestCase):
352
 
    
353
 
    def test_create(self):
354
 
        inv = Inventory('tree-root-123')
355
 
        inv.add(TreeReference('nested-id', 'nested', parent_id='tree-root-123',
356
 
                              revision='rev', reference_revision='rev2'))
357
 
 
358
 
 
359
 
class TestEncoding(TestCase):
360
 
 
361
 
    def test_error_encoding(self):
362
 
        inv = Inventory('tree-root')
363
 
        inv.add(InventoryFile('a-id', u'\u1234', 'tree-root'))
364
 
        try:
365
 
            inv.add(InventoryFile('b-id', u'\u1234', 'tree-root'))
366
 
        except errors.BzrError, e:
367
 
            self.assertContainsRe(str(e), u'\u1234'.encode('utf-8'))
368
 
        else:
369
 
            self.fail('BzrError not raised')
 
346
            self.branch.unlock()
 
347
        self.assertEqual(self.branch.revision_history(), ['A'])
 
348
        self.wt.commit('another add of file', rev_id='C')
 
349
        self.inv_C = self.branch.repository.get_inventory('C')
 
350
        self.wt.add_pending_merge('B')
 
351
        self.wt.commit('merge in B', rev_id='D')
 
352
        self.inv_D = self.branch.repository.get_inventory('D')
 
353
        self.file_active = self.wt.inventory['fileid']
 
354
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
 
355
            self.branch.repository.get_transaction())
 
356
        
 
357
    def get_previous_heads(self, inventories):
 
358
        return self.file_active.find_previous_heads(
 
359
            inventories, 
 
360
            self.branch.repository.weave_store,
 
361
            self.branch.repository.get_transaction())
 
362
        
 
363
    def test_fileid_in_no_inventory(self):
 
364
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
 
365
 
 
366
    def test_fileid_in_one_inventory(self):
 
367
        self.assertEqual({'B':self.inv_B['fileid']},
 
368
                         self.get_previous_heads([self.inv_B]))
 
369
        self.assertEqual({'B':self.inv_B['fileid']},
 
370
                         self.get_previous_heads([self.inv_A, self.inv_B]))
 
371
        self.assertEqual({'B':self.inv_B['fileid']},
 
372
                         self.get_previous_heads([self.inv_B, self.inv_A]))
 
373
 
 
374
    def test_fileid_in_two_inventories_gives_both_entries(self):
 
375
        self.assertEqual({'B':self.inv_B['fileid'],
 
376
                          'C':self.inv_C['fileid']},
 
377
                          self.get_previous_heads([self.inv_B, self.inv_C]))
 
378
        self.assertEqual({'B':self.inv_B['fileid'],
 
379
                          'C':self.inv_C['fileid']},
 
380
                          self.get_previous_heads([self.inv_C, self.inv_B]))
 
381
 
 
382
    def test_fileid_in_two_inventories_already_merged_gives_head(self):
 
383
        self.assertEqual({'D':self.inv_D['fileid']},
 
384
                         self.get_previous_heads([self.inv_B, self.inv_D]))
 
385
        self.assertEqual({'D':self.inv_D['fileid']},
 
386
                         self.get_previous_heads([self.inv_D, self.inv_B]))
 
387
 
 
388
    # TODO: test two inventories with the same file revision 
 
389
 
 
390
 
 
391
class TestExecutable(TestCaseWithTransport):
 
392
 
 
393
    def test_stays_executable(self):
 
394
        basic_inv = """<inventory format="5">
 
395
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
 
396
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
 
397
</inventory>
 
398
"""
 
399
        wt = self.make_branch_and_tree('b1')
 
400
        b = wt.branch
 
401
        open('b1/a', 'wb').write('a test\n')
 
402
        open('b1/b', 'wb').write('b test\n')
 
403
        os.chmod('b1/a', 0755)
 
404
        os.chmod('b1/b', 0644)
 
405
        # Manually writing the inventory, to ensure that
 
406
        # the executable="yes" entry is set for 'a' and not for 'b'
 
407
        open('b1/.bzr/inventory', 'wb').write(basic_inv)
 
408
 
 
409
        a_id = "a-20051208024829-849e76f7968d7a86"
 
410
        b_id = "b-20051208024829-849e76f7968d7a86"
 
411
        wt = wt.bzrdir.open_workingtree()
 
412
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
413
 
 
414
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
415
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
416
 
 
417
        wt.commit('adding a,b', rev_id='r1')
 
418
 
 
419
        rev_tree = b.repository.revision_tree('r1')
 
420
        self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
 
421
        self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
 
422
 
 
423
        self.failUnless(rev_tree.inventory[a_id].executable)
 
424
        self.failIf(rev_tree.inventory[b_id].executable)
 
425
 
 
426
        # Make sure the entries are gone
 
427
        os.remove('b1/a')
 
428
        os.remove('b1/b')
 
429
        self.failIf(wt.has_id(a_id))
 
430
        self.failIf(wt.has_filename('a'))
 
431
        self.failIf(wt.has_id(b_id))
 
432
        self.failIf(wt.has_filename('b'))
 
433
 
 
434
        # Make sure that revert is able to bring them back,
 
435
        # and sets 'a' back to being executable
 
436
 
 
437
        wt.revert(['a', 'b'], rev_tree, backups=False)
 
438
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
439
 
 
440
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
441
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
442
 
 
443
        # Now remove them again, and make sure that after a
 
444
        # commit, they are still marked correctly
 
445
        os.remove('b1/a')
 
446
        os.remove('b1/b')
 
447
        wt.commit('removed', rev_id='r2')
 
448
 
 
449
        self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
 
450
        self.failIf(wt.has_id(a_id))
 
451
        self.failIf(wt.has_filename('a'))
 
452
        self.failIf(wt.has_id(b_id))
 
453
        self.failIf(wt.has_filename('b'))
 
454
 
 
455
        # Now revert back to the previous commit
 
456
        wt.revert([], rev_tree, backups=False)
 
457
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
458
 
 
459
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
460
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
461
 
 
462
        # Now make sure that 'bzr branch' also preserves the
 
463
        # executable bit
 
464
        # TODO: Maybe this should be a blackbox test
 
465
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
466
        t2 = d2.open_workingtree()
 
467
        b2 = t2.branch
 
468
        self.assertEquals('r1', b2.last_revision())
 
469
 
 
470
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
471
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
472
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
 
473
 
 
474
        # Make sure pull will delete the files
 
475
        t2.pull(b)
 
476
        self.assertEquals('r2', b2.last_revision())
 
477
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
 
478
 
 
479
        # Now commit the changes on the first branch
 
480
        # so that the second branch can pull the changes
 
481
        # and make sure that the executable bit has been copied
 
482
        wt.commit('resurrected', rev_id='r3')
 
483
 
 
484
        t2.pull(b)
 
485
        self.assertEquals('r3', b2.last_revision())
 
486
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
487
 
 
488
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
489
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
 
490
 
 
491
class TestRevert(TestCaseWithTransport):
 
492
    def test_dangling_id(self):
 
493
        wt = self.make_branch_and_tree('b1')
 
494
        self.assertEqual(len(wt.inventory), 1)
 
495
        open('b1/a', 'wb').write('a test\n')
 
496
        wt.add('a')
 
497
        self.assertEqual(len(wt.inventory), 2)
 
498
        os.unlink('b1/a')
 
499
        wt.revert([])
 
500
        self.assertEqual(len(wt.inventory), 1)
 
501
 
 
502