~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2007-11-27 01:55:29 UTC
  • mto: This revision was merged to the branch mainline in revision 3034.
  • Revision ID: robertc@robertcollins.net-20071127015529-4inebdo4aa2bfatv
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
705
705
               
706
706
        report_changes = self.reporter.is_verbose()
707
707
        deleted_ids = []
 
708
        # A tree of paths that have been deleted. E.g. if foo/bar has been
 
709
        # deleted, then we have {'foo':{'bar':{}}}
708
710
        deleted_paths = {}
709
711
        # XXX: Note that entries may have the wrong kind because the entry does
710
712
        # not reflect the status on disk.
726
728
                deleted_dict = deleted_paths
727
729
                for segment in path_segments:
728
730
                    deleted_dict = deleted_dict.get(segment, None)
729
 
                    if deleted_dict is None:
730
 
                        # We took a path not present in the dict.
731
 
                        break
732
731
                    if not deleted_dict:
733
 
                        # We've reached an empty child dir in the dict, so are now
734
 
                        # a sub-path.
 
732
                        # We either took a path not present in the dict
 
733
                        # (deleted_dict was None), or we've reached an empty
 
734
                        # child dir in the dict, so are now a sub-path.
735
735
                        break
736
736
                else:
737
737
                    deleted_dict = None