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

  • Committer: Jelmer Vernooij
  • Date: 2018-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
677
677
        iter_changes = self._filter_iter_changes(iter_changes)
678
678
        for file_id, path, fs_hash in self.builder.record_iter_changes(
679
679
            self.work_tree, self.basis_revid, iter_changes):
680
 
            self.work_tree._observed_sha1(file_id, path, fs_hash)
 
680
            self.work_tree._observed_sha1(path, fs_hash)
681
681
 
682
682
    def _filter_iter_changes(self, iter_changes):
683
683
        """Process iter_changes.
711
711
                versioned = False
712
712
            elif kind == 'tree-reference':
713
713
                if self.recursive == 'down':
714
 
                    self._commit_nested_tree(change[0], change[1][1])
 
714
                    self._commit_nested_tree(change[1][1])
715
715
            if change[3][0] or change[3][1]:
716
716
                yield change
717
717
                if report_changes:
740
740
            for unknown in self.work_tree.unknowns():
741
741
                raise StrictCommitFailed()
742
742
 
743
 
    def _commit_nested_tree(self, file_id, path):
 
743
    def _commit_nested_tree(self, path):
744
744
        "Commit a nested tree."
745
 
        sub_tree = self.work_tree.get_nested_tree(path, file_id)
 
745
        sub_tree = self.work_tree.get_nested_tree(path)
746
746
        # FIXME: be more comprehensive here:
747
747
        # this works when both trees are in --trees repository,
748
748
        # but when both are bound to a different repository,
763
763
                strict=self.strict, verbose=self.verbose,
764
764
                local=self.local, reporter=self.reporter)
765
765
        except PointlessCommit:
766
 
            return self.work_tree.get_reference_revision(path, file_id)
 
766
            return self.work_tree.get_reference_revision(path)
767
767
 
768
768
    def _set_progress_stage(self, name, counter=False):
769
769
        """Set the progress stage and emit an update to the progress bar."""