Rev 5364: [r=jam] Add VersionedFiles.get_annotator() stub. (Jelmer) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Aug 2 22:14:44 BST 2010


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5364 [merge]
revision-id: pqm at pqm.ubuntu.com-20100802211441-x9tm7rp9r5pyw4fw
parent: pqm at pqm.ubuntu.com-20100729132107-5kh8qzhw6e9kz5d6
parent: jelmer at samba.org-20100730204445-jjs0ptn76ijulrs8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-08-02 22:14:41 +0100
message:
  [r=jam] Add VersionedFiles.get_annotator() stub. (Jelmer)
modified:
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py	2010-05-14 12:55:13 +0000
+++ b/bzrlib/versionedfile.py	2010-07-30 20:44:45 +0000
@@ -1085,6 +1085,9 @@
                 parent_lines, left_parent_blocks))
         return diffs
 
+    def get_annotator(self):
+        return annotate.Annotator(self)
+
     missing_keys = index._missing_keys_from_parent_map
 
     def _extract_blocks(self, version_id, source, target):
@@ -1159,9 +1162,6 @@
             result.append((prefix + (origin,), line))
         return result
 
-    def get_annotator(self):
-        return annotate.Annotator(self)
-
     def check(self, progress_bar=None, keys=None):
         """See VersionedFiles.check()."""
         # XXX: This is over-enthusiastic but as we only thunk for Weaves today




More information about the bazaar-commits mailing list