← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2006-01-19 21:25:01 UTC
  • mto: (1185.50.49 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1549.
  • Revision ID: john@arbash-meinel.com-20060119212501-cb28cf532a878c41
fileid_involved needs to unescape the file id and revision id

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
20
20
import os
21
21
import errno
22
22
from warnings import warn
 
23
import xml.sax.saxutils
23
24
from cStringIO import StringIO
24
25
 
25
26
 
1181
1182
            if start < 9: continue
1182
1183
            end = line.find('"',start)
1183
1184
            assert end>= 0
1184
 
            file_id = line[start:end]
 
1185
            file_id = xml.sax.saxutils.unescape(line[start:end])
1185
1186
 
1186
1187
            # check if file_id is already present
1187
1188
            if file_id in file_ids: continue
1190
1191
            if start < 10: continue
1191
1192
            end = line.find('"',start)
1192
1193
            assert end>= 0
1193
 
            revision_id = line[start:end]
 
1194
            revision_id = xml.sax.saxutils.unescape(line[start:end])
1194
1195
 
1195
1196
            if revision_id in changes:
1196
1197
                file_ids.add(file_id)