/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: Jelmer Vernooij
  • Date: 2019-09-27 02:16:49 UTC
  • mto: This revision was merged to the branch mainline in revision 7402.
  • Revision ID: jelmer@jelmer.uk-20190927021649-0q9zc2kwfsznp87a
Simplify id2path lookups.

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)
 
151
        try:
 
152
            return self.paths[file_id]
 
153
        except KeyError:
 
154
            raise errors.NoSuchId(file_id, self)
152
155
 
153
156
    def has_id(self, file_id):
154
157
        return self.id2path(file_id) is not None
270
273
        btree = self.make_tree_1()[0]
271
274
        btree.note_rename("grandparent/parent/file",
272
275
                          "grandparent/alt_parent/file")
273
 
        self.assertTrue(btree.id2path(b"e") is None)
 
276
        self.assertRaises(errors.NoSuchId, btree.id2path, b"e")
274
277
        self.assertFalse(btree.is_versioned("grandparent/parent/file"))
275
278
        btree.note_id(b"e", "grandparent/parent/file")
276
279
        return btree
320
323
        with btree.get_file(btree.id2path(b"c")) as f:
321
324
            self.assertEqual(f.read(), b"Hello\n")
322
325
        btree.note_deletion("grandparent/parent/file")
323
 
        self.assertTrue(btree.id2path(b"c") is None)
 
326
        self.assertRaises(errors.NoSuchId, btree.id2path, b"c")
324
327
        self.assertFalse(btree.is_versioned("grandparent/parent/file"))
325
328
 
326
329
    def sorted_ids(self, tree):