/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: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
459
459
        # Make the working tree be up to date with the branch. This
460
460
        # includes automatic changes scheduled to be made to the tree, such
461
461
        # as updating its basis and unversioning paths that were missing.
462
 
        self.work_tree.unversion(self.deleted_ids)
 
462
        self.work_tree.unversion(
 
463
                {self.work_tree.id2path(file_id) for file_id in self.deleted_ids},
 
464
                self.deleted_ids)
463
465
        self._set_progress_stage("Updating the working tree")
464
466
        self.work_tree.update_basis_by_delta(self.rev_id,
465
467
             self.builder.get_basis_delta())
742
744
 
743
745
    def _commit_nested_tree(self, file_id, path):
744
746
        "Commit a nested tree."
745
 
        sub_tree = self.work_tree.get_nested_tree(file_id, path)
 
747
        sub_tree = self.work_tree.get_nested_tree(path, file_id)
746
748
        # FIXME: be more comprehensive here:
747
749
        # this works when both trees are in --trees repository,
748
750
        # but when both are bound to a different repository,
763
765
                strict=self.strict, verbose=self.verbose,
764
766
                local=self.local, reporter=self.reporter)
765
767
        except PointlessCommit:
766
 
            return self.work_tree.get_reference_revision(file_id)
 
768
            return self.work_tree.get_reference_revision(path, file_id)
767
769
 
768
770
    def _set_progress_stage(self, name, counter=False):
769
771
        """Set the progress stage and emit an update to the progress bar."""