← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1061
1061
 
1062
1062
        This performs the translation of xml lines to revision ids.
1063
1063
 
1064
 
        :param line_iterator: An iterator of lines
 
1064
        :param line_iterator: An iterator of lines, origin_version_id
1065
1065
        :param revision_ids: The revision ids to filter for. This should be a
1066
1066
            set or other type which supports efficient __contains__ lookups, as
1067
1067
            the revision id from each parsed line will be looked up in the
1091
1091
        search = self._file_ids_altered_regex.search
1092
1092
        unescape = _unescape_xml
1093
1093
        setdefault = result.setdefault
1094
 
        for line in line_iterator:
 
1094
        for line, version_id in line_iterator:
1095
1095
            match = search(line)
1096
1096
            if match is None:
1097
1097
                continue
1115
1115
                unescape_revid_cache[revision_id] = unescaped
1116
1116
                revision_id = unescaped
1117
1117
 
 
1118
            # once data is all ensured-consistent; then this is
 
1119
            # if revision_id == version_id
1118
1120
            if revision_id in revision_ids:
1119
1121
                try:
1120
1122
                    file_id = unescape_fileid_cache[file_id]