Mercurial Repositories > eric / changeset
changeset
Avoid exception on aborting the extended side by side diff.
Wed, 08 Mar 2017 21:52:37 +0100
- author
- T.Rzepka <Tobias.Rzepka@gmail.com>
- date
- Wed, 08 Mar 2017 21:52:37 +0100
- changeset 5593
- 0f61eae74237
- parent 5589
- ad8f37c6a306
- child 5594
- 6e477a8e990c
Avoid exception on aborting the extended side by side diff.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 08 10:49:20 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 08 21:52:37 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 Wed Mar 08 10:49:20 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Wed Mar 08 21:52:37 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 Wed Mar 08 10:49:20 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Wed Mar 08 21:52:37 2017 +0100 @@ -1986,6 +1986,8 @@ rev1 = "" if rev2 == "WORKING": rev2 = "" + else: + return elif revisions: rev1, rev2 = revisions[0], revisions[1] else:
