/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: Robert Collins
  • Date: 2007-07-17 16:04:00 UTC
  • mto: (2592.3.37 repository)
  • mto: This revision was merged to the branch mainline in revision 2682.
  • Revision ID: robertc@robertcollins.net-20070717160400-l1ng2wgmldsttebk
Add abort_write_group and wire write_groups into fetch and commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
300
300
            self._emit_progress_set_stage("Collecting changes", show_entries=True)
301
301
            self.builder = self.branch.get_commit_builder(self.parents,
302
302
                self.config, timestamp, timezone, committer, revprops, rev_id)
303
 
            self._update_builder_with_changes()
304
 
            self._check_pointless()
305
 
 
306
 
            # TODO: Now the new inventory is known, check for conflicts.
307
 
            # ADHB 2006-08-08: If this is done, populate_new_inv should not add
308
 
            # weave lines, because nothing should be recorded until it is known
309
 
            # that commit will succeed.
310
 
            self._emit_progress_set_stage("Saving data locally")
311
 
            self.builder.finish_inventory()
312
 
 
313
 
            # Prompt the user for a commit message if none provided
314
 
            message = message_callback(self)
315
 
            assert isinstance(message, unicode), type(message)
316
 
            self.message = message
317
 
            self._escape_commit_message()
318
 
 
319
 
            # Add revision data to the local branch
320
 
            self.rev_id = self.builder.commit(self.message)
321
 
            
 
303
            try:
 
304
                self._update_builder_with_changes()
 
305
                self._check_pointless()
 
306
 
 
307
                # TODO: Now the new inventory is known, check for conflicts.
 
308
                # ADHB 2006-08-08: If this is done, populate_new_inv should not add
 
309
                # weave lines, because nothing should be recorded until it is known
 
310
                # that commit will succeed.
 
311
                self._emit_progress_set_stage("Saving data locally")
 
312
                self.builder.finish_inventory()
 
313
 
 
314
                # Prompt the user for a commit message if none provided
 
315
                message = message_callback(self)
 
316
                assert isinstance(message, unicode), type(message)
 
317
                self.message = message
 
318
                self._escape_commit_message()
 
319
 
 
320
                # Add revision data to the local branch
 
321
                self.rev_id = self.builder.commit(self.message)
 
322
            except:
 
323
                # perhaps this should be done by the CommitBuilder ?
 
324
                self.work_tree.branch.repository.abort_write_group()
 
325
                raise
 
326
 
322
327
            # Upload revision data to the master.
323
328
            # this will propagate merged revisions too if needed.
324
329
            if self.bound_branch: