Thu, 15 Sep 2011 19:38:39 +0200
Added a prompt window for the Mercurial command server client.
--- a/APIs/Python3/eric5.api Thu Sep 15 18:33:53 2011 +0200 +++ b/APIs/Python3/eric5.api Thu Sep 15 19:38:39 2011 +0200 @@ -3357,12 +3357,16 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.cancel?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.func?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.isExecuting?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.myprompt?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.restartServer?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, input=None, output=None, error=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.startServer?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.stopServer?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.wasCanceled?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient?1(repoPath, encoding, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog.getInput?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog.on_inputEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog?1(size, message, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog?1(argvList, ppath, parent=None)
--- a/Documentation/Help/source.qhp Thu Sep 15 18:33:53 2011 +0200 +++ b/Documentation/Help/source.qhp Thu Sep 15 19:38:39 2011 +0200 @@ -417,6 +417,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html" /> @@ -8732,6 +8733,7 @@ <keyword name="HgClient (Module)" id="HgClient (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html" /> <keyword name="HgClient" id="HgClient" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient" /> <keyword name="HgClient (Constructor)" id="HgClient (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.__init__" /> + <keyword name="HgClient.__prompt" id="HgClient.__prompt" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.__prompt" /> <keyword name="HgClient.__readChannel" id="HgClient.__readChannel" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.__readChannel" /> <keyword name="HgClient.__readHello" id="HgClient.__readHello" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.__readHello" /> <keyword name="HgClient.__runcommand" id="HgClient.__runcommand" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.__runcommand" /> @@ -8740,6 +8742,7 @@ <keyword name="HgClient.cancel" id="HgClient.cancel" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.cancel" /> <keyword name="HgClient.func" id="HgClient.func" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.func" /> <keyword name="HgClient.isExecuting" id="HgClient.isExecuting" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.isExecuting" /> + <keyword name="HgClient.myprompt" id="HgClient.myprompt" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.myprompt" /> <keyword name="HgClient.restartServer" id="HgClient.restartServer" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.restartServer" /> <keyword name="HgClient.runcommand" id="HgClient.runcommand" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.runcommand" /> <keyword name="HgClient.startServer" id="HgClient.startServer" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html#HgClient.startServer" /> @@ -8864,6 +8867,11 @@ <keyword name="HgLogDialog.on_passwordCheckBox_toggled" id="HgLogDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_passwordCheckBox_toggled" /> <keyword name="HgLogDialog.on_sendButton_clicked" id="HgLogDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_sendButton_clicked" /> <keyword name="HgLogDialog.start" id="HgLogDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.start" /> + <keyword name="HgClientPromptDialog (Module)" id="HgClientPromptDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html" /> + <keyword name="HgClientPromptDialog" id="HgClientPromptDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog" /> + <keyword name="HgClientPromptDialog (Constructor)" id="HgClientPromptDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.__init__" /> + <keyword name="HgClientPromptDialog.getInput" id="HgClientPromptDialog.getInput" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.getInput" /> + <keyword name="HgClientPromptDialog.on_inputEdit_textChanged" id="HgClientPromptDialog.on_inputEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.on_inputEdit_textChanged" /> <keyword name="HgOptionsDialog (Module)" id="HgOptionsDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <keyword name="HgOptionsDialog" id="HgOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog" /> <keyword name="HgOptionsDialog (Constructor)" id="HgOptionsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog.__init__" /> @@ -11420,6 +11428,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html Thu Sep 15 18:33:53 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html Thu Sep 15 19:38:39 2011 +0200 @@ -61,6 +61,9 @@ <td><a href="#HgClient.__init__">HgClient</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgClient.__prompt">__prompt</a></td> +<td>Private method to prompt the user for some input.</td> +</tr><tr> <td><a href="#HgClient.__readChannel">__readChannel</a></td> <td>Private method to read data from the command server.</td> </tr><tr> @@ -85,6 +88,9 @@ <td><a href="#HgClient.isExecuting">isExecuting</a></td> <td>Public method to check, if the server is executing a command.</td> </tr><tr> +<td><a href="#HgClient.myprompt">myprompt</a></td> +<td></td> +</tr><tr> <td><a href="#HgClient.restartServer">restartServer</a></td> <td>Public method to restart the command server.</td> </tr><tr> @@ -121,6 +127,19 @@ <dd> reference to the parent object (QObject) </dd> +</dl><a NAME="HgClient.__prompt" ID="HgClient.__prompt"></a> +<h4>HgClient.__prompt</h4> +<b>__prompt</b>(<i>size, message</i>) +<p> + Private method to prompt the user for some input. +</p><dl> +<dt><i>size</i></dt> +<dd> +maximum length of the requested input (integer) +</dd><dt><i>message</i></dt> +<dd> +message sent by the server (string) +</dd> </dl><a NAME="HgClient.__readChannel" ID="HgClient.__readChannel"></a> <h4>HgClient.__readChannel</h4> <b>__readChannel</b>(<i></i>) @@ -210,7 +229,10 @@ <dd> flag indicating the execution of a command (boolean) </dd> -</dl><a NAME="HgClient.restartServer" ID="HgClient.restartServer"></a> +</dl><a NAME="HgClient.myprompt" ID="HgClient.myprompt"></a> +<h4>HgClient.myprompt</h4> +<b>myprompt</b>(<i></i>) +<a NAME="HgClient.restartServer" ID="HgClient.restartServer"></a> <h4>HgClient.restartServer</h4> <b>restartServer</b>(<i></i>) <p>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html Thu Sep 15 19:38:39 2011 +0200 @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog</h1> +<p> +Module implementing a prompt dialog for the Mercurial command server. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgClientPromptDialog">HgClientPromptDialog</a></td> +<td>Class implementing a prompt dialog for the Mercurial command server.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgClientPromptDialog" ID="HgClientPromptDialog"></a> +<h2>HgClientPromptDialog</h2> +<p> + Class implementing a prompt dialog for the Mercurial command server. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgClientPromptDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgClientPromptDialog.__init__">HgClientPromptDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgClientPromptDialog.getInput">getInput</a></td> +<td>Public method to get the user input.</td> +</tr><tr> +<td><a href="#HgClientPromptDialog.on_inputEdit_textChanged">on_inputEdit_textChanged</a></td> +<td>Private slot to handle changes of the user input.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgClientPromptDialog.__init__" ID="HgClientPromptDialog.__init__"></a> +<h4>HgClientPromptDialog (Constructor)</h4> +<b>HgClientPromptDialog</b>(<i>size, message, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>size</i></dt> +<dd> +maximum length of the requested input (integer) +</dd><dt><i>message</i></dt> +<dd> +message sent by the server (string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgClientPromptDialog.getInput" ID="HgClientPromptDialog.getInput"></a> +<h4>HgClientPromptDialog.getInput</h4> +<b>getInput</b>(<i></i>) +<p> + Public method to get the user input. +</p><dl> +<dt>Returns:</dt> +<dd> +user input (string) +</dd> +</dl><a NAME="HgClientPromptDialog.on_inputEdit_textChanged" ID="HgClientPromptDialog.on_inputEdit_textChanged"></a> +<h4>HgClientPromptDialog.on_inputEdit_textChanged</h4> +<b>on_inputEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the user input. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text entered by the user (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Thu Sep 15 18:33:53 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Thu Sep 15 19:38:39 2011 +0200 @@ -75,6 +75,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html">HgClient</a></td> <td>Module implementing an interface to the Mercurial command server.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html">HgClientPromptDialog</a></td> +<td>Module implementing a prompt dialog for the Mercurial command server.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html">HgCommandDialog</a></td> <td>Module implementing the Mercurial command dialog.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py Thu Sep 15 18:33:53 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py Thu Sep 15 19:38:39 2011 +0200 @@ -12,6 +12,9 @@ from PyQt4.QtCore import QProcess, QProcessEnvironment, QObject, QByteArray, \ QCoreApplication +from PyQt4.QtGui import QDialog + +from .HgClientPromptDialog import HgClientPromptDialog import Preferences @@ -176,6 +179,9 @@ if not data: return "", "" + if data.startswith(b" L") and self.__server.bytesAvailable() > 0: + # workaround for an issue in the Mercurial command server + data = data[1:] + bytes(self.__server.read(1)) channel, length = struct.unpack(HgClient.OutputFormat, data) channel = channel.decode(self.__encoding) if channel in "IL": @@ -233,7 +239,11 @@ # input channels if channel in inputChannels: - self.__writeDataBlock(inputChannels[channel](data)) + input = inputChannels[channel](data) + if channel == "L": + # echo the input to the output if it was a prompt + outputChannels["o"](input) + self.__writeDataBlock(input) # output channels elif channel in outputChannels: @@ -252,6 +262,19 @@ else: pass + def __prompt(self, size, message): + """ + Private method to prompt the user for some input. + + @param size maximum length of the requested input (integer) + @param message message sent by the server (string) + """ + input = "" + dlg = HgClientPromptDialog(size, message) + if dlg.exec_() == QDialog.Accepted: + input = dlg.getInput() + '\n' + return input + def runcommand(self, args, prompt=None, input=None, output=None, error=None): """ Public method to execute a command via the command server. @@ -291,6 +314,11 @@ reply = prompt(size, outputBuffer.getvalue()) return reply inputChannels["L"] = func + else: + def myprompt(size): + reply = self.__prompt(size, outputBuffer.getvalue()) + return reply + inputChannels["L"] = myprompt if input is not None: inputChannels["I"] = input
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py Thu Sep 15 19:38:39 2011 +0200 @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a prompt dialog for the Mercurial command server. +""" + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox, QTextCursor + +from .Ui_HgClientPromptDialog import Ui_HgClientPromptDialog + + +class HgClientPromptDialog(QDialog, Ui_HgClientPromptDialog): + """ + Class implementing a prompt dialog for the Mercurial command server. + """ + def __init__(self, size, message, parent=None): + """ + Constructor + + @param size maximum length of the requested input (integer) + @param message message sent by the server (string) + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.inputEdit.setMaxLength(size) + self.messageEdit.setPlainText(message) + + tc = self.messageEdit.textCursor() + tc.movePosition(QTextCursor.End) + self.messageEdit.setTextCursor(tc) + self.messageEdit.ensureCursorVisible() + + @pyqtSlot(str) + def on_inputEdit_textChanged(self, txt): + """ + Private slot to handle changes of the user input. + + @param txt text entered by the user (string) + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(bool(txt)) + + def getInput(self): + """ + Public method to get the user input. + + @return user input (string) + """ + return self.inputEdit.text()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui Thu Sep 15 19:38:39 2011 +0200 @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgClientPromptDialog</class> + <widget class="QDialog" name="HgClientPromptDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Client Input</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Message:</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QPlainTextEdit" name="messageEdit"> + <property name="toolTip"> + <string>Shows the message sent by the Mercurial server</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Input:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="inputEdit"> + <property name="toolTip"> + <string>Enter the response to be sent to the Mercurial server</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>inputEdit</tabstop> + <tabstop>buttonBox</tabstop> + <tabstop>messageEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgClientPromptDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgClientPromptDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/eric5.e4p Thu Sep 15 18:33:53 2011 +0200 +++ b/eric5.e4p Thu Sep 15 19:38:39 2011 +0200 @@ -931,6 +931,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1195,6 +1196,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_cs.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15899,7 +15899,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15909,7 +15909,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16636,42 +16636,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_de.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_de.ts Thu Sep 15 19:38:39 2011 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1640,8 +1641,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1859,7 +1860,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12588,7 +12589,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15530,7 +15531,7 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> @@ -15540,7 +15541,7 @@ <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> @@ -16240,42 +16241,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation>'Hallo' Nachricht konnte nicht empfangen werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation>Daten auf unerwartetem Kanal empfangen.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Ungültige 'Hallo' Nachricht; Erwartete 'capabilities: ', empfing jedoch '{0}'.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation>'capabilities' Nachricht enthielt keine Fähigkeiten.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Ungültige 'Hallo' Nachricht; Erwartete 'encoding: ', empfing jedoch '{0}'.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation>'encoding' Nachricht enthielt keine Kodierung.</translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation>Mercurial Client Eingabe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation>Nachricht:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation>Zeig die vom Server geschickte Nachricht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation>Eingabe:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation>Gib die an den Server zu schickende Antwort ein</translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_en.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_en.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15446,7 +15446,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15456,7 +15456,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16153,42 +16153,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_es.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_es.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15716,7 +15716,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15726,7 +15726,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16456,42 +16456,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished">Mensaje:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_fr.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_fr.ts Thu Sep 15 19:38:39 2011 +0200 @@ -17036,7 +17036,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -17046,7 +17046,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17758,42 +17758,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_it.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_it.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15655,7 +15655,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15665,7 +15665,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16392,42 +16392,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_ru.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_ru.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15762,7 +15762,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15772,7 +15772,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16494,42 +16494,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_tr.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_tr.ts Thu Sep 15 19:38:39 2011 +0200 @@ -15890,7 +15890,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -15900,7 +15900,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16622,42 +16622,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
--- a/i18n/eric5_zh_CN.GB2312.ts Thu Sep 15 18:33:53 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Sep 15 19:38:39 2011 +0200 @@ -17002,7 +17002,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -17012,7 +17012,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17724,42 +17724,70 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="85"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgClientPromptDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="14"/> + <source>Mercurial Client Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="23"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="30"/> + <source>Shows the message sent by the Mercurial server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="43"/> + <source>Input:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.ui" line="50"/> + <source>Enter the response to be sent to the Mercurial server</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>