comparison easyhg.py @ 358:ea6f76c0aa76

Make username/password prompts in easyhg.py more helpful; use a distinctive return for cancel in these dialogs, and avoid showing command-failed in the main program when cancelled

 def easyhg_prompt(self, msg, default="y"):
     if not self.interactive():
         self.write(msg, ' ', default, "\n")
         return default
     if msg == _('user:'):
-        msg = _('User:')
+        msg = _('Username for remote repository:')
     d = QtGui.QInputDialog()
     d.setInputMode(QtGui.QInputDialog.TextInput)
     d.setTextEchoMode(QtGui.QLineEdit.Normal)
     d.setLabelText(msg)
     d.setWindowTitle(_('EasyMercurial: Information'))
     d.show()
     d.raise_()
     ok = d.exec_()
     r = d.textValue()
     if not ok:
-        raise util.Abort(_('response expected'))
+        raise util.Abort(_('username entry cancelled'))
     if not r:
         return default
     return r
 
 def easyhg_getpass(self, prompt=None, default=None):
     if not self.interactive():
         return default
     if not prompt or prompt == _('password:'):
-        prompt = _('Password:');
+        prompt = _('Password for remote repository:');
     d = QtGui.QInputDialog()
     d.setInputMode(QtGui.QInputDialog.TextInput)
     d.setTextEchoMode(QtGui.QLineEdit.Password)
     d.setLabelText(prompt)
     d.setWindowTitle(_('EasyMercurial: Password'))
     d.show()
     d.raise_()
     ok = d.exec_()
     r = d.textValue()
     if not ok:
-        raise util.Abort(_('response expected'))
+        raise util.Abort(_('password entry cancelled'))
     if not r:
         return default
     return r
 
+