/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 processors/generic_processor.py

fix compatibility with Python 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
475
475
            self.inventory = self.gen_initial_inventory()
476
476
        else:
477
477
            # use the bzr_revision_id to lookup the inv cache
478
 
            self.inventory = self.get_inventory(self.parents[0]).copy()
 
478
            self.inventory = self.get_inventory_copy(self.parents[0])
479
479
        if not self.repo.supports_rich_root():
480
480
            # In this repository, root entries have no knit or weave. When
481
481
            # serializing out to disk and back in, root.revision is always
485
485
        # directory-path -> inventory-entry for current inventory
486
486
        self.directory_entries = dict(self.inventory.directories())
487
487
 
 
488
    def get_inventory_copy(self, rev_id):
 
489
        inv = self.get_inventory(rev_id)
 
490
        return inv.copy()
 
491
 
488
492
    def post_process_files(self):
489
493
        """Save the revision."""
490
494
        self.inventory.apply_delta(self.inv_delta)
539
543
            del self.inventory[self.bzr_file_id(path)]
540
544
        except errors.NoSuchId:
541
545
            self.warning("ignoring delete of %s as not in inventory", path)
542
 
        finally:
543
 
            try:
544
 
                self.cache_mgr._delete_path(path)
545
 
            except KeyError:
546
 
                pass
 
546
        try:
 
547
            self.cache_mgr._delete_path(path)
 
548
        except KeyError:
 
549
            pass
547
550
 
548
551
    def copy_handler(self, filecmd):
549
552
        raise NotImplementedError(self.copy_handler)