Another fix for the Mercurial log dialogs.

Sat, 01 Feb 2014 17:01:08 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 01 Feb 2014 17:01:08 +0100
changeset 3249
8f22bfa586b1
parent 3247
ed79e48ba0b4
child 3250
ed3410e53909

Another fix for the Mercurial log dialogs.

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
diff -r ed79e48ba0b4 -r 8f22bfa586b1 Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Feb 01 16:35:17 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Feb 01 17:01:08 2014 +0100
@@ -725,7 +725,8 @@
                 err = ""
             if err:
                 self.__showError(err)
-            elif os.path.exists(self.vcs.bundleFile):
+            elif self.commandMode != "incoming" or \
+                    os.path.exists(self.vcs.bundleFile):
                 out, err = self.__hgClient.runcommand(args)
                 self.buf = out.splitlines(True)
                 if err:
diff -r ed79e48ba0b4 -r 8f22bfa586b1 Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Feb 01 16:35:17 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Feb 01 17:01:08 2014 +0100
@@ -179,7 +179,8 @@
                 err = ""
             if err:
                 self.__showError(err)
-            elif os.path.exists(self.vcs.bundleFile):
+            elif self.mode != "incoming" or \
+                    os.path.exists(self.vcs.bundleFile):
                 out, err = self.__hgClient.runcommand(args)
                 if err:
                     self.__showError(err)

eric ide

mercurial