← 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-11 13:58:48 UTC
  • mto: (1615.1.2 bzr.mbp.integration)
  • mto: This revision was merged to the branch mainline in revision 1616.
  • Revision ID: robertc@robertcollins.net-20060311135848-789fa616b8da4662
Note potential improvements in knit adds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
106
106
    
107
107
    This is only to be used by read_weave and WeaveFile.__init__.
108
108
    """
 
109
    #  200   0   2075.5080   1084.0360   bzrlib.weavefile:104(_read_weave_v5)
 
110
    # +60412 0    366.5900    366.5900   +<method 'readline' of 'file' objects>
 
111
    # +59982 0    320.5280    320.5280   +<method 'startswith' of 'str' objects>
 
112
    # +59363 0    297.8080    297.8080   +<method 'append' of 'list' objects>
 
113
    # replace readline call with iter over all lines ->
 
114
    # safe because we already suck on memory.
 
115
    #  200   0   1492.7170    802.6220   bzrlib.weavefile:104(_read_weave_v5)
 
116
    # +59982 0    329.9100    329.9100   +<method 'startswith' of 'str' objects>
 
117
    # +59363 0    320.2980    320.2980   +<method 'append' of 'list' objects>
 
118
    # replaced startswith with slice lookups:
 
119
    #  200   0    851.7250    501.1120   bzrlib.weavefile:104(_read_weave_v5)
 
120
    # +59363 0    311.8780    311.8780   +<method 'append' of 'list' objects>
 
121
    # +200   0     30.2500     30.2500   +<method 'readlines' of 'file' objects>
 
122
                  
109
123
    from weave import WeaveFormatError
110
124
 
111
 
    l = f.readline()
 
125
    lines = iter(f.readlines())
 
126
    
 
127
    l = lines.next()
112
128
    if l != FORMAT_1:
113
129
        raise WeaveFormatError('invalid weave file header: %r' % l)
114
130
 
115
131
    ver = 0
 
132
    # read weave header.
116
133
    while True:
117
 
        l = f.readline()
 
134
        l = lines.next()
118
135
        if l[0] == 'i':
119
136
            if len(l) > 2:
120
137
                w._parents.append(map(int, l[2:].split(' ')))
121
138
            else:
122
139
                w._parents.append([])
123
140
 
124
 
            l = f.readline()[:-1]
125
 
            assert l.startswith('1 ')
 
141
            l = lines.next()[:-1]
 
142
            assert '1 ' == l[0:2]
126
143
            w._sha1s.append(l[2:])
127
144
                
128
 
            l = f.readline()
129
 
            assert l.startswith('n ')
 
145
            l = lines.next()
 
146
            assert 'n ' == l[0:2]
130
147
            name = l[2:-1]
131
148
            assert name not in w._name_map
132
149
            w._names.append(name)
133
150
            w._name_map[name] = ver
134
151
                
135
 
            l = f.readline()
 
152
            l = lines.next()
136
153
            assert l == '\n'
137
154
 
138
155
            ver += 1
141
158
        else:
142
159
            raise WeaveFormatError('unexpected line %r' % l)
143
160
 
 
161
    # read weave body
144
162
    while True:
145
 
        l = f.readline()
 
163
        l = lines.next()
146
164
        if l == 'W\n':
147
165
            break
148
 
        elif l.startswith('. '):
 
166
        elif '. ' == l[0:2]:
149
167
            w._weave.append(l[2:])  # include newline
150
 
        elif l.startswith(', '):
 
168
        elif ', ' == l[0:2]:
151
169
            w._weave.append(l[2:-1])        # exclude newline
152
170
        elif l == '}\n':
153
171
            w._weave.append(('}', None))