Revision.get_apparent_author is deprecated. This is a trivial fix for using Revision.get_apparent_authors.
Cheers, Jelmer
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: bzr+ssh://bazaar.launchpad.net/%7Ebzr-gtk/bzr-\ # gtk/trunk/ # testament_sha1: c36f21ea00f884e87e342d792ffba36152d9863b # timestamp: 2009-06-03 21:21:14 +0200 # base_revision_id: [email protected]\ # lsg09k7mmdt6yjft # # Begin patch === modified file 'annotate/gannotate.py' --- annotate/gannotate.py 2009-05-04 20:06:58 +0000 +++ annotate/gannotate.py 2009-06-03 19:21:05 +0000 @@ -91,7 +91,7 @@ revno = author = "" else: last_seen = revision.revision_id - author = revision.get_apparent_author() + author = ", ".join(revision.get_apparent_authors()) if revision.revision_id not in self.revisions: self.revisions[revision.revision_id] = revision @@ -389,7 +389,7 @@ return j - i -class FakeRevision: +class FakeRevision(object): """ A fake revision. For when a revision is referenced but not present. @@ -404,12 +404,13 @@ self.timezone = 0 self.properties = {} - def get_apparent_author(self): - return self.committer + def get_apparent_authors(self): + return [self.committer] class RevisionCache(object): """A caching revision source""" + def __init__(self, real_source, seed_cache=None): self.__real_source = real_source if seed_cache is None: # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRMpUwwAAWF/gEQQQABRZ/// UxATCr//33BQA3vd7tK63mvTUu4SVADU00aBPT1NDJkZBADIAElJPU9JtTGFAaJppo0GmgA0aAEk jQKMI0NI1G0RjUNBkGgYgZRGpkeKbUaGmhoAAAAyNAaamqZNDQepoyaGgAAGQGjQcwxz2tv7bYeO 7nLU0dAqs0qxiJ2DTzW4QK8GppxEWSSKV2HeJASQT3mSd9qi0tOySQwqfU8sy1k8WOzrMH2mprr7 bxHs5uSUtBcpxoRwbBkyjXV1WzjifxTEW60TT5337dBWkuLJyb0b8T3EhqgQxiZGBBIxqCBKRRA8 TKTLiyIQqMRXQ6CAbk5Oxh1RiaDDajzRqVzejqZI2WGFmaLmwcOqH5hlFZ1+UZKaMhU1jdszRltt Nhlsx8JsgkjkZSpQ2YPLab1dUIsMZ+iIXPCiJRJkI6ou0zHXEchWJoq7l0zjpLzGhmUjZDShcMCO ejS4qxXQsoIYEQJljZSM8Z1TdYGPYq5adVTC9ga1lTChyXE1s0SD2hZ024tnOFa6K6Z3yTgtCv35 jiCNCHIbjzLwyoFTQG5lqAvQEhqLAHwHFEQw7hGQ+LGXnlTshjrPvl8OE4HS0IwVUrnGYbxa+bwM GJ3geL04GPurt1JXgy/2sxvuHq0N6+N7UoSsp3fobrEFi1rlMMvZ1YHOyXuKGJcOWoc11VijLt8+ zjN/U7HnGXre5GnsZLmJzNxnfLJlOxWvYghJDrjnrNKot21bnWukEbsjG3eU52p1uHb2fiXN1cZe vYf2qTh4HKCKarrlHug6TjK0frQ2kKlWQJT8TiTINBSaTWaC0u9LI7lH68KhGNWXSKhGIstE3zZJ aYKTzp0SEIhAlWgHg4hLQ7On3yw4zrPaoDJBeEfZx/EkWJFZlbs+c/UkrdaqWl60tVDQmWRRO7jo iHyeA3KrPEtSvWEkSoTkIGX4jJHuVinMWRNndosHfpvijnnMIs+p67tYpsJj2+yqHjguoRGkW4Ik d4wNiUo8uj5DggRrozRA1ulQEYS3BnnWo2NHm0GXQhkiAdd2jpog89PDle1R9CWm1lEijBtsrgkn GYeDNlmncaqhnI7kvTV/t/WmJ8VKRgW3DMokXODqep281ZhghCoMuh+Q7O7liJMj7UYLhpjwhWuL FfYshC8SjRTbYjgjah5FPSII5kw4VhKFciuJphQf4u5IpwoSAmUqYYA=
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
