Mercurial Repositories > eric / changeset
changeset
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
- branch
- 5_4_x
- changeset 3252
- 8dfa2a7e936d
- parent 3248
- 38d32752025c
- child 3253
- 2374607dde30
Another fix for the Mercurial log dialogs.
(grafted from 8f22bfa586b1c9566a97cf29889e51d1bb2cbdf8)
| 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 Sat Feb 01 16:35:17 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Feb 01 17:01:08 2014 +0100 @@ -706,7 +706,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:
--- 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)
