Merge pull request #1427 from efiop/master

ssh: mention private key passphrase in the prompt

dvc/prompt.py

@@ -32,7 +32,7 @@ class Prompt(object):
         if not sys.stdout.isatty():
             return None
 
-        msg = 'Enter password for {}:\n'.format(msg)
+        msg = '{}:\n'.format(msg)
 
         if not progress.is_finished:
             msg = u'\n' + msg

dvc/remote/ssh.py

@@ -91,7 +91,8 @@ class RemoteSSH(RemoteBase):
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
         if self.ask_password and self.password is None:
-            msg = "host '{}' port '{}' user '{}'".format(host, port, user)
+            msg = ("Enter a private key passphrase or a password for "
+                   "host '{}' port '{}' user '{}'").format(host, port, user)
             self.password = self.project.prompt.prompt_password(msg)
 
         ssh.connect(host,