← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
99
99
 
100
100
def _read_weave_v5(f, w):
101
101
    """Private helper routine to read a weave format 5 file into memory.
102
 
    
 
102
 
103
103
    This is only to be used by read_weave and WeaveFile.__init__.
104
104
    """
105
105
    #  200   0   2075.5080   1084.0360   bzrlib.weavefile:104(_read_weave_v5)
115
115
    #  200   0    851.7250    501.1120   bzrlib.weavefile:104(_read_weave_v5)
116
116
    # +59363 0    311.8780    311.8780   +<method 'append' of 'list' objects>
117
117
    # +200   0     30.2500     30.2500   +<method 'readlines' of 'file' objects>
118
 
                  
 
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
121
    lines = iter(f.readlines())
122
 
    
 
122
 
123
123
    try:
124
124
        l = lines.next()
125
125
    except StopIteration: