/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-06-15 20:20:48 UTC
  • mfrom: (1776 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1788.
  • Revision ID: abentley@panoramicfeedback.com-20060615202048-fcee4d87e363a002
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
98
98
 
99
99
    New code should use the Commit class instead.
100
100
    """
101
 
    ## XXX: Remove this in favor of Branch.commit?
 
101
    ## XXX: Remove this in favor of WorkingTree.commit?
102
102
    Commit().commit(*args, **kwargs)
103
103
 
104
104
 
234
234
        if message is None:
235
235
            raise BzrError("The message keyword parameter is required for commit().")
236
236
 
237
 
        self.weave_store = self.branch.repository.weave_store
238
237
        self.bound_branch = None
239
238
        self.local = local
240
239
        self.master_branch = None
316
315
            # revision data is in the local branch now.
317
316
            
318
317
            # upload revision data to the master.
319
 
            # this will propogate merged revisions too if needed.
 
318
            # this will propagate merged revisions too if needed.
320
319
            if self.bound_branch:
321
320
                self.master_branch.repository.fetch(self.branch.repository,
322
321
                                                    revision_id=self.rev_id)
344
343
            self._emit_progress_update()
345
344
        finally:
346
345
            self._cleanup()
 
346
        return self.rev_id
347
347
 
348
348
    def _check_bound_branch(self):
349
349
        """Check to see if the local branch is bound.
411
411
            except Exception, e:
412
412
                found_exception = e
413
413
        if found_exception is not None: 
414
 
            # dont do a plan raise, because the last exception may have been
 
414
            # don't do a plan raise, because the last exception may have been
415
415
            # trashed, e is our sure-to-work exception even though it loses the
416
416
            # full traceback. XXX: RBC 20060421 perhaps we could check the
417
417
            # exc_info and if its the same one do a plain raise otherwise 
532
532
 
533
533
            self.builder.record_entry_contents(ie, self.parent_invs, 
534
534
                path, self.work_tree)
535
 
            # describe the nature of the change that has occured relative to
 
535
            # describe the nature of the change that has occurred relative to
536
536
            # the basis inventory.
537
537
            if (self.basis_inv.has_id(ie.file_id)):
538
538
                basis_ie = self.basis_inv[ie.file_id]