/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 bzrlib/commit.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-22 14:32:48 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622143248-pe4av866hxgzn60e
Use the same method or function names for _dirstate_helpers in pyrex and
python modules.

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)
208
207
 
209
208
        :param timestamp: if not None, seconds-since-epoch for a
210
209
            postdated/predated commit.
211
210
 
212
 
        :param specific_files: If not None, commit only those files. An empty
213
 
            list means 'commit no files'.
 
211
        :param specific_files: If true, commit only those files.
214
212
 
215
213
        :param rev_id: If set, use this as the new revision id.
216
214
            Useful for test or import commands that need to tightly
265
263
        self.master_locked = False
266
264
        self.recursive = recursive
267
265
        self.rev_id = None
268
 
        # self.specific_files is None to indicate no filter, or any iterable to
269
 
        # indicate a filter - [] means no files at all, as per iter_changes.
270
266
        if specific_files is not None:
271
267
            self.specific_files = sorted(
272
268
                minimum_path_selection(specific_files))
288
284
        # the command line parameters, and the repository has fast delta
289
285
        # generation. See bug 347649.
290
286
        self.use_record_iter_changes = (
 
287
            not self.specific_files and
291
288
            not self.exclude and 
292
289
            not self.branch.repository._format.supports_tree_reference and
293
290
            (self.branch.repository._format.fast_deltas or
335
332
            self._gather_parents()
336
333
            # After a merge, a selected file commit is not supported.
337
334
            # See 'bzr help merge' for an explanation as to why.
338
 
            if len(self.parents) > 1 and self.specific_files is not None:
 
335
            if len(self.parents) > 1 and self.specific_files:
339
336
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
340
337
            # Excludes are a form of selected file commit.
341
338
            if len(self.parents) > 1 and self.exclude:
395
392
            # and now do the commit locally.
396
393
            self.branch.set_last_revision_info(new_revno, self.rev_id)
397
394
 
398
 
            # Make the working tree be up to date with the branch. This
399
 
            # includes automatic changes scheduled to be made to the tree, such
400
 
            # as updating its basis and unversioning paths that were missing.
401
 
            self.work_tree.unversion(self.deleted_ids)
 
395
            # Make the working tree up to date with the branch
402
396
            self._set_progress_stage("Updating the working tree")
403
397
            self.work_tree.update_basis_by_delta(self.rev_id,
404
398
                 self.builder.get_basis_delta())
621
615
        """Update the commit builder with the data about what has changed.
622
616
        """
623
617
        exclude = self.exclude
624
 
        specific_files = self.specific_files
 
618
        specific_files = self.specific_files or []
625
619
        mutter("Selecting files for commit with filter %s", specific_files)
626
620
 
627
621
        self._check_strict()
628
622
        if self.use_record_iter_changes:
629
 
            iter_changes = self.work_tree.iter_changes(self.basis_tree,
630
 
                specific_files=specific_files)
 
623
            iter_changes = self.work_tree.iter_changes(self.basis_tree)
631
624
            iter_changes = self._filter_iter_changes(iter_changes)
632
625
            for file_id, path, fs_hash in self.builder.record_iter_changes(
633
626
                self.work_tree, self.basis_revid, iter_changes):
686
679
                            reporter.snapshot_change('modified', new_path)
687
680
            self._next_progress_entry()
688
681
        # Unversion IDs that were found to be deleted
689
 
        self.deleted_ids = deleted_ids
 
682
        self.work_tree.unversion(deleted_ids)
690
683
 
691
684
    def _record_unselected(self):
692
685
        # If specific files are selected, then all un-selected files must be
805
798
                # _update_builder_with_changes.
806
799
                continue
807
800
            content_summary = self.work_tree.path_content_summary(path)
808
 
            kind = content_summary[0]
809
801
            # Note that when a filter of specific files is given, we must only
810
802
            # skip/record deleted files matching that filter.
811
803
            if not specific_files or is_inside_any(specific_files, path):
812
 
                if kind == 'missing':
 
804
                if content_summary[0] == 'missing':
813
805
                    if not deleted_paths:
814
806
                        # path won't have been split yet.
815
807
                        path_segments = splitpath(path)
822
814
                    continue
823
815
            # TODO: have the builder do the nested commit just-in-time IF and
824
816
            # only if needed.
825
 
            if kind == 'tree-reference':
 
817
            if content_summary[0] == 'tree-reference':
826
818
                # enforce repository nested tree policy.
827
819
                if (not self.work_tree.supports_tree_reference() or
828
820
                    # repository does not support it either.
829
821
                    not self.branch.repository._format.supports_tree_reference):
830
 
                    kind = 'directory'
831
 
                    content_summary = (kind, None, None, None)
832
 
                elif self.recursive == 'down':
 
822
                    content_summary = ('directory',) + content_summary[1:]
 
823
            kind = content_summary[0]
 
824
            # TODO: specific_files filtering before nested tree processing
 
825
            if kind == 'tree-reference':
 
826
                if self.recursive == 'down':
833
827
                    nested_revision_id = self._commit_nested_tree(
834
828
                        file_id, path)
835
 
                    content_summary = (kind, None, None, nested_revision_id)
 
829
                    content_summary = content_summary[:3] + (
 
830
                        nested_revision_id,)
836
831
                else:
837
 
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
838
 
                    content_summary = (kind, None, None, nested_revision_id)
 
832
                    content_summary = content_summary[:3] + (
 
833
                        self.work_tree.get_reference_revision(file_id),)
839
834
 
840
835
            # Record an entry for this item
841
836
            # Note: I don't particularly want to have the existing_ie
847
842
                content_summary)
848
843
 
849
844
        # Unversion IDs that were found to be deleted
850
 
        self.deleted_ids = deleted_ids
 
845
        self.work_tree.unversion(deleted_ids)
851
846
 
852
847
    def _commit_nested_tree(self, file_id, path):
853
848
        "Commit a nested tree."