← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
306
306
                raise PointlessCommit()
307
307
 
308
308
            self._emit_progress_update()
309
 
            # TODO: Now the new inventory is known, check for conflicts and prompt the 
310
 
            # user for a commit message.
 
309
            # TODO: Now the new inventory is known, check for conflicts and
 
310
            # prompt the user for a commit message.
 
311
            # ADHB 2006-08-08: If this is done, populate_new_inv should not add
 
312
            # weave lines, because nothing should be recorded until it is known
 
313
            # that commit will succeed.
311
314
            self.builder.finish_inventory()
312
315
            self._emit_progress_update()
313
316
            self.rev_id = self.builder.commit(self.message)
500
503
        # in bugs like #46635.  Any reason not to use/enhance Tree.changes_from?
501
504
        # ADHB 11-07-2006
502
505
        mutter("Selecting files for commit with filter %s", self.specific_files)
503
 
        # at this point we dont copy the root entry:
504
506
        entries = self.work_inv.iter_entries()
505
 
        entries.next()
506
 
        self._emit_progress_update()
 
507
        if not self.builder.record_root_entry:
 
508
            warnings.warn('CommitBuilders should support recording the root'
 
509
                ' entry as of bzr 0.10.', DeprecationWarning, stacklevel=1)
 
510
            self.builder.new_inventory.add(self.basis_inv.root.copy())
 
511
            entries.next()
 
512
            self._emit_progress_update()
507
513
        for path, new_ie in entries:
508
514
            self._emit_progress_update()
509
515
            file_id = new_ie.file_id