/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/plugins/fastimport/bzr_commit_handler.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/bzr_commit_handler.py
721
721
                del self.directory_entries[path]
722
722
            except KeyError:
723
723
                pass
724
 
            for child_relpath, entry in \
725
 
                self.basis_inventory.iter_entries_by_dir(from_dir=ie):
726
 
                child_path = osutils.pathjoin(path, child_relpath)
727
 
                self._add_entry((child_path, None, entry.file_id, None))
728
 
                self._paths_deleted_this_commit.add(child_path)
729
 
                if entry.kind == 'directory':
730
 
                    try:
731
 
                        del self.directory_entries[child_path]
732
 
                    except KeyError:
733
 
                        pass
 
724
            if self.basis_inventory.get_entry(ie.file_id).kind == 'directory':
 
725
                for child_relpath, entry in \
 
726
                    self.basis_inventory.iter_entries_by_dir(from_dir=ie.file_id):
 
727
                    child_path = osutils.pathjoin(path, child_relpath)
 
728
                    self._add_entry((child_path, None, entry.file_id, None))
 
729
                    self._paths_deleted_this_commit.add(child_path)
 
730
                    if entry.kind == 'directory':
 
731
                        try:
 
732
                            del self.directory_entries[child_path]
 
733
                        except KeyError:
 
734
                            pass
734
735
 
735
736
    def record_rename(self, old_path, new_path, file_id, old_ie):
736
737
        new_ie = old_ie.copy()