/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: Ian Clatworthy
  • Date: 2007-07-13 06:21:59 UTC
  • mto: (2647.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2648.
  • Revision ID: ian.clatworthy@internode.on.net-20070713062159-kh1kde034wcrkygr
more abentley feedback: use get_nested_tree and include file_id

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
663
663
                kind = self.work_tree.kind(file_id)
664
664
                # TODO: specific_files filtering before nested tree processing
665
665
                if kind == 'tree-reference' and self.recursive == 'down':
666
 
                    self._commit_nested_tree(path)
 
666
                    self._commit_nested_tree(file_id, path)
667
667
            except errors.NoSuchFile:
668
668
                pass
669
669
 
678
678
        # Unversion IDs that were found to be deleted
679
679
        self.work_tree.unversion(deleted_ids)
680
680
 
681
 
    def _commit_nested_tree(self, path):
 
681
    def _commit_nested_tree(self, file_id, path):
682
682
        "Commit a nested tree."
683
 
        sub_tree = WorkingTree.open(self.work_tree.abspath(path))
 
683
        sub_tree = self.work_tree.get_nested_tree(file_id, path)
684
684
        # FIXME: be more comprehensive here:
685
685
        # this works when both trees are in --trees repository,
686
686
        # but when both are bound to a different repository,