Rev 3232: (Dmitry Vasiliev) Restore auto-detection of plink.exe on Windows in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Feb 23 16:08:18 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3232
revision-id:pqm at pqm.ubuntu.com-20080223160808-81yb25z7tmhlss8q
parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
parent: bialix at ukr.net-20080223142450-7o36f9rf39mtz18z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-02-23 16:08:08 +0000
message:
(Dmitry Vasiliev) Restore auto-detection of plink.exe on Windows
(bug #107593)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3220.1.5
revision-id:bialix at ukr.net-20080223142450-7o36f9rf39mtz18z
parent: bialix at ukr.net-20080223114033-1lfhefcm06fm62um
parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bug.107593
timestamp: Sat 2008-02-23 16:24:50 +0200
message:
merge bzr.dev
removed:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
added:
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3220.1.4
revision-id:bialix at ukr.net-20080223114033-1lfhefcm06fm62um
parent: bialix at ukr.net-20080223113207-2au125woovq0i8qh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bug.107593
timestamp: Sat 2008-02-23 13:40:33 +0200
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3220.1.3
revision-id:bialix at ukr.net-20080223113207-2au125woovq0i8qh
parent: dima at hlabs.spb.ru-20080208183635-srbdry1dncrwmyh0
parent: pqm at pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bug.107593
timestamp: Sat 2008-02-23 13:32:07 +0200
message:
merge bzr.dev
added:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3220.1.2
revision-id:dima at hlabs.spb.ru-20080208183635-srbdry1dncrwmyh0
parent: dima at hlabs.spb.ru-20080207182947-5d3kef191b1hs7ln
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: plink.fix
timestamp: Fri 2008-02-08 16:36:35 -0200
message:
Re-enabled auto-detection of plink vendor and fixed tests
modified:
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3220.1.1
revision-id:dima at hlabs.spb.ru-20080207182947-5d3kef191b1hs7ln
parent: pqm at pqm.ubuntu.com-20080207065948-pjxwy4z6ljrpugj8
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: bzr.dev
timestamp: Thu 2008-02-07 16:29:47 -0200
message:
Now plink closes the pipe if unable to open ssh connection and connection error can be reported
modified:
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
=== modified file 'NEWS'
--- a/NEWS 2008-02-23 12:27:38 +0000
+++ b/NEWS 2008-02-23 14:24:50 +0000
@@ -28,6 +28,8 @@
bzr.exe, installed to ``C:\Program Files\Bazaar\plugins`` directory,
and standalone installer allows user to skip installation of this plugin.
(Alexander Belchenko)
+
+ * Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
FEATURES:
@@ -35,8 +37,11 @@
BUGFIXES:
+ * Disable plink's interactive prompt for password.
+ (#107593, Dmitry Vasiliev)
+
* Include quick-start-summary.svg file to python-based installer(s)
- for Windows (#192924, Alexander Belchenko)
+ for Windows. (#192924, Alexander Belchenko)
* ``merge --preview`` now works for merges that add or modify
symlinks (James Henstridge)
=== modified file 'bzrlib/tests/test_ssh_transport.py'
--- a/bzrlib/tests/test_ssh_transport.py 2007-11-15 21:07:53 +0000
+++ b/bzrlib/tests/test_ssh_transport.py 2008-02-08 18:36:35 +0000
@@ -76,11 +76,7 @@
manager = TestSSHVendorManager()
self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
manager.set_ssh_version_string("plink")
- # because autodetection of plink vendor is temporary disabled
- # next test is no longer pass. so it's disabled as well.
- #~self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
- # expect error instead (bialix 20071115)
- self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
+ self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
def test_cached_vendor(self):
manager = TestSSHVendorManager()
@@ -188,7 +184,7 @@
self.assertEqual(
vendor._get_vendor_specific_argv(
"user", "host", 100, command=["bzr"]),
- ["plink", "-x", "-a", "-ssh", "-2",
+ ["plink", "-x", "-a", "-ssh", "-2", "-batch",
"-P", "100",
"-l", "user",
"host", "bzr"]
@@ -199,7 +195,7 @@
self.assertEqual(
vendor._get_vendor_specific_argv(
"user", "host", 100, subsystem="sftp"),
- ["plink", "-x", "-a", "-ssh", "-2",
+ ["plink", "-x", "-a", "-ssh", "-2", "-batch",
"-P", "100",
"-l", "user",
"-s", "host", "sftp"]
=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py 2007-12-03 16:39:11 +0000
+++ b/bzrlib/transport/ssh.py 2008-02-08 18:36:35 +0000
@@ -132,12 +132,7 @@
def _get_vendor_by_inspection(self):
"""Return the vendor or None by checking for known SSH implementations."""
- # detection of plink vendor is disabled because of bug #107593
- # https://bugs.launchpad.net/bzr/+bug/107593
- # who want plink should explicitly enable it with BZR_SSH environment
- # variable.
- #~for args in (['ssh', '-V'], ['plink', '-V']):
- for args in (['ssh', '-V'],):
+ for args in (['ssh', '-V'], ['plink', '-V']):
version = self._get_ssh_version_string(args)
vendor = self._get_vendor_by_version_string(version, args)
if vendor is not None:
@@ -448,7 +443,7 @@
if subsystem is not None:
assert command is None, (
'subsystem and command are mutually exclusive')
- args = ['plink', '-x', '-a', '-ssh', '-2']
+ args = ['plink', '-x', '-a', '-ssh', '-2', '-batch']
if port is not None:
args.extend(['-P', str(port)])
if username is not None:
More information about the bazaar-commits
mailing list