← 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-06-05 18:00:36 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: mbp@sourcefrog.net-20060605180036-04f5d0cea94ed999
clean up test kipple

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
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.selftest import TestBase
18
 
 
19
 
from bzrlib.inventory import Inventory, InventoryEntry
20
 
 
21
 
 
22
 
class TestIsWithin(TestBase):
23
 
    def runTest(self):
 
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
 
27
from bzrlib.transform import TreeTransform
 
28
from bzrlib.uncommit import uncommit
 
29
 
 
30
 
 
31
class TestInventory(TestCase):
 
32
 
 
33
    def test_is_within(self):
24
34
        from bzrlib.osutils import is_inside_any
25
 
        
26
 
        for dirs, fn in [(['src', 'doc'], 'src/foo.c'),
27
 
                         (['src'], 'src/foo.c'),
 
35
 
 
36
        SRC_FOO_C = pathjoin('src', 'foo.c')
 
37
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
 
38
                         (['src'], SRC_FOO_C),
28
39
                         (['src'], 'src'),
29
40
                         ]:
30
41
            self.assert_(is_inside_any(dirs, fn))
33
44
                         (['src'], 'srccontrol/foo')]:
34
45
            self.assertFalse(is_inside_any(dirs, fn))
35
46
            
36
 
            
37
 
            
38
 
class TestInventoryIds(TestBase):
39
 
    def runTest(self):
 
47
    def test_ids(self):
40
48
        """Test detection of files within selected directories."""
41
49
        inv = Inventory()
42
50
        
51
59
        self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
52
60
        
53
61
        self.assert_('src-id' in inv)
 
62
 
 
63
 
 
64
    def test_version(self):
 
65
        """Inventory remembers the text's version."""
 
66
        inv = Inventory()
 
67
        ie = inv.add_path('foo.txt', 'file')
 
68
        ## XXX
 
69
 
 
70
 
 
71
class TestInventoryEntry(TestCase):
 
72
 
 
73
    def test_file_kind_character(self):
 
74
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
 
75
        self.assertEqual(file.kind_character(), '')
 
76
 
 
77
    def test_dir_kind_character(self):
 
78
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
 
79
        self.assertEqual(dir.kind_character(), '/')
 
80
 
 
81
    def test_link_kind_character(self):
 
82
        dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
 
83
        self.assertEqual(dir.kind_character(), '')
 
84
 
 
85
    def test_dir_detect_changes(self):
 
86
        left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
 
87
        left.text_sha1 = 123
 
88
        left.executable = True
 
89
        left.symlink_target='foo'
 
90
        right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
 
91
        right.text_sha1 = 321
 
92
        right.symlink_target='bar'
 
93
        self.assertEqual((False, False), left.detect_changes(right))
 
94
        self.assertEqual((False, False), right.detect_changes(left))
 
95
 
 
96
    def test_file_detect_changes(self):
 
97
        left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
 
98
        left.text_sha1 = 123
 
99
        right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
 
100
        right.text_sha1 = 123
 
101
        self.assertEqual((False, False), left.detect_changes(right))
 
102
        self.assertEqual((False, False), right.detect_changes(left))
 
103
        left.executable = True
 
104
        self.assertEqual((False, True), left.detect_changes(right))
 
105
        self.assertEqual((False, True), right.detect_changes(left))
 
106
        right.text_sha1 = 321
 
107
        self.assertEqual((True, True), left.detect_changes(right))
 
108
        self.assertEqual((True, True), right.detect_changes(left))
 
109
 
 
110
    def test_symlink_detect_changes(self):
 
111
        left = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
 
112
        left.text_sha1 = 123
 
113
        left.executable = True
 
114
        left.symlink_target='foo'
 
115
        right = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
 
116
        right.text_sha1 = 321
 
117
        right.symlink_target='foo'
 
118
        self.assertEqual((False, False), left.detect_changes(right))
 
119
        self.assertEqual((False, False), right.detect_changes(left))
 
120
        left.symlink_target = 'different'
 
121
        self.assertEqual((True, False), left.detect_changes(right))
 
122
        self.assertEqual((True, False), right.detect_changes(left))
 
123
 
 
124
    def test_file_has_text(self):
 
125
        file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
 
126
        self.failUnless(file.has_text())
 
127
 
 
128
    def test_directory_has_text(self):
 
129
        dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
 
130
        self.failIf(dir.has_text())
 
131
 
 
132
    def test_link_has_text(self):
 
133
        link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
 
134
        self.failIf(link.has_text())
 
135
 
 
136
 
 
137
class TestEntryDiffing(TestCaseWithTransport):
 
138
 
 
139
    def setUp(self):
 
140
        super(TestEntryDiffing, self).setUp()
 
141
        self.wt = self.make_branch_and_tree('.')
 
142
        self.branch = self.wt.branch
 
143
        print >> open('file', 'wb'), 'foo'
 
144
        print >> open('binfile', 'wb'), 'foo'
 
145
        self.wt.add(['file'], ['fileid'])
 
146
        self.wt.add(['binfile'], ['binfileid'])
 
147
        if has_symlinks():
 
148
            os.symlink('target1', 'symlink')
 
149
            self.wt.add(['symlink'], ['linkid'])
 
150
        self.wt.commit('message_1', rev_id = '1')
 
151
        print >> open('file', 'wb'), 'bar'
 
152
        print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
 
153
        if has_symlinks():
 
154
            os.unlink('symlink')
 
155
            os.symlink('target2', 'symlink')
 
156
        self.tree_1 = self.branch.repository.revision_tree('1')
 
157
        self.inv_1 = self.branch.repository.get_inventory('1')
 
158
        self.file_1 = self.inv_1['fileid']
 
159
        self.file_1b = self.inv_1['binfileid']
 
160
        self.tree_2 = self.wt
 
161
        self.inv_2 = self.tree_2.read_working_inventory()
 
162
        self.file_2 = self.inv_2['fileid']
 
163
        self.file_2b = self.inv_2['binfileid']
 
164
        if has_symlinks():
 
165
            self.link_1 = self.inv_1['linkid']
 
166
            self.link_2 = self.inv_2['linkid']
 
167
 
 
168
    def test_file_diff_deleted(self):
 
169
        output = StringIO()
 
170
        self.file_1.diff(internal_diff, 
 
171
                          "old_label", self.tree_1,
 
172
                          "/dev/null", None, None,
 
173
                          output)
 
174
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
175
                                            "+++ /dev/null\t\n"
 
176
                                            "@@ -1,1 +0,0 @@\n"
 
177
                                            "-foo\n"
 
178
                                            "\n")
 
179
 
 
180
    def test_file_diff_added(self):
 
181
        output = StringIO()
 
182
        self.file_1.diff(internal_diff, 
 
183
                          "new_label", self.tree_1,
 
184
                          "/dev/null", None, None,
 
185
                          output, reverse=True)
 
186
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
187
                                            "+++ new_label\t\n"
 
188
                                            "@@ -0,0 +1,1 @@\n"
 
189
                                            "+foo\n"
 
190
                                            "\n")
 
191
 
 
192
    def test_file_diff_changed(self):
 
193
        output = StringIO()
 
194
        self.file_1.diff(internal_diff, 
 
195
                          "/dev/null", self.tree_1, 
 
196
                          "new_label", self.file_2, self.tree_2,
 
197
                          output)
 
198
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
199
                                            "+++ new_label\t\n"
 
200
                                            "@@ -1,1 +1,1 @@\n"
 
201
                                            "-foo\n"
 
202
                                            "+bar\n"
 
203
                                            "\n")
 
204
        
 
205
    def test_file_diff_binary(self):
 
206
        output = StringIO()
 
207
        self.file_1.diff(internal_diff, 
 
208
                          "/dev/null", self.tree_1, 
 
209
                          "new_label", self.file_2b, self.tree_2,
 
210
                          output)
 
211
        self.assertEqual(output.getvalue(), 
 
212
                         "Binary files /dev/null and new_label differ\n")
 
213
    def test_link_diff_deleted(self):
 
214
        if not has_symlinks():
 
215
            return
 
216
        output = StringIO()
 
217
        self.link_1.diff(internal_diff, 
 
218
                          "old_label", self.tree_1,
 
219
                          "/dev/null", None, None,
 
220
                          output)
 
221
        self.assertEqual(output.getvalue(),
 
222
                         "=== target was 'target1'\n")
 
223
 
 
224
    def test_link_diff_added(self):
 
225
        if not has_symlinks():
 
226
            return
 
227
        output = StringIO()
 
228
        self.link_1.diff(internal_diff, 
 
229
                          "new_label", self.tree_1,
 
230
                          "/dev/null", None, None,
 
231
                          output, reverse=True)
 
232
        self.assertEqual(output.getvalue(),
 
233
                         "=== target is 'target1'\n")
 
234
 
 
235
    def test_link_diff_changed(self):
 
236
        if not has_symlinks():
 
237
            return
 
238
        output = StringIO()
 
239
        self.link_1.diff(internal_diff, 
 
240
                          "/dev/null", self.tree_1, 
 
241
                          "new_label", self.link_2, self.tree_2,
 
242
                          output)
 
243
        self.assertEqual(output.getvalue(),
 
244
                         "=== target changed 'target1' => 'target2'\n")
 
245
 
 
246
 
 
247
class TestSnapshot(TestCaseWithTransport):
 
248
 
 
249
    def setUp(self):
 
250
        # for full testing we'll need a branch
 
251
        # with a subdir to test parent changes.
 
252
        # and a file, link and dir under that.
 
253
        # but right now I only need one attribute
 
254
        # to change, and then test merge patterns
 
255
        # with fake parent entries.
 
256
        super(TestSnapshot, self).setUp()
 
257
        self.wt = self.make_branch_and_tree('.')
 
258
        self.branch = self.wt.branch
 
259
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
 
260
        self.wt.add(['subdir', 'subdir/file'],
 
261
                                       ['dirid', 'fileid'])
 
262
        if has_symlinks():
 
263
            pass
 
264
        self.wt.commit('message_1', rev_id = '1')
 
265
        self.tree_1 = self.branch.repository.revision_tree('1')
 
266
        self.inv_1 = self.branch.repository.get_inventory('1')
 
267
        self.file_1 = self.inv_1['fileid']
 
268
        self.file_active = self.wt.inventory['fileid']
 
269
 
 
270
    def test_snapshot_new_revision(self):
 
271
        # This tests that a simple commit with no parents makes a new
 
272
        # revision value in the inventory entry
 
273
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
 
274
                                  self.branch.repository.weave_store,
 
275
                                  self.branch.get_transaction())
 
276
        # expected outcome - file_1 has a revision id of '2', and we can get
 
277
        # its text of 'file contents' out of the weave.
 
278
        self.assertEqual(self.file_1.revision, '1')
 
279
        self.assertEqual(self.file_active.revision, '2')
 
280
        # this should be a separate test probably, but lets check it once..
 
281
        lines = self.branch.repository.weave_store.get_weave(
 
282
            'fileid', 
 
283
            self.branch.get_transaction()).get_lines('2')
 
284
        self.assertEqual(lines, ['contents of subdir/file\n'])
 
285
 
 
286
    def test_snapshot_unchanged(self):
 
287
        #This tests that a simple commit does not make a new entry for
 
288
        # an unchanged inventory entry
 
289
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
 
290
                                  self.wt, 
 
291
                                  self.branch.repository.weave_store,
 
292
                                  self.branch.get_transaction())
 
293
        self.assertEqual(self.file_1.revision, '1')
 
294
        self.assertEqual(self.file_active.revision, '1')
 
295
        vf = self.branch.repository.weave_store.get_weave(
 
296
            'fileid', 
 
297
            self.branch.repository.get_transaction())
 
298
        self.assertRaises(errors.RevisionNotPresent,
 
299
                          vf.get_lines,
 
300
                          '2')
 
301
 
 
302
    def test_snapshot_merge_identical_different_revid(self):
 
303
        # This tests that a commit with two identical parents, one of which has
 
304
        # a different revision id, results in a new revision id in the entry.
 
305
        # 1->other, commit a merge of other against 1, results in 2.
 
306
        other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
 
307
        other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
 
308
        other_ie.revision = '1'
 
309
        other_ie.text_sha1 = self.file_1.text_sha1
 
310
        other_ie.text_size = self.file_1.text_size
 
311
        self.assertEqual(self.file_1, other_ie)
 
312
        other_ie.revision = 'other'
 
313
        self.assertNotEqual(self.file_1, other_ie)
 
314
        versionfile = self.branch.repository.weave_store.get_weave(
 
315
            'fileid', self.branch.repository.get_transaction())
 
316
        versionfile.clone_text('other', '1', ['1'])
 
317
        self.file_active.snapshot('2', 'subdir/file', 
 
318
                                  {'1':self.file_1, 'other':other_ie},
 
319
                                  self.wt, 
 
320
                                  self.branch.repository.weave_store,
 
321
                                  self.branch.get_transaction())
 
322
        self.assertEqual(self.file_active.revision, '2')
 
323
 
 
324
    def test_snapshot_changed(self):
 
325
        # This tests that a commit with one different parent results in a new
 
326
        # revision id in the entry.
 
327
        self.file_active.name='newname'
 
328
        rename('subdir/file', 'subdir/newname')
 
329
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
 
330
                                  self.wt,
 
331
                                  self.branch.repository.weave_store,
 
332
                                  self.branch.get_transaction())
 
333
        # expected outcome - file_1 has a revision id of '2'
 
334
        self.assertEqual(self.file_active.revision, '2')
 
335
 
 
336
 
 
337
class TestPreviousHeads(TestCaseWithTransport):
 
338
 
 
339
    def setUp(self):
 
340
        # we want several inventories, that respectively
 
341
        # give use the following scenarios:
 
342
        # A) fileid not in any inventory (A),
 
343
        # B) fileid present in one inventory (B) and (A,B)
 
344
        # C) fileid present in two inventories, and they
 
345
        #   are not mutual descendents (B, C)
 
346
        # D) fileid present in two inventories and one is
 
347
        #   a descendent of the other. (B, D)
 
348
        super(TestPreviousHeads, self).setUp()
 
349
        self.wt = self.make_branch_and_tree('.')
 
350
        self.branch = self.wt.branch
 
351
        self.build_tree(['file'])
 
352
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
 
353
        self.inv_A = self.branch.repository.get_inventory('A')
 
354
        self.wt.add(['file'], ['fileid'])
 
355
        self.wt.commit('add file', rev_id='B')
 
356
        self.inv_B = self.branch.repository.get_inventory('B')
 
357
        uncommit(self.branch, tree=self.wt)
 
358
        self.assertEqual(self.branch.revision_history(), ['A'])
 
359
        self.wt.commit('another add of file', rev_id='C')
 
360
        self.inv_C = self.branch.repository.get_inventory('C')
 
361
        self.wt.add_pending_merge('B')
 
362
        self.wt.commit('merge in B', rev_id='D')
 
363
        self.inv_D = self.branch.repository.get_inventory('D')
 
364
        self.file_active = self.wt.inventory['fileid']
 
365
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
 
366
            self.branch.repository.get_transaction())
 
367
        
 
368
    def get_previous_heads(self, inventories):
 
369
        return self.file_active.find_previous_heads(
 
370
            inventories, 
 
371
            self.branch.repository.weave_store,
 
372
            self.branch.repository.get_transaction())
 
373
        
 
374
    def test_fileid_in_no_inventory(self):
 
375
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
 
376
 
 
377
    def test_fileid_in_one_inventory(self):
 
378
        self.assertEqual({'B':self.inv_B['fileid']},
 
379
                         self.get_previous_heads([self.inv_B]))
 
380
        self.assertEqual({'B':self.inv_B['fileid']},
 
381
                         self.get_previous_heads([self.inv_A, self.inv_B]))
 
382
        self.assertEqual({'B':self.inv_B['fileid']},
 
383
                         self.get_previous_heads([self.inv_B, self.inv_A]))
 
384
 
 
385
    def test_fileid_in_two_inventories_gives_both_entries(self):
 
386
        self.assertEqual({'B':self.inv_B['fileid'],
 
387
                          'C':self.inv_C['fileid']},
 
388
                          self.get_previous_heads([self.inv_B, self.inv_C]))
 
389
        self.assertEqual({'B':self.inv_B['fileid'],
 
390
                          'C':self.inv_C['fileid']},
 
391
                          self.get_previous_heads([self.inv_C, self.inv_B]))
 
392
 
 
393
    def test_fileid_in_two_inventories_already_merged_gives_head(self):
 
394
        self.assertEqual({'D':self.inv_D['fileid']},
 
395
                         self.get_previous_heads([self.inv_B, self.inv_D]))
 
396
        self.assertEqual({'D':self.inv_D['fileid']},
 
397
                         self.get_previous_heads([self.inv_D, self.inv_B]))
 
398
 
 
399
    # TODO: test two inventories with the same file revision 
 
400
 
 
401
 
 
402
class TestExecutable(TestCaseWithTransport):
 
403
 
 
404
    def test_stays_executable(self):
 
405
        a_id = "a-20051208024829-849e76f7968d7a86"
 
406
        b_id = "b-20051208024829-849e76f7968d7a86"
 
407
        wt = self.make_branch_and_tree('b1')
 
408
        b = wt.branch
 
409
        tt = TreeTransform(wt)
 
410
        tt.new_file('a', tt.root, 'a test\n', a_id, True)
 
411
        tt.new_file('b', tt.root, 'b test\n', b_id, False)
 
412
        tt.apply()
 
413
 
 
414
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
415
 
 
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()])
 
419
 
 
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")
 
422
 
 
423
        wt.commit('adding a,b', rev_id='r1')
 
424
 
 
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")
 
428
 
 
429
        self.failUnless(rev_tree.inventory[a_id].executable)
 
430
        self.failIf(rev_tree.inventory[b_id].executable)
 
431
 
 
432
        # Make sure the entries are gone
 
433
        os.remove('b1/a')
 
434
        os.remove('b1/b')
 
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'))
 
439
 
 
440
        # Make sure that revert is able to bring them back,
 
441
        # and sets 'a' back to being executable
 
442
 
 
443
        wt.revert(['a', 'b'], rev_tree, backups=False)
 
444
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
445
 
 
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")
 
448
 
 
449
        # Now remove them again, and make sure that after a
 
450
        # commit, they are still marked correctly
 
451
        os.remove('b1/a')
 
452
        os.remove('b1/b')
 
453
        wt.commit('removed', rev_id='r2')
 
454
 
 
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'))
 
460
 
 
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()])
 
464
 
 
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")
 
467
 
 
468
        # Now make sure that 'bzr branch' also preserves the
 
469
        # executable bit
 
470
        # TODO: Maybe this should be a blackbox test
 
471
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
472
        t2 = d2.open_workingtree()
 
473
        b2 = t2.branch
 
474
        self.assertEquals('r1', b2.last_revision())
 
475
 
 
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")
 
479
 
 
480
        # Make sure pull will delete the files
 
481
        t2.pull(b)
 
482
        self.assertEquals('r2', b2.last_revision())
 
483
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
 
484
 
 
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')
 
489
 
 
490
        t2.pull(b)
 
491
        self.assertEquals('r3', b2.last_revision())
 
492
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
493
 
 
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")
 
496
 
 
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')
 
502
        wt.add('a')
 
503
        self.assertEqual(len(wt.inventory), 2)
 
504
        os.unlink('b1/a')
 
505
        wt.revert([])
 
506
        self.assertEqual(len(wt.inventory), 1)
 
507
 
 
508