~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

• browse files at revision 2879
• compare with another revision
• compare with revision 334
• download diff
• download tarball
• view history from revision 2879

Show diffs side-by-side

added

removed

bzrlib/commit.py

247

247

        self.local = local

248

248

        self.master_branch = None

249

249

        self.master_locked = False

 

250

        self.recursive = recursive

250

251

        self.rev_id = None

251

252

        if specific_files is not None:

252

253

            self.specific_files = sorted(

255

256

            self.specific_files = None

256

257

        self.specific_file_ids = None

257

258

        self.allow_pointless = allow_pointless

258

 

        self.recursive = recursive

259

259

        self.revprops = revprops

260

260

        self.message_callback = message_callback

261

261

        self.timestamp = timestamp

289

289

 

290

290

            # If provided, ensure the specified files are versioned

291

291

            if self.specific_files is not None:

292

 

                # Note: This routine

293

 

                # is being called because it raises PathNotVerisonedError

294

 

                # as a side effect of finding the IDs. We later use the ids we

295

 

                # found as input to the working tree inventory iterator, so we

296

 

                # only consider those ids rather than examining the whole tree

297

 

                # again.

 

292

                # Note: This routine is being called because it raises

 

293

                # PathNotVersionedError as a side effect of finding the IDs. We

 

294

                # later use the ids we found as input to the working tree

 

295

                # inventory iterator, so we only consider those ids rather than

 

296

                # examining the whole tree again.

298

297

                # XXX: Dont we have filter_unversioned to do this more

299

298

                # cheaply?

300

299

                self.specific_file_ids = tree.find_ids_across_trees(

650

649

        if specific_files:

651

650

            for path, old_ie in self.basis_inv.iter_entries():

652

651

                if old_ie.file_id in self.builder.new_inventory:

 

652

                    # already added - skip.

653

653

                    continue

654

654

                if is_inside_any(specific_files, path):

 

655

                    # was inside the selected path, if not present it has been

 

656

                    # deleted so skip.

655

657

                    continue

656

658

                if old_ie.kind == 'directory':

657

659

                    self._next_progress_entry()

 

660

                # not in final inv yet, was not in the selected files, so is an

 

661

                # entry to be preserved unaltered.

658

662

                ie = old_ie.copy()

659

663

                # Note: specific file commits after a merge are currently

660

664

                # prohibited. This test is for sanity/safety in case it's

662

666

                if len(self.parents) > 1:

663

667

                    ie.revision = None

664

668

                if self.builder.record_entry_contents(ie, self.parent_invs, path,

665

 

                    self.basis_tree):

 

669

                    self.basis_tree, None):

666

670

                    self.any_entries_changed = True

667

671

 

668

672

        # note that deletes have occurred

686

690

        deleted_paths = set()

687

691

        work_inv = self.work_tree.inventory

688

692

        assert work_inv.root is not None

 

693

        # XXX: Note that entries may have the wrong kind.

689

694

        entries = work_inv.iter_entries_by_dir(

690

695

            specific_file_ids=self.specific_file_ids, yield_parents=True)

691

696

        if not self.builder.record_root_entry:

704

709

            # deleted files matching that filter.

705

710

            if is_inside_any(deleted_paths, path):

706

711

                continue

707

 

            if not self.work_tree.has_filename(path):

708

 

                deleted_paths.add(path)

709

 

                self.reporter.missing(path)

710

 

                deleted_ids.append(file_id)

711

 

                continue

712

 

            try:

713

 

                kind = self.work_tree.kind(file_id)

714

 

                # TODO: specific_files filtering before nested tree processing

715

 

                if kind == 'tree-reference' and self.recursive == 'down':

716

 

                    self._commit_nested_tree(file_id, path)

717

 

            except errors.NoSuchFile:

718

 

                pass

 

712

            content_summary = self.work_tree.path_content_summary(path)

 

713

            if not specific_files or is_inside_any(specific_files, path):

 

714

                if content_summary[0] == 'missing':

 

715

                    deleted_paths.add(path)

 

716

                    self.reporter.missing(path)

 

717

                    deleted_ids.append(file_id)

 

718

                    continue

 

719

            # TODO: have the builder do the nested commit just-in-time IF and

 

720

            # only if needed.

 

721

            if content_summary[0] == 'tree-reference':

 

722

                # enforce repository nested tree policy.

 

723

                if (not self.work_tree.supports_tree_reference() or

 

724

                    # repository does not support it either.

 

725

                    not self.branch.repository._format.supports_tree_reference):

 

726

                    content_summary = ('directory',) + content_summary[1:]

 

727

            kind = content_summary[0]

 

728

            # TODO: specific_files filtering before nested tree processing

 

729

            if kind == 'tree-reference':

 

730

                if self.recursive == 'down':

 

731

                    nested_revision_id = self._commit_nested_tree(

 

732

                        file_id, path)

 

733

                    content_summary = content_summary[:3] + (

 

734

                        nested_revision_id,)

 

735

                else:

 

736

                    content_summary = content_summary[:3] + (

 

737

                        self.work_tree.get_reference_revision(file_id),)

719

738

 

720

739

            # Record an entry for this item

721

740

            # Note: I don't particularly want to have the existing_ie

723

742

            # without it thanks to a unicode normalisation issue. :-(

724

743

            definitely_changed = kind != existing_ie.kind

725

744

            self._record_entry(path, file_id, specific_files, kind, name,

726

 

                parent_id, definitely_changed, existing_ie, report_changes)

 

745

                parent_id, definitely_changed, existing_ie, report_changes,

 

746

                content_summary)

727

747

 

728

748

        # Unversion IDs that were found to be deleted

729

749

        self.work_tree.unversion(deleted_ids)

742

762

            sub_tree.branch.repository = \

743

763

                self.work_tree.branch.repository

744

764

        try:

745

 

            sub_tree.commit(message=None, revprops=self.revprops,

 

765

            return sub_tree.commit(message=None, revprops=self.revprops,

746

766

                recursive=self.recursive,

747

767

                message_callback=self.message_callback,

748

768

                timestamp=self.timestamp, timezone=self.timezone,

751

771

                strict=self.strict, verbose=self.verbose,

752

772

                local=self.local, reporter=self.reporter)

753

773

        except errors.PointlessCommit:

754

 

            pass

 

774

            return self.work_tree.get_reference_revision(file_id)

755

775

 

756

776

    def _record_entry(self, path, file_id, specific_files, kind, name,

757

 

            parent_id, definitely_changed, existing_ie=None,

758

 

            report_changes=True):

 

777

        parent_id, definitely_changed, existing_ie, report_changes,

 

778

        content_summary):

759

779

        "Record the new inventory entry for a path if any."

760

780

        # mutter('check %s {%s}', path, file_id)

761

781

        # mutter('%s selected for commit', path)

764

784

        else:

765

785

            ie = existing_ie.copy()

766

786

            ie.revision = None

767

 

        if self.builder.record_entry_contents(ie, self.parent_invs, 

768

 

            path, self.work_tree):

 

787

        if self.builder.record_entry_contents(ie, self.parent_invs,

 

788

            path, self.work_tree, content_summary):

769

789

            self.any_entries_changed = True

770

790

        if report_changes:

771

791

            self._report_change(ie, path)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1