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

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

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

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 d792451dd0fc -r 718e6ef2e74d Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Feb 09 15:11:14 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Feb 09 15:51:14 2014 +0100
@@ -708,7 +708,8 @@
                 self.__showError(err)
             elif self.commandMode != "incoming" or \
                 (self.vcs.bundleFile and 
-                 os.path.exists(self.vcs.bundleFile)):
+                 os.path.exists(self.vcs.bundleFile)) or \
+                    self.bundle:
                 out, err = self.__hgClient.runcommand(args)
                 self.buf = out.splitlines(True)
                 if err:
@@ -731,7 +732,8 @@
                 if procStarted:
                     process.waitForFinished(30000)
             
-            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
+            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \
+                    self.bundle:
                 self.process.start('hg', args)
                 procStarted = self.process.waitForStarted(5000)
                 if not procStarted:
diff -r d792451dd0fc -r 718e6ef2e74d Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Feb 09 15:11:14 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Feb 09 15:51:14 2014 +0100
@@ -181,7 +181,8 @@
                 self.__showError(err)
             elif self.mode != "incoming" or \
                 (self.vcs.bundleFile and 
-                 os.path.exists(self.vcs.bundleFile)):
+                 os.path.exists(self.vcs.bundleFile)) or \
+                    self.bundle:
                 out, err = self.__hgClient.runcommand(args)
                 if err:
                     self.__showError(err)
@@ -204,7 +205,8 @@
                 if procStarted:
                     process.waitForFinished(30000)
             
-            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
+            if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \
+                    self.bundle:
                 self.process.start('hg', args)
                 procStarted = self.process.waitForStarted(5000)
                 if not procStarted:

eric ide

mercurial