Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the Mercurial log dialogs.
Wed, 05 Mar 2014 20:02:28 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 05 Mar 2014 20:02:28 +0100
- branch
- 5_4_x
- changeset 3331
- 3a723d9cfa6a
- parent 3324
- 48cbf836d238
- child 3335
- 0e973a74be62
Fixed an issue in the Mercurial log dialogs.
| Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py | file | annotate | diff | comparison | revisions | |
| Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Mar 03 19:24:36 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed Mar 05 20:02:28 2014 +0100 @@ -733,7 +733,9 @@ if procStarted: process.waitForFinished(30000) - if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ + if self.commandMode != "incoming" or \ + (self.vcs.bundleFile and + os.path.exists(self.vcs.bundleFile)) or \ self.bundle: self.process.start('hg', args) procStarted = self.process.waitForStarted(5000)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon Mar 03 19:24:36 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Wed Mar 05 20:02:28 2014 +0100 @@ -205,7 +205,9 @@ if procStarted: process.waitForFinished(30000) - if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ + if self.mode != "incoming" or \ + (self.vcs.bundleFile and + os.path.exists(self.vcs.bundleFile)) or \ self.bundle: self.process.start('hg', args) procStarted = self.process.waitForStarted(5000)
