Mercurial Repositories > eric / changeset

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Fri Aug 20 14:11:49 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Fri Aug 20 14:19:13 2021 +0200
@@ -141,7 +141,10 @@
     
     def __mercurialInstalled(self):
         """
-        Private method to check, if mercurial is installed alongside eric7.
+        Private method to check, if Mercurial is installed alongside eric7.
+        
+        @return flag indicating an installed Mercurial executable
+        @rtype bool
         """
         hg = HgUtilities.getHgExecutable()
         # assume local installation, if the path is absolute

--- a/eric7/Project/ProjectBrowserModel.py	Fri Aug 20 14:11:49 2021 +0200
+++ b/eric7/Project/ProjectBrowserModel.py	Fri Aug 20 14:19:13 2021 +0200
@@ -514,10 +514,6 @@
                 else:
                     if type_ and type_ not in itm.getProjectTypes():
                         itm.addProjectType(type_)
-                        # TODO: commented out because it causes a crash
-                        # in Qt 6.1.2. What does change?
-##                        index = self.createIndex(itm.row(), 0, itm)
-##                        self.dataChanged.emit(index, index)
                 olditem = itm
             return (itm, pathlist[-1])
         else:

--- a/eric7/QScintilla/Editor.py	Fri Aug 20 14:11:49 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Fri Aug 20 14:19:13 2021 +0200
@@ -8542,9 +8542,11 @@
                 else:
                     references.append(
                         self.tr("{0:4d}    {1}\n    =>  {2}",
-                                "line number, source code, file name").format(
-                        reference.line, reference.codeLine.strip(),
-                        self.project.getRelativePath(reference.modulePath))
+                                "line number, source code, file name")
+                        .format(
+                            reference.line, reference.codeLine.strip(),
+                            self.project.getRelativePath(reference.modulePath)
+                        )
                     )
                 referencePositions.append(
                     (reference.modulePath, reference.line, reference.column))
@@ -8832,7 +8834,7 @@
     
     def __cancelMouseHoverHelp(self):
         """
-        Private slot cancelling the display of mouse hover help. 
+        Private slot cancelling the display of mouse hover help.
         """
         self.SendScintilla(QsciScintilla.SCI_CALLTIPCANCEL)
     

--- a/eric7/QScintilla/Exporters/ExporterTEX.py	Fri Aug 20 14:11:49 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterTEX.py	Fri Aug 20 14:19:13 2021 +0200
@@ -223,7 +223,7 @@
                 )
                 f.write(
                     "Source File: {0}\n\n\\noindent\n\\tiny{{\n"
-                    .format(title.replace('_','\\_')))
+                    .format(title.replace('_', '\\_')))
                 
                 styleCurrent = self.editor.styleAt(0)
                 f.write("\\eric{0}{{"

--- a/scripts/install.py	Fri Aug 20 14:11:49 2021 +0200
+++ b/scripts/install.py	Fri Aug 20 14:19:13 2021 +0200
@@ -1754,10 +1754,11 @@
     
     with contextlib.suppress(OSError):
         os.rename(fileName, fileName + ".orig")
-    if sys.platform.startswith(("win", "cygwin")):
-        localHg = os.path.join(sys.exec_prefix, "Scripts", "hg.exe")
-    else:
-        localHg = os.path.join(sys.exec_prefix, "bin", "hg")
+    localHg = (
+        os.path.join(sys.exec_prefix, "Scripts", "hg.exe")
+        if sys.platform.startswith(("win", "cygwin")) else
+        os.path.join(sys.exec_prefix, "bin", "hg")
+    )
     for hg in (localHg, "hg"):
         with contextlib.suppress(OSError, subprocess.CalledProcessError):
             hgOut = subprocess.check_output([hg, "identify", "-i"])   # secok