/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: Aaron Bentley
  • Date: 2006-08-08 16:35:47 UTC
  • mto: (1910.2.43 format-bumps)
  • mto: This revision was merged to the branch mainline in revision 1922.
  • Revision ID: abentley@panoramicfeedback.com-20060808163547-aef6d866d4b94da7
All tests pass

Show diffs side-by-side

added added

removed removed

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