"bzr gannotate FILE" with bzr-gtk trunk always fails for me with this error:
Traceback (most recent call last):
File "/home/andrew/code/bzr/bzrlib/commands.py", line 848, in
run_bzr_catch_errors
return run_bzr(argv)
File "/home/andrew/code/bzr/bzrlib/commands.py", line 803, in run_bzr
ret = run(*run_argv)
File "/home/andrew/code/bzr/bzrlib/commands.py", line 504, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/andrew/.bazaar/plugins/gtk/__init__.py", line 320, in run
window = GAnnotateWindow(all, plain)
File "/home/andrew/.bazaar/plugins/gtk/annotate/gannotate.py", line 57, in
__init__
self._create()
File "/home/andrew/.bazaar/plugins/gtk/annotate/gannotate.py", line 192, in
_create
self.revisionview = self._create_log_view()
File "/home/andrew/.bazaar/plugins/gtk/annotate/gannotate.py", line 323, in
_create_log_view
lv = RevisionView()
File "/home/andrew/.bazaar/plugins/gtk/revisionview.py", line 317, in __init__
self._create_signature()
File "/home/andrew/.bazaar/plugins/gtk/revisionview.py", line 538, in
_create_signature
self.signature_table = SignatureTab(self._branch.repository)
AttributeError: 'NoneType' object has no attribute 'repository'
This hack fixes that. I'm not at sure it's the correct thing to do, but at
least I can use gannotate again. The “Signature” tab appears, but always shows
a “Authenticity unknown” error, but I don't know if that's due to this patch or
some other problem.
-Andrew.
# 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: 0f14eb20b67a252e6ca4aa999de34105147402db
# timestamp: 2008-04-29 18:17:17 +1000
# base_revision_id: [EMAIL PROTECTED]
# sd3i9mjfwjzap5gr
#
# Begin patch
=== modified file '__init__.py'
--- __init__.py 2008-04-16 17:23:57 +0000
+++ __init__.py 2008-04-29 08:17:01 +0000
@@ -317,7 +317,7 @@
else:
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
- window = GAnnotateWindow(all, plain)
+ window = GAnnotateWindow(all, plain, branch=br)
window.connect("destroy", lambda w: gtk.main_quit())
config = GAnnotateConfig(window)
window.show()
=== modified file 'annotate/gannotate.py'
--- annotate/gannotate.py 2008-04-24 15:26:14 +0000
+++ annotate/gannotate.py 2008-04-29 08:17:01 +0000
@@ -45,9 +45,10 @@
class GAnnotateWindow(Window):
"""Annotate window."""
- def __init__(self, all=False, plain=False, parent=None):
+ def __init__(self, all=False, plain=False, parent=None, branch=None):
self.all = all
self.plain = plain
+ self._branch = branch
Window.__init__(self, parent)
@@ -320,7 +321,7 @@
return tv
def _create_log_view(self):
- lv = RevisionView()
+ lv = RevisionView(self._branch)
lv.show()
return lv
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTcGpMYAApffgGQQUW///3/3
/7C////wUAWe9vXHkUPc7gy7u5yDYSSmRU9NNiYpP1PUYU2p+qHtU8ptQNGmjNCek9J7UeogSkRq
HqnhpoU9qRhDTTTQGgAAAAAIFT1BkaNAAyAxAAADQaBoGQEkkZIh4p5TagaPU0ND1BoAAAA9QAEk
hGg0JiaGlMBR6TxTwU9NTNE9E2o2moaaeUhWJldqbXhuK0z+Xjn8VnuRrCWH2koJk9uDe3aL5slE
AirtlvEc1Eg0czqGqBPD4yYZ67ikZMwzFvmlb8vkYvDS0PcHEw9gdddkgxZdRzjndC74Pez4CjjK
6LavPzi9IBBfUzICBQgS+GAp7adFLNZBZRcoaFQWkGc0RNePAARw1mNrYMOWqjfk2+WF+NnN8RB0
qxUj2PaKcRp4RHFpNGZpubTtCFBRZgYFwWpENbDEtiy65iEXHchq4iky6GZhzZ3MOdo/EnQjUkRP
uTjFMNQBAoX3mB63ul48A2iK2HqviLisnMzpqM5u/ERQ1crBGaVhaK7cUeVlFVFhR13LLViRkp0T
C3o4qEHDenE+6xKp2RLS4UBQKiFQbG50hkQQYwhU2keWKvOBgSNsc8KjC2s0wMNRZVWQjQFpfYPE
Wl4okCQ4kYjj7UpF17VlyJywqJ9g2Di2+aHXlMoTmUrAarTHZDVMKCyHFT2SVpM++lzqhiy9Wqcy
KIEYvmL4NfZINFylM4tMbopiQrJy0kCQoGR2ympctfljdbKSbzB8Ziq+oJmTiF57tj5tj3khiJdQ
DDFJpP+7fONtFIhrGvJoKBqkQGIknIe7VrIG/VtoKK6awBkwjQQCJPcIwrKe64oNNJe+4RMIaNrQ
BbxO9YFBThfeXEMqKJyorP59m+Hl0CPl09ctknbVg81joMqERvU4oc5g4ihku1j9wLDfU90xRUGU
MnPGdFZekx4NHcubrdfgN5oHODA/mSO+7t5WLt7s35RgZmNhHq11Rfj7PwWcnhLI0kWoli7rth4u
m7JR6thUNRHn8XKYx8/THtavFglPvOHqKTshEk3G1GMk9e5GU7Kwl3nlE2DE78PO9kv3XwwewYhj
ya27SmtTuiDCfz9U3Uyqel4nge8+HwPn1Hed449DH6rzCo4T5XPMp9J+wuU7zu7dfaepbSagX231
HEHDch7DUG6ZIGA+N6sFb2dn04DMz4oG+c3CRXifMkHHzZ8hm4v9kkFvgfXYWGJgQY4BHMTk52MU
mAp5hugV1cCzRyc9RyhrPI0G0uB5pCtFhA0JYkiQ4uw2Vq8JO3PD4JgeTlaHDxlOGo5Ha6qnlJks
I860FUcox4WumIhfPj0EiavgvCKVpleZAkUCXonvQZafTdB5UTtlSLxZEzJEwsQn1F71rHbmJxH4
DY8RJVhHmIrK1Svs1zYWYwahthFmpDJE0OiW5rWAcpNAP6nQDUUikRr1wnRMOV4RVGEQVXLmEvtN
XGk2eXhaIjtohMQofKb2JEgQ9G7NFfkBWzpHAFk8JHPs25HxDEN5dVHh8ObWKmZuMtQ7qHjMEA4V
1pG7pmce4Y/Kkl6cftFt9o9UB8eCRnUFM+1TD2Z7A5kf2yOBVuB4ngVuSIlTHsskMwOqngiSMWgI
hAQzJWuDTzrsBDaST0nAyGD1L7kQF1pFwOquNSiv5y8NmS27c0QUQmHVb8YjdYjsSNAtO75ZXbvc
9+4F4oCdpQXNFccUGj8zSYMn6gUkit1Dwxs11gTZBRFhmGUzmGtd6zhDjOj1tuSZY2LB2a32AgSR
aEUqJ7dVkB/lUDv4C8wFOh42YizQionkPHy+lYQrE4KGIsiV0oHL79YiPN6uMlLhETxSL7sz1ulw
pHu6ilzNAyRu68+acKsXLn6r4sfDSJwOc0xrDGW0kQrslSP8XckU4UJA3BqTGA==
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
