Mercurial Repositories > eric / changeset

changeset

Fixed issues in various Mercurial files that could cause infinite loops on Windows systems. 5_1_x

Thu, 15 Sep 2011 18:35:49 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 15 Sep 2011 18:35:49 +0200
branch
5_1_x
changeset 1320
e94577f27c3e
parent 1317
aa16b0456e8f
child 1321
ff971e15cf95

Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.

Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -85,7 +85,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -143,7 +143,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         self.process.setWorkingDirectory(repodir)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -574,7 +574,7 @@
         self.repodir = self.dname
         while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)):
             self.repodir = os.path.dirname(self.repodir)
-            if self.repodir == os.sep:
+            if os.path.splitdrive(self.repodir)[1] == os.sep:
                 return
         
         self.projectMode = (self.fname == "." and self.dname == self.repodir)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -104,7 +104,7 @@
         self.repodir = self.dname
         while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)):
             self.repodir = os.path.dirname(self.repodir)
-            if self.repodir == os.sep:
+            if os.path.splitdrive(self.repodir)[1] == os.sep:
                 return
         
         self.projectMode = (self.fname == "." and self.dname == self.repodir)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -174,7 +174,7 @@
         repodir = self.dname
         while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         self.process.setWorkingDirectory(repodir)
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Thu Sep 15 18:35:49 2011 +0200
@@ -89,7 +89,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Sep 14 19:46:52 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Sep 15 18:35:49 2011 +0200
@@ -368,7 +368,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         if isinstance(name, list):
@@ -421,7 +421,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return False
         
         if noDialog:
@@ -465,7 +465,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         if isinstance(name, list):
@@ -530,7 +530,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return False
         
         if noDialog:
@@ -588,7 +588,7 @@
             repodir = dname
             while not os.path.isdir(os.path.join(repodir, self.adminDir)):
                 repodir = os.path.dirname(repodir)
-                if repodir == os.sep:
+                if os.path.splitdrive(repodir)[1] == os.sep:
                     return False
             
             if noDialog:
@@ -676,7 +676,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dlg = HgTagDialog(self.tagsList)
@@ -729,7 +729,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dia = HgDialog(self.trUtf8('Reverting changes'))
@@ -761,7 +761,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -812,7 +812,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return 0
         
         ioEncoding = Preferences.getSystem("IOEncoding")
@@ -873,7 +873,7 @@
             repodir = dname
             while not os.path.isdir(os.path.join(repodir, self.adminDir)):
                 repodir = os.path.dirname(repodir)
-                if repodir == os.sep:
+                if os.path.splitdrive(repodir)[1] == os.sep:
                     return names
         
             ioEncoding = Preferences.getSystem("IOEncoding")
@@ -973,7 +973,7 @@
             repodir = name
             while not os.path.isdir(os.path.join(repodir, self.adminDir)):
                 repodir = os.path.dirname(repodir)
-                if repodir == os.sep:
+                if os.path.splitdrive(repodir)[1] == os.sep:
                     return
             
             dia = HgDialog(self.trUtf8('Mercurial command'))
@@ -1146,7 +1146,7 @@
             repodir = dname
             while not os.path.isdir(os.path.join(repodir, self.adminDir)):
                 repodir = os.path.dirname(repodir)
-                if repodir == os.sep:
+                if os.path.splitdrive(repodir)[1] == os.sep:
                     return False
             
             dia = HgDialog(self.trUtf8('Copying {0}')
@@ -1314,7 +1314,7 @@
         repodir = self.splitPath(name)[0]
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dia = HgDialog(self.trUtf8('Pulling from a remote Mercurial repository'))
@@ -1343,7 +1343,7 @@
         repodir = self.splitPath(name)[0]
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dia = HgDialog(self.trUtf8('Pushing to a remote Mercurial repository'))
@@ -1369,7 +1369,7 @@
         repodir = self.splitPath(ppath)[0]
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         process = QProcess()
@@ -1452,7 +1452,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return False
         
         dia = HgDialog(
@@ -1474,7 +1474,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         name, ok = QInputDialog.getItem(
@@ -1505,7 +1505,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1528,7 +1528,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         cfgFile = os.path.join(repodir, self.adminDir, "hgrc")
@@ -1553,7 +1553,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1576,7 +1576,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1600,7 +1600,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1623,7 +1623,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1646,7 +1646,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         args = []
@@ -1720,7 +1720,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dlg = HgBundleDialog(self.tagsList, self.branchesList)
@@ -1784,7 +1784,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         file = E5FileDialog.getOpenFileName(
@@ -1815,7 +1815,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         file = E5FileDialog.getOpenFileName(
@@ -1847,7 +1847,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         res = False
@@ -1895,7 +1895,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         rev = ""
@@ -1942,7 +1942,7 @@
         repodir = dname
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dia = HgDialog(
@@ -1967,7 +1967,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         dlg = HgBackoutDialog(self.tagsList, self.branchesList)
@@ -2011,7 +2011,7 @@
         repodir = str(dname)
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
-            if repodir == os.sep:
+            if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
         self.serveDlg = HgServeDialog(self, repodir)

Mercurial Repository: eric

eric ide

mercurial