← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Robert Collins
  • Date: 2006-03-01 05:43:15 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060301054315-a9edc45a6c4061eb
Update versionedfile api tests to ensure that data is available after every operation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
95
95
def read_weave(f, prelude=False):
96
96
    # FIXME: detect the weave type and dispatch
97
97
    from bzrlib.trace import mutter
98
 
    return _read_weave_v5(f, prelude=prelude)
99
 
 
100
 
 
101
 
def _read_weave_v5(f, prelude=False):
102
 
    """Private helper routine to read a weave format 5 file into memory."""
103
 
    from weave import WeaveFormatError, Weave
 
98
    from weave import Weave
104
99
    w = Weave(getattr(f, 'name', None))
 
100
    _read_weave_v5(f, w, prelude=prelude)
 
101
    return w
 
102
 
 
103
 
 
104
def _read_weave_v5(f, w, prelude=False):
 
105
    """Private helper routine to read a weave format 5 file into memory.
 
106
    
 
107
    This is only to be used by read_weave and WeaveFile.__init__.
 
108
    """
 
109
    from weave import WeaveFormatError
105
110
 
106
111
    l = f.readline()
107
112
    if l != FORMAT_1: