/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_bundle.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 17:31:55 UTC
  • mfrom: (7397.4.9 remove-unused)
  • Revision ID: breezy.the.bot@gmail.com-20191013173155-yoiokny4mknxb3um
Remove Tree.has_id.

Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
148
148
        return self.ids.get(path)
149
149
 
150
150
    def id2path(self, file_id):
151
 
        return self.paths.get(file_id)
152
 
 
153
 
    def has_id(self, file_id):
154
 
        return self.id2path(file_id) is not None
 
151
        try:
 
152
            return self.paths[file_id]
 
153
        except KeyError:
 
154
            raise errors.NoSuchId(file_id, self)
155
155
 
156
156
    def get_file(self, path):
157
157
        result = BytesIO()
270
270
        btree = self.make_tree_1()[0]
271
271
        btree.note_rename("grandparent/parent/file",
272
272
                          "grandparent/alt_parent/file")
273
 
        self.assertTrue(btree.id2path(b"e") is None)
 
273
        self.assertRaises(errors.NoSuchId, btree.id2path, b"e")
274
274
        self.assertFalse(btree.is_versioned("grandparent/parent/file"))
275
275
        btree.note_id(b"e", "grandparent/parent/file")
276
276
        return btree
292
292
        self.assertEqual(
293
293
            btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
294
294
 
295
 
    def test_adds2(self):
296
 
        """File/inventory adds, with patch-compatibile renames"""
297
 
        btree = self.make_tree_2()
298
 
        btree.contents_by_id = False
299
 
        add_patch = self.unified_diff([b"Hello\n"], [b"Extra cheese\n"])
300
 
        btree.note_patch("grandparent/parent/file", add_patch)
301
 
        btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
302
 
        btree.note_target('grandparent/parent/symlink', 'venus')
303
 
        self.adds_test(btree)
304
 
 
305
295
    def make_tree_3(self):
306
296
        btree, mtree = self.make_tree_1()
307
297
        mtree.add_file(b"e", "grandparent/parent/topping", b"Anchovies\n")
324
314
        btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
325
315
        self.get_file_test(btree)
326
316
 
327
 
    def test_get_file2(self):
328
 
        """Get file contents, with patch-compatible renames"""
329
 
        btree = self.make_tree_3()
330
 
        btree.contents_by_id = False
331
 
        mod_patch = self.unified_diff([], [b"Lemon\n"])
332
 
        btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
333
 
        mod_patch = self.unified_diff([], [b"Hello\n"])
334
 
        btree.note_patch("grandparent/alt_parent/file", mod_patch)
335
 
        self.get_file_test(btree)
336
 
 
337
317
    def test_delete(self):
338
318
        "Deletion by bundle"
339
319
        btree = self.make_tree_1()[0]
340
320
        with btree.get_file(btree.id2path(b"c")) as f:
341
321
            self.assertEqual(f.read(), b"Hello\n")
342
322
        btree.note_deletion("grandparent/parent/file")
343
 
        self.assertTrue(btree.id2path(b"c") is None)
 
323
        self.assertRaises(errors.NoSuchId, btree.id2path, b"c")
344
324
        self.assertFalse(btree.is_versioned("grandparent/parent/file"))
345
325
 
346
326
    def sorted_ids(self, tree):