← 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: 2008-09-26 22:14:42 UTC
  • mto: This revision was merged to the branch mainline in revision 3747.
  • Revision ID: john@arbash-meinel.com-20080926221442-3r67j99sr9rwe9w0
Make message optional, don't check the memory flag directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
53
53
 
54
54
def write_weave_v5(weave, f):
55
55
    """Write weave to file f."""
56
 
    print >>f, FORMAT_1,
 
56
    f.write(FORMAT_1)
57
57
 
58
58
    for version, included in enumerate(weave._parents):
59
59
        if included:
60
60
            # mininc = weave.minimal_parents(version)
61
61
            mininc = included
62
 
            print >>f, 'i',
63
 
            for i in mininc:
64
 
                print >>f, i,
65
 
            print >>f
 
62
            f.write('i ')
 
63
            f.write(' '.join(str(i) for i in mininc))
 
64
            f.write('\n')
66
65
        else:
67
 
            print >>f, 'i'
68
 
        print >>f, '1', weave._sha1s[version]
69
 
        print >>f, 'n', weave._names[version]
70
 
        print >>f
 
66
            f.write('i\n')
 
67
        f.write('1 ' + weave._sha1s[version] + '\n')
 
68
        f.write('n ' + weave._names[version] + '\n')
 
69
        f.write('\n')
71
70
 
72
 
    print >>f, 'w'
 
71
    f.write('w\n')
73
72
 
74
73
    for l in weave._weave:
75
74
        if isinstance(l, tuple):
76
 
            assert l[0] in '{}[]'
77
75
            if l[0] == '}':
78
 
                print >>f, '}'
 
76
                f.write('}\n')
79
77
            else:
80
 
                print >>f, '%s %d' % l
 
78
                f.write('%s %d\n' % l)
81
79
        else: # text line
82
80
            if not l:
83
 
                print >>f, ', '
 
81
                f.write(', \n')
84
82
            elif l[-1] == '\n':
85
 
                assert l.find('\n', 0, -1) == -1
86
 
                print >>f, '.', l,
 
83
                f.write('. ' + l)
87
84
            else:
88
 
                assert l.find('\n') == -1
89
 
                print >>f, ',', l
 
85
                f.write(', ' + l + '\n')
90
86
 
91
 
    print >>f, 'W'
 
87
    f.write('W\n')
92
88
 
93
89
 
94
90
 
141
137
                w._parents.append(map(int, l[2:].split(' ')))
142
138
            else:
143
139
                w._parents.append([])
144
 
 
145
140
            l = lines.next()[:-1]
146
 
            assert '1 ' == l[0:2]
147
141
            w._sha1s.append(l[2:])
148
 
                
149
142
            l = lines.next()
150
 
            assert 'n ' == l[0:2]
151
143
            name = l[2:-1]
152
 
            assert name not in w._name_map
153
144
            w._names.append(name)
154
145
            w._name_map[name] = ver
155
 
                
156
146
            l = lines.next()
157
 
            assert l == '\n'
158
 
 
159
147
            ver += 1
160
148
        elif l == 'w\n':
161
149
            break
174
162
        elif l == '}\n':
175
163
            w._weave.append(('}', None))
176
164
        else:
177
 
            assert l[0] in '{[]', l
178
 
            assert l[1] == ' ', l
179
165
            w._weave.append((intern(l[0]), int(l[2:])))
180
 
 
181
166
    return w
182