/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

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