/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1085
1085
                parent_lines, left_parent_blocks))
1086
1086
        return diffs
1087
1087
 
1088
 
    def get_annotator(self):
1089
 
        return annotate.Annotator(self)
1090
 
 
1091
1088
    missing_keys = index._missing_keys_from_parent_map
1092
1089
 
1093
1090
    def _extract_blocks(self, version_id, source, target):
1162
1159
            result.append((prefix + (origin,), line))
1163
1160
        return result
1164
1161
 
 
1162
    def get_annotator(self):
 
1163
        return annotate.Annotator(self)
 
1164
 
1165
1165
    def check(self, progress_bar=None, keys=None):
1166
1166
        """See VersionedFiles.check()."""
1167
1167
        # XXX: This is over-enthusiastic but as we only thunk for Weaves today