← 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-02-22 10:35:05 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060222103505-bddb211d353f2543
Merge in a variation of the versionedfile api from versioned-file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
92
92
 
93
93
 
94
94
 
95
 
def read_weave(f,prelude=False):
96
 
    return read_weave_v5(f,prelude=prelude)
97
 
 
98
 
 
99
 
def read_weave_v5(f,prelude=False):
100
 
    from weave import Weave, WeaveFormatError
 
95
def read_weave(f, prelude=False):
 
96
    # FIXME: detect the weave type and dispatch
 
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
101
104
    w = Weave(getattr(f, 'name', None))
102
105
 
103
106
    l = f.readline()