[MERGE] Fix lp115358: Error in gannotate on unversioned file

[Jasper Groenewegen]

Add check in olive/menu.py to see if the selected file is versioned before calling a gannotate window. This is similar to what the 'bzr gannotate <unversioned file> does. The bugreport mentions that nautilus-bzr crashes on this as well. But, nautilus-bzr effectively calls 'bzr gannotate <file>' so the cause of the crash in that case I think could only be that nautilus doesn't like a 'print "bzr: ERROR: foo is not versioned."' on running cmd_gannotate().

Jasper

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: 2a0662f2cbeb159d201dd57e1d8d2e42b671a883
# timestamp: 2008-07-22 12:23:30 +0200
# source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'olive/menu.py'
--- olive/menu.py	2008-07-18 10:40:23 +0000
+++ olive/menu.py	2008-07-22 10:23:20 +0000
@@ -198,7 +198,8 @@
         
         branch = wt.branch
         file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
-        
+        if file_id is None:
+            raise errors.NotVersionedError(filename)
         window = GAnnotateWindow(all=False, plain=False, parent=self.app)
         window.set_title(os.path.join(directory, filename) + " - Annotate")
         config = GAnnotateConfig(window)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfl2DhQAAZBfgARQUWP//3KR
AQC////wUAO5ed7B690Z3euAlEmmmpM0mwnoRqbU9NJkyDQaGjINJMmp+knqeTU0ZNDQAAAAANNT
ImiY0kfpDUNNNA0D0jIyACSTVR/qNFNPSemptNT1Mg00AAAGgkppNT00JgSeU8k9TJpppMmgANGK
LZYVHdcwOXO9FBAyF1EFYATV3LO91gRhuqyjZAkhsRxaFzKFsJdw4+lM8UXa7Vvu/aaosaGeGeaT
SQZGBme+E+FU8tPFska07RGZ6MjUQ5YaILNVzmOTWHLEgWHKxR8p3gddukhGO1d8LSPbbT5ZeYq7
JCYN4mZi9OSWg4IsLE3l49MRWMBDhhGwhQf4XLLfJwQgMQmRwcCWsVo+EMZiV8JvZhSgyI4tDSdv
grEGCcsOhZjBU18MCere3EJ3TOKxnShLYWGQgWccrnpU5EcPFBdU6wYgZkTE7EoEbxnCi8Ykzzio
naIqLiPWVDzhROdDqvmwrH7Bd41qgQWZEyGGWIzYkTJXWfs3G6vabHIHqYtMCS54r1ztoBVMeAZX
MG0eXzE9ZtxlmcVsywMCRx40HAr1Fsxr6iBdU5xUpqDAIcFX5G7owvNy0tiWNgzE87hnHZzOc1e5
TAqwjrCCxhYQRvOTTE3SorQuIDq+prTfrkGgFPLkVmh7Ks3CMzmZk1xAXj2CH7gwh09HdKBWfX8j
04bpBusgQHCFexcLwe1LjSUZBCwcMOCkMGlK/JpN8kmzmKItp67d0rUk0oQ1xafHMKcGJct+ot0C
1dGRbNJGy8ziaycoKcFemBdGsso0MhsioxOjkOrfMrh6w65Za3VoqE4ZoUztx3D+jxNI4kWfGAr2
g2OpYGosNxYWjj3x3qc1yqm3NAi44CTbzmTUWroCrxT9ablnaXewvwTH9w3GYph/8CjLraa8R0Yz
O4BuGVUWyxLwwpE4RARsXpkI1Rq7J9qRrDWVJzJDBDWUwxtMXaJC+UZiT2GwhFzpDkgA8D3gup7B
CF3K9atakp1MqmQMp8dxQdQtB26hGhpgbYkOsgDAhISdSiN5PQmi3MimmkoxuvyAmzmZIFeUm2Co
Zg0jiY7BDhwfr34rXMVmynKyequiSy7XzCwUfTUMfbuEw9wOVtlLfSTtBGKqlEc7Q9pF+quHgVDR
TbZBsR5vonhyiKw6RLrbih6mT++u1TzxoJiLiQQW+dpOIuVfa8HhSfMXwkeFndXXVQGAH69BNhBs
xDgtwNPUcPZPG2ivLJHqKVnuLuSKcKEh8uwcKA==

signature.asc
Description: OpenPGP digital signature

-- 
bzr-gtk mailing list
bzr-gtk@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk