/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/weavefile.py

  • Committer: Robert Collins
  • Date: 2006-03-02 06:23:15 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302062315-9c274fa5c8201784
Prepare weave store to delegate copy details to the 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):
 
95
def read_weave(f):
96
96
    # FIXME: detect the weave type and dispatch
97
97
    from bzrlib.trace import mutter
98
98
    from weave import Weave
99
99
    w = Weave(getattr(f, 'name', None))
100
 
    _read_weave_v5(f, w, prelude=prelude)
 
100
    _read_weave_v5(f, w)
101
101
    return w
102
102
 
103
103
 
104
 
def _read_weave_v5(f, w, prelude=False):
 
104
def _read_weave_v5(f, w):
105
105
    """Private helper routine to read a weave format 5 file into memory.
106
106
    
107
107
    This is only to be used by read_weave and WeaveFile.__init__.
141
141
        else:
142
142
            raise WeaveFormatError('unexpected line %r' % l)
143
143
 
144
 
    if prelude:
145
 
        return w
146
 
 
147
144
    while True:
148
145
        l = f.readline()
149
146
        if l == 'W\n':