Mercurial Repositories > eric / changeset
changeset
Merged with changes provided by Tobias.
Thu, 09 Mar 2017 17:42:44 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 09 Mar 2017 17:42:44 +0100
- changeset 5595
- 1d4706f786d6
- parent 5590
- 40e18a10d837 (current diff)
- parent 5594
- 6e477a8e990c (diff)
- child 5596
- 4550d8e34765
Merged with changes provided by Tobias.
| DebugClients/Python/DebugClientBase.py | file | annotate | diff | comparison | revisions |
--- a/DebugClients/Python/DebugClientBase.py Thu Mar 09 17:36:12 2017 +0100 +++ b/DebugClients/Python/DebugClientBase.py Thu Mar 09 17:42:44 2017 +0100 @@ -1428,7 +1428,7 @@ elif resolver: varDict = resolver.getDictionary(variable) vlist = self.__formatVariablesList( - list(dict.keys()), varDict, scope, filterList) + list(varDict.keys()), varDict, scope, filterList) varlist.extend(vlist) self.sendJsonCommand("ResponseVariable", {
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Mar 09 17:36:12 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Mar 09 17:42:44 2017 +0100 @@ -1808,6 +1808,8 @@ self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() + else: + return elif revisions: rev1, rev2 = revisions[0], revisions[1] else:
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Thu Mar 09 17:36:12 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Thu Mar 09 17:42:44 2017 +0100 @@ -2161,6 +2161,8 @@ rev1 = "" if rev2 == "WORKING": rev2 = "" + else: + return elif revisions: rev1, rev2 = revisions[0], revisions[1] else:
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Thu Mar 09 17:36:12 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Thu Mar 09 17:42:44 2017 +0100 @@ -1986,6 +1986,8 @@ rev1 = "" if rev2 == "WORKING": rev2 = "" + else: + return elif revisions: rev1, rev2 = revisions[0], revisions[1] else:
