Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Mar 21 19:26:10 2019 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Mar 21 19:27:42 2019 +0100
@@ -903,7 +903,7 @@
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
             if os.path.splitdrive(repodir)[1] == os.sep:
-                return
+                return False
         
         from .HgTagDialog import HgTagDialog
         dlg = HgTagDialog(self.hgGetTagsList(repodir, withType=True),
@@ -1750,7 +1750,7 @@
             while not os.path.isdir(os.path.join(repodir, self.adminDir)):
                 repodir = os.path.dirname(repodir)
                 if os.path.splitdrive(repodir)[1] == os.sep:
-                    return
+                    return "", ""
             
             process = QProcess()
             process.setWorkingDirectory(repodir)
@@ -2145,7 +2145,7 @@
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
             if os.path.splitdrive(repodir)[1] == os.sep:
-                return
+                return False
         
         if self.version >= (4, 5, 0):
             args = self.initCommand("merge")
@@ -2625,7 +2625,7 @@
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
             if os.path.splitdrive(repodir)[1] == os.sep:
-                return
+                return False
         
         res = False
         if not files:
@@ -2850,7 +2850,7 @@
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
             if os.path.splitdrive(repodir)[1] == os.sep:
-                return
+                return False
         
         from .HgImportDialog import HgImportDialog
         dlg = HgImportDialog()
@@ -3060,7 +3060,7 @@
         while not os.path.isdir(os.path.join(repodir, self.adminDir)):
             repodir = os.path.dirname(repodir)
             if os.path.splitdrive(repodir)[1] == os.sep:
-                return
+                return False
         
         args = self.initCommand("graft")
         args.append(subcommand)