Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Mar 07 19:46:57 2017 +0100
@@ -257,13 +257,13 @@
             # input channels
             if channel in inputChannels:
                 if channel == "L":
-                    input, isPassword = inputChannels[channel](data)
+                    inputData, isPassword = inputChannels[channel](data)
                     # echo the input to the output if it was a prompt
                     if not isPassword:
-                        outputChannels["o"](input)
+                        outputChannels["o"](inputData)
                 else:
-                    input = inputChannels[channel](data)
-                self.__writeDataBlock(input)
+                    inputData = inputChannels[channel](data)
+                self.__writeDataBlock(inputData)
             
             # output channels
             elif channel in outputChannels:
@@ -291,15 +291,15 @@
         @return data entered by the user (string)
         """
         from .HgClientPromptDialog import HgClientPromptDialog
-        input = ""
+        inputData = ""
         isPassword = False
         dlg = HgClientPromptDialog(size, message)
         if dlg.exec_() == QDialog.Accepted:
-            input = dlg.getInput() + '\n'
+            inputData = dlg.getInput() + '\n'
             isPassword = dlg.isPassword()
-        return input, isPassword
+        return inputData, isPassword
     
-    def runcommand(self, args, prompt=None, input=None, output=None,
+    def runcommand(self, args, prompt=None, inputData=None, output=None,
                    error=None):
         """
         Public method to execute a command via the command server.
@@ -308,8 +308,8 @@
         @keyparam prompt function to reply to prompts by the server. It
             receives the max number of bytes to return and the contents
             of the output channel received so far.
-        @keyparam input function to reply to bulk data requests by the server.
-            It receives the max number of bytes to return.
+        @keyparam inputData function to reply to bulk data requests by the
+            server. It receives the max number of bytes to return.
         @keyparam output function receiving the data from the server (string).
             If a prompt function is given, this parameter will be ignored.
         @keyparam error function receiving error messages from the server
@@ -349,8 +349,8 @@
                 reply, isPassword = self.__prompt(size, msg)
                 return reply, isPassword
             inputChannels["L"] = myprompt
-        if input is not None:
-            inputChannels["I"] = input
+        if inputData is not None:
+            inputChannels["I"] = inputData
         
         self.__cancel = False
         self.__runcommand(args, inputChannels, outputChannels)