/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

remove warning about delete iff file is in a merge parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
652
652
 
653
653
    def delete_handler(self, filecmd):
654
654
        path = filecmd.path
 
655
        fileid = self.bzr_file_id(path)
655
656
        try:
656
 
            del self.inventory[self.bzr_file_id(path)]
 
657
            del self.inventory[fileid]
657
658
        except KeyError:
658
 
            self.warning("ignoring delete of %s as not in inventory", path)
 
659
            self._warn_unless_in_merges(fileid, path)
659
660
        except errors.NoSuchId:
660
 
            self.warning("ignoring delete of %s as not in inventory", path)
 
661
            self._warn_unless_in_merges(fileid, path)
661
662
        try:
662
663
            self.cache_mgr._delete_path(path)
663
664
        except KeyError:
664
665
            pass
665
666
 
 
667
    def _warn_unless_in_merges(self, fileid, path):
 
668
        if len(self.parents) <= 1:
 
669
            return
 
670
        for parent in self.parents[1:]:
 
671
            if fileid in self.get_inventory(parent):
 
672
                return
 
673
        self.warning("ignoring delete of %s as not in parent inventories", path)
 
674
 
666
675
    def copy_handler(self, filecmd):
667
676
        raise NotImplementedError(self.copy_handler)
668
677