← Back to branch summary

~jelmer/brz/bundle-git-plugin

« back to all changes in this revision

Viewing changes to breezy/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 00:39:16 UTC
  • mfrom: (6926 work)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180325003916-mqa5uj4uq55hrjq9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
460
460
        # Make the working tree be up to date with the branch. This
461
461
        # includes automatic changes scheduled to be made to the tree, such
462
462
        # as updating its basis and unversioning paths that were missing.
463
 
        self.work_tree.unversion(
464
 
                {self.work_tree.id2path(file_id) for file_id in self.deleted_ids},
465
 
                self.deleted_ids)
 
463
        self.work_tree.unversion(self.deleted_paths)
466
464
        self._set_progress_stage("Updating the working tree")
467
465
        self.work_tree.update_basis_by_delta(self.rev_id,
468
466
             self.builder.get_basis_delta())
694
692
        """
695
693
        reporter = self.reporter
696
694
        report_changes = reporter.is_verbose()
697
 
        deleted_ids = []
 
695
        deleted_paths = []
698
696
        for change in iter_changes:
699
697
            if report_changes:
700
698
                old_path = change[1][0]
706
704
                # 'missing' path
707
705
                if report_changes:
708
706
                    reporter.missing(new_path)
709
 
                deleted_ids.append(change[0])
 
707
                deleted_paths.append(change[1][1])
710
708
                # Reset the new path (None) and new versioned flag (False)
711
709
                change = (change[0], (change[1][0], None), change[2],
712
710
                    (change[3][0], False)) + change[4:]
731
729
                            # repositories.
732
730
                            reporter.snapshot_change(gettext('modified'), new_path)
733
731
            self._next_progress_entry()
734
 
        # Unversion IDs that were found to be deleted
735
 
        self.deleted_ids = deleted_ids
 
732
        # Unversion files that were found to be deleted
 
733
        self.deleted_paths = deleted_paths
736
734
 
737
735
    def _check_strict(self):
738
736
        # XXX: when we use iter_changes this would likely be faster if