← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
204
204
        """Commit working copy as a new revision.
205
205
 
206
206
        :param message: the commit message (it or message_callback is required)
 
207
        :param message_callback: A callback: message = message_callback(cmt_obj)
207
208
 
208
209
        :param timestamp: if not None, seconds-since-epoch for a
209
210
            postdated/predated commit.
392
393
            # and now do the commit locally.
393
394
            self.branch.set_last_revision_info(new_revno, self.rev_id)
394
395
 
395
 
            # Make the working tree up to date with the branch
 
396
            # Make the working tree be up to date with the branch. This
 
397
            # includes automatic changes scheduled to be made to the tree, such
 
398
            # as updating its basis and unversioning paths that were missing.
 
399
            self.work_tree.unversion(self.deleted_ids)
396
400
            self._set_progress_stage("Updating the working tree")
397
401
            self.work_tree.update_basis_by_delta(self.rev_id,
398
402
                 self.builder.get_basis_delta())
679
683
                            reporter.snapshot_change('modified', new_path)
680
684
            self._next_progress_entry()
681
685
        # Unversion IDs that were found to be deleted
682
 
        self.work_tree.unversion(deleted_ids)
 
686
        self.deleted_ids = deleted_ids
683
687
 
684
688
    def _record_unselected(self):
685
689
        # If specific files are selected, then all un-selected files must be
842
846
                content_summary)
843
847
 
844
848
        # Unversion IDs that were found to be deleted
845
 
        self.work_tree.unversion(deleted_ids)
 
849
        self.deleted_ids = deleted_ids
846
850
 
847
851
    def _commit_nested_tree(self, file_id, path):
848
852
        "Commit a nested tree."