/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 bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2007-11-27 20:35:02 UTC
  • mfrom: (3036 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071127203502-280mxe1zvdlagrpe
Merge with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
696
696
               
697
697
        report_changes = self.reporter.is_verbose()
698
698
        deleted_ids = []
 
699
        # A tree of paths that have been deleted. E.g. if foo/bar has been
 
700
        # deleted, then we have {'foo':{'bar':{}}}
699
701
        deleted_paths = {}
700
702
        # XXX: Note that entries may have the wrong kind because the entry does
701
703
        # not reflect the status on disk.
717
719
                deleted_dict = deleted_paths
718
720
                for segment in path_segments:
719
721
                    deleted_dict = deleted_dict.get(segment, None)
720
 
                    if deleted_dict is None:
721
 
                        # We took a path not present in the dict.
722
 
                        break
723
722
                    if not deleted_dict:
724
 
                        # We've reached an empty child dir in the dict, so are now
725
 
                        # a sub-path.
 
723
                        # We either took a path not present in the dict
 
724
                        # (deleted_dict was None), or we've reached an empty
 
725
                        # child dir in the dict, so are now a sub-path.
726
726
                        break
727
727
                else:
728
728
                    deleted_dict = None