Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -564,11 +564,11 @@
         
         col = self.__revs.index(rev)
         color = self.__revColors.pop(rev)
-        next = self.__revs[:]
+        nextRevs = self.__revs[:]
         
         # add parents to next
-        addparents = [p for p in parents if p not in next]
-        next[col:col + 1] = addparents
+        addparents = [p for p in parents if p not in nextRevs]
+        nextRevs[col:col + 1] = addparents
         
         # set colors for the parents
         for i, p in enumerate(addparents):
@@ -582,15 +582,15 @@
         edges = []
         if parents[0] != -1:
             for ecol, erev in enumerate(self.__revs):
-                if erev in next:
+                if erev in nextRevs:
                     edges.append(
-                        (ecol, next.index(erev), self.__revColors[erev]))
+                        (ecol, nextRevs.index(erev), self.__revColors[erev]))
                 elif erev == rev:
                     for p in parents:
                         edges.append(
-                            (ecol, next.index(p), self.__revColors[p]))
+                            (ecol, nextRevs.index(p), self.__revColors[p]))
         
-        self.__revs = next
+        self.__revs = nextRevs
         return col, color, edges
     
     def __generateIcon(self, column, color, bottomedges, topedges, dotColor,
@@ -1973,17 +1973,17 @@
         """
         Private slot to send the input to the mercurial process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()