/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/memorytree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-m/+merge/348800

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/memorytree.py
276
276
                    if file_id is None:
277
277
                        raise errors.NoSuchFile(path)
278
278
                    file_ids.add(file_id)
 
279
            else:
 
280
                for file_id in file_ids:
 
281
                    if not self._inventory.has_id(file_id):
 
282
                        raise errors.NoSuchId(self, file_id)
279
283
            for file_id in file_ids:
280
284
                if self._inventory.has_id(file_id):
281
285
                    self._inventory.remove_recursive_id(file_id)
282
 
                else:
283
 
                    raise errors.NoSuchId(self, file_id)
284
286
 
285
287
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
286
288
        """See MutableTree.set_parent_trees()."""
317
319
                # a ghost in the left most parent
318
320
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
319
321
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
320
 
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
 
322
            if parents_list[0][1] is None or parents_list[0][1] == b'null:':
321
323
                self._basis_tree = self.branch.repository.revision_tree(
322
324
                                       _mod_revision.NULL_REVISION)
323
325
            else: