← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2005-10-27 23:14:48 UTC
  • mfrom: (1185.16.130)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1491.
  • Revision ID: abentley@panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
209
209
        """Create new branch object at a particular location.
210
210
 
211
211
        transport -- A Transport object, defining how to access files.
212
 
                (If a string, transport.transport() will be used to
213
 
                create a Transport object)
214
212
        
215
213
        init -- If True, create new control files in a previously
216
214
             unversioned directory.  If False, the branch must already
319
317
        """Return the current active transaction.
320
318
 
321
319
        If no transaction is active, this returns a passthrough object
322
 
        for which all data is immedaitely flushed and no caching happens.
 
320
        for which all data is immediately flushed and no caching happens.
323
321
        """
324
322
        if self._transaction is None:
325
323
            return transactions.PassThroughTransaction()
697
695
    def get_revision_xml_file(self, revision_id):
698
696
        """Return XML file object for revision object."""
699
697
        if not revision_id or not isinstance(revision_id, basestring):
700
 
            raise InvalidRevisionId(revision_id)
 
698
            raise InvalidRevisionId(revision_id=revision_id, branch=self)
701
699
        try:
702
700
            return self.revision_store.get(revision_id)
703
701
        except (IndexError, KeyError):