# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: benjamin@neron-20080607190159-la32qcg7ijpb1v4z
# target_branch: bzr+ssh://benji2@bazaar.launchpad.net/%7Ejavierder\
#   /bzr-gedit/main/
# testament_sha1: ba01431f63c0a3f2d9cc4420d99defc49db14ce5
# timestamp: 2008-06-07 21:02:10 +0200
# base_revision_id: javierder@gmail.com-20080530234851-\
#   5xgcd27bpp3t4y9c
# 
# Begin patch
=== modified file 'plugins/bzr/__init__.py'
--- plugins/bzr/__init__.py	2008-05-30 13:30:18 +0000
+++ plugins/bzr/__init__.py	2008-06-07 19:01:59 +0000
@@ -389,6 +389,10 @@
                 if response == gtk.RESPONSE_OK and pulllocation != '':
                     try:
                         inputdlg.set_status("Opening remote branch...")
+                        if "ssh:" in bzrlib.bzrdir.get_transport(pulllocation).base:
+                            inputdlg.set_status("Opening SSH branch.\nYou may be prompted for your passphrase on the command line window")
+                            time.sleep(0.05) # never could i make the dialog redraw correctly otherwise !
+                            while gtk.events_pending(): gtk.main_iteration()
                         branch_remote = branch.Branch.open(pulllocation)
                     except:
                         dialogs._bzrErrorDialog("Bazaar error opening %s" % pulllocation ,sys.exc_value)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaFd6tAAAZT/gABQBEB5Y///
UkCMpL////BQBBqnjRXSubc5cYSSEBKfkKfgkn5NNKaHqbSAz1JoH6mp6glJMU2ptqm0TakGQ0xN
MINDQAAEkJqaFHqn6hqeyTNUA9TRkaHqaMgB6hzTEwAJgAmAAEwABMEkhNNA0TTKYU8RPU9J6amm
mmgA0BTVr0wbv1cTJ891cbVIywbCaRQDd07YnGZ5kglHw+M+k1p9cWZj85rSEftcOgz37M5KOsvf
CDf70eef72TQwaIgNf0ctK74rF8t0febJWWLjUcauzVl7ufXni0x6d7W59oojc/uZBQbW6Or9IXS
Wb9csHvJjrbWdAlFYoS9or6Kh7+OnQLZm0cW42mva/szRELbr2XQ5CXzsUYneDJxzJl8WDiMJ4rE
KJ4lUTgdMrVNTm4ZnkVWvZ2nGVFkM7/ofsrKYIMDJ22ioToqkeXEeAuWrTHFC0z51IrU4axggZQF
2V4PZXjlmPNAqqk8qUSvKJNUGBr6lSSypasqkmoN64iitOkxuH69iblyVgW3LyXOF1HUbFjICRdq
LZ4hmtBebH6++ka0V5bjiSWxbTA3i8DuzJFN9yFjioai6mZITosKRAzkZj+otcclcf0j0wstbXY9
MZqF5MI8F7xmF5McXldxyZ3XmQy0+xr6olyxni0KJRyMmPxL/p22mNfb281aD3vBnBa5tc4g4OYt
hqPDIv7HDT6a+JhuMFrDxF7TIzATePZqiJ9tVr0bspwXwc/UsBMwpIicmLfnMSMrhLtVD27IulDi
HOSkN3Di0+246zuIHeqio74H+F1mmhrMAwDcdrU4uK1eQXChOrRMtW8PAt3FMLeBY5tmeeowo3Pv
hU+bGZMxQay/rhAUruLFcErRyzHu0UuyOWST/JMMyud00XOBtoadKVgaIGkKMN9NwFSjko1FRWQP
HfhqYOHN6xbdfqFmsEvGvQNKFulI3OYLSlvJ9/SoOU8l/ZVM+vwRkEhpKfIVob+LEaoyZkj9YTsw
yHLL79s1KzrGIkFuAoWMr1bx4HFuYTNAvQXGVoPfAJWLcLbA5t0aie7K6WhmqfQdcLuQcw9V+Vqf
uMeQjhpQoBW8fYOqJkkyXF07WkqA7GKexKYRnOEOBwe2AdhMveevxlW0E6m8dxhMlG5EdgMo+4em
kp6xefswplVkxddcn7hRGXXWHAnkoXDIfzamkb1L49vFYGIvvv77stlcRkxEk8KjGqF7BZp58t2A
s+ymxlF1l20xV3ihWJWOEkDMmXP3HClRjDlSdRz43FApQPAovI92SCWbdMlfUqDZYq96bMsykfLv
FLTrV0JwuIsLSRuaVkjbskFqTYF9iLBoyMjLFtixbYx2gRUmRBgGPtbTebddZp8kqSJU/BwVo/yU
HT++ApLSQnz5C/4u5IpwoSFCu9Wg