Fixed issues in the Mercurial interface handling bundle files. 5_4_x

Sun, 09 Feb 2014 15:11:14 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 09 Feb 2014 15:11:14 +0100
branch
5_4_x
changeset 3266
d792451dd0fc
parent 3264
9b3c0a6e43e7
child 3267
718e6ef2e74d

Fixed issues in the Mercurial interface handling bundle files.

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
diff -r 9b3c0a6e43e7 -r d792451dd0fc Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Feb 09 12:30:48 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Feb 09 15:11:14 2014 +0100
@@ -707,7 +707,8 @@
             if err:
                 self.__showError(err)
             elif self.commandMode != "incoming" or \
-                    os.path.exists(self.vcs.bundleFile):
+                (self.vcs.bundleFile and 
+                 os.path.exists(self.vcs.bundleFile)):
                 out, err = self.__hgClient.runcommand(args)
                 self.buf = out.splitlines(True)
                 if err:
@@ -730,7 +731,7 @@
                 if procStarted:
                     process.waitForFinished(30000)
             
-            if os.path.exists(self.vcs.bundleFile):
+            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
                 self.process.start('hg', args)
                 procStarted = self.process.waitForStarted(5000)
                 if not procStarted:
diff -r 9b3c0a6e43e7 -r d792451dd0fc Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Feb 09 12:30:48 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Feb 09 15:11:14 2014 +0100
@@ -180,7 +180,8 @@
             if err:
                 self.__showError(err)
             elif self.mode != "incoming" or \
-                    os.path.exists(self.vcs.bundleFile):
+                (self.vcs.bundleFile and 
+                 os.path.exists(self.vcs.bundleFile)):
                 out, err = self.__hgClient.runcommand(args)
                 if err:
                     self.__showError(err)
@@ -203,7 +204,7 @@
                 if procStarted:
                     process.waitForFinished(30000)
             
-            if os.path.exists(self.vcs.bundleFile):
+            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
                 self.process.start('hg', args)
                 procStarted = self.process.waitForStarted(5000)
                 if not procStarted:

eric ide

mercurial