← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 21:07:17 UTC
  • mfrom: (1393.1.6)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20050929210717-cd73981590f17017
Merged the weave changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
1
 
#! /usr/bin/python
2
 
 
3
1
# Copyright (C) 2005 Canonical Ltd
4
2
 
5
3
# This program is free software; you can redistribute it and/or modify
100
98
 
101
99
def read_weave_v5(f):
102
100
    from weave import Weave, WeaveFormatError
103
 
    w = Weave()
 
101
    w = Weave(getattr(f, 'name', None))
104
102
 
105
 
    wfe = WeaveFormatError
106
103
    l = f.readline()
107
104
    if l != FORMAT_1:
108
105
        raise WeaveFormatError('invalid weave file header: %r' % l)