/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-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

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