← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2009-09-14 01:48:28 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914014828-ydr9rlkdfq2sv57z
Merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
209
209
        :param timestamp: if not None, seconds-since-epoch for a
210
210
            postdated/predated commit.
211
211
 
212
 
        :param specific_files: If true, commit only those files.
 
212
        :param specific_files: If not None, commit only those files. An empty
 
213
            list means 'commit no files'.
213
214
 
214
215
        :param rev_id: If set, use this as the new revision id.
215
216
            Useful for test or import commands that need to tightly
264
265
        self.master_locked = False
265
266
        self.recursive = recursive
266
267
        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.
267
270
        if specific_files is not None:
268
271
            self.specific_files = sorted(
269
272
                minimum_path_selection(specific_files))
285
288
        # the command line parameters, and the repository has fast delta
286
289
        # generation. See bug 347649.
287
290
        self.use_record_iter_changes = (
288
 
            not self.specific_files and
289
291
            not self.exclude and 
290
292
            not self.branch.repository._format.supports_tree_reference and
291
293
            (self.branch.repository._format.fast_deltas or
333
335
            self._gather_parents()
334
336
            # After a merge, a selected file commit is not supported.
335
337
            # See 'bzr help merge' for an explanation as to why.
336
 
            if len(self.parents) > 1 and self.specific_files:
 
338
            if len(self.parents) > 1 and self.specific_files is not None:
337
339
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
338
340
            # Excludes are a form of selected file commit.
339
341
            if len(self.parents) > 1 and self.exclude:
619
621
        """Update the commit builder with the data about what has changed.
620
622
        """
621
623
        exclude = self.exclude
622
 
        specific_files = self.specific_files or []
 
624
        specific_files = self.specific_files
623
625
        mutter("Selecting files for commit with filter %s", specific_files)
624
626
 
625
627
        self._check_strict()
626
628
        if self.use_record_iter_changes:
627
 
            iter_changes = self.work_tree.iter_changes(self.basis_tree)
 
629
            iter_changes = self.work_tree.iter_changes(self.basis_tree,
 
630
                specific_files=specific_files)
628
631
            iter_changes = self._filter_iter_changes(iter_changes)
629
632
            for file_id, path, fs_hash in self.builder.record_iter_changes(
630
633
                self.work_tree, self.basis_revid, iter_changes):
802
805
                # _update_builder_with_changes.
803
806
                continue
804
807
            content_summary = self.work_tree.path_content_summary(path)
 
808
            kind = content_summary[0]
805
809
            # Note that when a filter of specific files is given, we must only
806
810
            # skip/record deleted files matching that filter.
807
811
            if not specific_files or is_inside_any(specific_files, path):
808
 
                if content_summary[0] == 'missing':
 
812
                if kind == 'missing':
809
813
                    if not deleted_paths:
810
814
                        # path won't have been split yet.
811
815
                        path_segments = splitpath(path)
818
822
                    continue
819
823
            # TODO: have the builder do the nested commit just-in-time IF and
820
824
            # only if needed.
821
 
            if content_summary[0] == 'tree-reference':
 
825
            if kind == 'tree-reference':
822
826
                # enforce repository nested tree policy.
823
827
                if (not self.work_tree.supports_tree_reference() or
824
828
                    # repository does not support it either.
825
829
                    not self.branch.repository._format.supports_tree_reference):
826
 
                    content_summary = ('directory',) + content_summary[1:]
827
 
            kind = content_summary[0]
828
 
            # TODO: specific_files filtering before nested tree processing
829
 
            if kind == 'tree-reference':
830
 
                if self.recursive == 'down':
 
830
                    kind = 'directory'
 
831
                    content_summary = (kind, None, None, None)
 
832
                elif self.recursive == 'down':
831
833
                    nested_revision_id = self._commit_nested_tree(
832
834
                        file_id, path)
833
 
                    content_summary = content_summary[:3] + (
834
 
                        nested_revision_id,)
 
835
                    content_summary = (kind, None, None, nested_revision_id)
835
836
                else:
836
 
                    content_summary = content_summary[:3] + (
837
 
                        self.work_tree.get_reference_revision(file_id),)
 
837
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
 
838
                    content_summary = (kind, None, None, nested_revision_id)
838
839
 
839
840
            # Record an entry for this item
840
841
            # Note: I don't particularly want to have the existing_ie