Mercurial Repositories > eric / changeset
changeset
Continued implementing the delayed import.
Sun, 10 Feb 2013 19:36:30 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 10 Feb 2013 19:36:30 +0100
- changeset 2406
- 975af671146d
- parent 2405
- d4b5f3bd4720
- child 2407
- b98cc8ee1142
Continued implementing the delayed import.
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Feb 10 19:36:30 2013 +0100 @@ -9,8 +9,6 @@ from PyQt4.QtCore import pyqtSlot -from QScintilla.MiniEditor import MiniEditor - from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_SubversionPage import Ui_SubversionPage @@ -47,6 +45,7 @@ """ Private slot to edit the Subversion config file. """ + from QScintilla.MiniEditor import MiniEditor cfgFile = self.__plugin.getConfigPath() editor = MiniEditor(cfgFile, "Properties", self) editor.show() @@ -56,6 +55,7 @@ """ Private slot to edit the Subversion servers file. """ + from QScintilla.MiniEditor import MiniEditor serversFile = self.__plugin.getServersPath() editor = MiniEditor(serversFile, "Properties", self) editor.show()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -19,7 +19,6 @@ from .SvnUtilities import formatTime, dateFromTime_t from .SvnDialogMixin import SvnDialogMixin -from .SvnDiffDialog import SvnDiffDialog from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog @@ -318,6 +317,7 @@ @param peg_rev revision number to use as a reference (integer) """ if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() QApplication.processEvents()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -18,7 +18,6 @@ from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnLogDialog import Ui_SvnLogDialog -from .SvnDiffDialog import SvnDiffDialog import Utilities @@ -228,6 +227,7 @@ self.contents.scrollToAnchor(ver) if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() self.diff.start(filename, [v1, v2], pegRev=self.__pegRev)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,7 +15,6 @@ from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .Ui_SvnNewProjectOptionsDialog import Ui_SvnNewProjectOptionsDialog from .Config import ConfigSvnProtocols @@ -70,6 +69,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,7 +15,6 @@ from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .Ui_SvnOptionsDialog import Ui_SvnOptionsDialog from .Config import ConfigSvnProtocols @@ -69,6 +68,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -21,7 +21,6 @@ from .SvnConst import svnStatusMap from .SvnDialogMixin import SvnDialogMixin -from .SvnDiffDialog import SvnDiffDialog from .Ui_SvnStatusDialog import Ui_SvnStatusDialog @@ -688,6 +687,7 @@ return if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() QApplication.processEvents()
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Feb 10 19:36:30 2013 +0100 @@ -25,38 +25,8 @@ import pysvn from .SvnDialog import SvnDialog -from .SvnCommitDialog import SvnCommitDialog -from .SvnLogDialog import SvnLogDialog -from .SvnLogBrowserDialog import SvnLogBrowserDialog -from .SvnDiffDialog import SvnDiffDialog -from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog -from .SvnStatusDialog import SvnStatusDialog -from .SvnTagDialog import SvnTagDialog -from .SvnTagBranchListDialog import SvnTagBranchListDialog -from .SvnCopyDialog import SvnCopyDialog -from .SvnCommandDialog import SvnCommandDialog -from .SvnSwitchDialog import SvnSwitchDialog -from .SvnMergeDialog import SvnMergeDialog -from .SvnPropListDialog import SvnPropListDialog -from .SvnPropSetDialog import SvnPropSetDialog -from .SvnPropDelDialog import SvnPropDelDialog -from .SvnOptionsDialog import SvnOptionsDialog -from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog -from .SvnBlameDialog import SvnBlameDialog -from .SvnInfoDialog import SvnInfoDialog -from .SvnRelocateDialog import SvnRelocateDialog -from .SvnUrlSelectionDialog import SvnUrlSelectionDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog -from .SvnChangeListsDialog import SvnChangeListsDialog -from .SvnStatusMonitorThread import SvnStatusMonitorThread from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig -from .ProjectBrowserHelper import SvnProjectBrowserHelper - -from Plugins.VcsPlugins.vcsSubversion.SvnDialog import SvnDialog as SvnProcessDialog - -from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog - import Utilities @@ -476,6 +446,7 @@ if not noDialog and not message: # call CommitDialog and get message from there if self.__commitDialog is None: + from .SvnCommitDialog import SvnCommitDialog self.__commitDialog = SvnCommitDialog(self.svnGetChangelists(), self.__ui) self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) self.__commitDialog.show() @@ -895,6 +866,7 @@ force = True accepted = True else: + from .SvnCopyDialog import SvnCopyDialog dlg = SvnCopyDialog(name, None, True, "--force" in opts) accepted = (dlg.exec_() == QDialog.Accepted) if accepted: @@ -961,6 +933,7 @@ self.trUtf8("Select number of entries to show."), self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) if ok: + from .SvnLogDialog import SvnLogDialog self.log = SvnLogDialog(self) self.log.show() QApplication.processEvents() @@ -990,6 +963,7 @@ project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() @@ -1003,6 +977,7 @@ @param name file/directory name(s) to show the status of (string or list of strings) """ + from .SvnStatusDialog import SvnStatusDialog self.status = SvnStatusDialog(self) self.status.show() QApplication.processEvents() @@ -1030,6 +1005,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) + from .SvnTagDialog import SvnTagDialog dlg = SvnTagDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: @@ -1109,6 +1085,7 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in name] if names[0]: + from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog dia = DeleteFilesConfirmationDialog(self.parent(), self.trUtf8("Revert changes"), self.trUtf8("Do you really want to revert all changes to these files" @@ -1161,6 +1138,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) + from .SvnSwitchDialog import SvnSwitchDialog dlg = SvnSwitchDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: @@ -1222,6 +1200,7 @@ dname, fname = self.splitPath(name) opts = self.options['global'] + from .SvnMergeDialog import SvnMergeDialog dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], "--force" in opts) if dlg.exec_() == QDialog.Accepted: @@ -1594,6 +1573,7 @@ @param name directory name of the working directory (string) """ + from .SvnCommandDialog import SvnCommandDialog dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name) if dlg.exec_() == QDialog.Accepted: command, wd = dlg.getData() @@ -1611,6 +1591,8 @@ args = [] self.addArguments(args, commandList) + from Plugins.VcsPlugins.vcsSubversion.SvnDialog import \ + SvnDialog as SvnProcessDialog dia = SvnProcessDialog(self.trUtf8('Subversion command')) res = dia.startProcess(args, wd) if res: @@ -1625,6 +1607,7 @@ @param editable flag indicating that the project name is editable (boolean) @param parent parent widget (QWidget) """ + from .SvnOptionsDialog import SvnOptionsDialog return SvnOptionsDialog(self, project, parent) def vcsNewProjectOptionsDialog(self, parent=None): @@ -1633,6 +1616,7 @@ @param parent parent widget (QWidget) """ + from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog return SvnNewProjectOptionsDialog(self, parent) def vcsRepositoryInfos(self, ppath): @@ -1743,6 +1727,7 @@ @param project reference to the project object @return flag indicating successfull operation (boolean) """ + from .SvnCopyDialog import SvnCopyDialog rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+') dlg = SvnCopyDialog(name) res = False @@ -1790,6 +1775,7 @@ @param name file/directory name (string or list of strings) @param recursive flag indicating a recursive list is requested """ + from .SvnPropListDialog import SvnPropListDialog self.propList = SvnPropListDialog(self) self.propList.show() QApplication.processEvents() @@ -1802,6 +1788,7 @@ @param name file/directory name (string or list of strings) @param recursive flag indicating a recursive set is requested """ + from .SvnPropSetDialog import SvnPropSetDialog dlg = SvnPropSetDialog(recursive) if dlg.exec_() == QDialog.Accepted: propName, propValue, recurse = dlg.getData() @@ -1852,6 +1839,7 @@ @param name file/directory name (string or list of strings) @param recursive flag indicating a recursive list is requested """ + from .SvnPropDelDialog import SvnPropDelDialog dlg = SvnPropDelDialog(recursive) if dlg.exec_() == QDialog.Accepted: propName, recurse = dlg.getData() @@ -1903,6 +1891,7 @@ @param tags flag indicating listing of branches or tags (False = branches, True = tags) """ + from .SvnTagBranchListDialog import SvnTagBranchListDialog self.tagbranchList = SvnTagBranchListDialog(self) self.tagbranchList.show() QApplication.processEvents() @@ -1925,6 +1914,7 @@ @param name file name to show the blame for (string) """ + from .SvnBlameDialog import SvnBlameDialog self.blame = SvnBlameDialog(self) self.blame.show() QApplication.processEvents() @@ -1956,9 +1946,11 @@ project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return + from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() if dlg.exec_() == QDialog.Accepted: revisions = dlg.getRevisions() + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() @@ -1993,9 +1985,11 @@ dname = self.splitPath(names[0])[0] + from .SvnUrlSelectionDialog import SvnUrlSelectionDialog dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname) if dlg.exec_() == QDialog.Accepted: urls, summary = dlg.getURLs() + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() @@ -2008,6 +2002,7 @@ @param path file/directory name to show the log of (string) """ + from .SvnLogBrowserDialog import SvnLogBrowserDialog self.logBrowser = SvnLogBrowserDialog(self) self.logBrowser.show() QApplication.processEvents() @@ -2104,6 +2099,7 @@ @param projectPath path name of the project (string) @param name file/directory name relative to the project (string) """ + from .SvnInfoDialog import SvnInfoDialog dlg = SvnInfoDialog(self) dlg.start(projectPath, name) dlg.exec_() @@ -2114,6 +2110,7 @@ @param projectPath path name of the project (string) """ + from .SvnRelocateDialog import SvnRelocateDialog currUrl = self.svnGetReposName(projectPath) dlg = SvnRelocateDialog(currUrl) if dlg.exec_() == QDialog.Accepted: @@ -2158,6 +2155,7 @@ if not ok or not url: return + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog self.repoBrowser = SvnRepoBrowserDialog(self) self.repoBrowser.start(url) @@ -2231,6 +2229,7 @@ @param path directory name to show change lists for (string) """ + from .SvnChangeListsDialog import SvnChangeListsDialog self.changeLists = SvnChangeListsDialog(self) self.changeLists.show() QApplication.processEvents() @@ -2324,6 +2323,7 @@ translations browser (this needs some special treatment) @return the project browser helper object """ + from .ProjectBrowserHelper import SvnProjectBrowserHelper return SvnProjectBrowserHelper(self, browser, project, isTranslationsBrowser) def vcsGetProjectHelper(self, project): @@ -2352,4 +2352,5 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ + from .SvnStatusMonitorThread import SvnStatusMonitorThread return SvnStatusMonitorThread(interval, project, self)
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Feb 10 19:36:30 2013 +0100 @@ -9,8 +9,6 @@ from PyQt4.QtCore import pyqtSlot -from QScintilla.MiniEditor import MiniEditor - from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_SubversionPage import Ui_SubversionPage @@ -47,6 +45,7 @@ """ Private slot to edit the Subversion config file. """ + from QScintilla.MiniEditor import MiniEditor cfgFile = self.__plugin.getConfigPath() editor = MiniEditor(cfgFile, "Properties", self) editor.show() @@ -56,6 +55,7 @@ """ Private slot to edit the Subversion servers file. """ + from QScintilla.MiniEditor import MiniEditor serversFile = self.__plugin.getServersPath() editor = MiniEditor(serversFile, "Properties", self) editor.show()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,8 +15,6 @@ from E5Gui import E5MessageBox -from .SvnDiffDialog import SvnDiffDialog - from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog import Preferences @@ -414,6 +412,7 @@ @param rev2 second revision number (integer) """ if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() self.diff.start(self.filename, [rev1, rev2])
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,7 +15,6 @@ from E5Gui import E5MessageBox from .Ui_SvnLogDialog import Ui_SvnLogDialog -from .SvnDiffDialog import SvnDiffDialog import Utilities import Preferences @@ -268,6 +267,7 @@ self.contents.scrollToAnchor(ver) if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() self.diff.start(filename, [v1, v2])
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,7 +15,6 @@ from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .Ui_SvnNewProjectOptionsDialog import Ui_SvnNewProjectOptionsDialog from .Config import ConfigSvnProtocols @@ -70,6 +69,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -15,7 +15,6 @@ from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .Ui_SvnOptionsDialog import Ui_SvnOptionsDialog from .Config import ConfigSvnProtocols @@ -69,6 +68,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Feb 10 19:36:30 2013 +0100 @@ -17,8 +17,6 @@ from E5Gui.E5Application import e5App from E5Gui import E5MessageBox -from .SvnDiffDialog import SvnDiffDialog - from .Ui_SvnStatusDialog import Ui_SvnStatusDialog import Preferences @@ -800,6 +798,7 @@ return if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self.vcs) self.diff.show() QApplication.processEvents()
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Feb 10 19:17:45 2013 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Feb 10 19:36:30 2013 +0100 @@ -23,34 +23,8 @@ from VCS.VersionControl import VersionControl from .SvnDialog import SvnDialog -from .SvnCommitDialog import SvnCommitDialog -from .SvnLogDialog import SvnLogDialog -from .SvnLogBrowserDialog import SvnLogBrowserDialog -from .SvnDiffDialog import SvnDiffDialog -from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog -from .SvnStatusDialog import SvnStatusDialog -from .SvnTagDialog import SvnTagDialog -from .SvnTagBranchListDialog import SvnTagBranchListDialog -from .SvnCopyDialog import SvnCopyDialog -from .SvnCommandDialog import SvnCommandDialog -from .SvnSwitchDialog import SvnSwitchDialog -from .SvnMergeDialog import SvnMergeDialog -from .SvnPropListDialog import SvnPropListDialog -from .SvnPropSetDialog import SvnPropSetDialog -from .SvnOptionsDialog import SvnOptionsDialog -from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog -from .SvnBlameDialog import SvnBlameDialog -from .SvnRelocateDialog import SvnRelocateDialog -from .SvnUrlSelectionDialog import SvnUrlSelectionDialog -from .SvnRepoBrowserDialog import SvnRepoBrowserDialog -from .SvnChangeListsDialog import SvnChangeListsDialog -from .SvnStatusMonitorThread import SvnStatusMonitorThread from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig -from .ProjectBrowserHelper import SvnProjectBrowserHelper - -from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog - import Preferences import Utilities @@ -446,6 +420,7 @@ if not noDialog and not msg: # call CommitDialog and get message from there if self.__commitDialog is None: + from .SvnCommitDialog import SvnCommitDialog self.__commitDialog = SvnCommitDialog(self, self.__ui) self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) self.__commitDialog.show() @@ -805,6 +780,7 @@ force = True accepted = True else: + from .SvnCopyDialog import SvnCopyDialog dlg = SvnCopyDialog(name, None, True, force) accepted = (dlg.exec_() == QDialog.Accepted) if accepted: @@ -863,6 +839,7 @@ self.trUtf8("Select number of entries to show."), self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) if ok: + from .SvnLogDialog import SvnLogDialog self.log = SvnLogDialog(self) self.log.show() self.log.start(name, noEntries) @@ -891,6 +868,7 @@ project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() @@ -904,6 +882,7 @@ @param name file/directory name(s) to show the status of (string or list of strings) """ + from .SvnStatusDialog import SvnStatusDialog self.status = SvnStatusDialog(self) self.status.show() self.status.start(name) @@ -930,6 +909,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) + from .SvnTagDialog import SvnTagDialog dlg = SvnTagDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: @@ -1002,6 +982,7 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: + from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog dlg = DeleteFilesConfirmationDialog(self.parent(), self.trUtf8("Revert changes"), self.trUtf8("Do you really want to revert all changes to these files" @@ -1041,6 +1022,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) + from .SvnSwitchDialog import SvnSwitchDialog dlg = SvnSwitchDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: @@ -1104,6 +1086,7 @@ if force: del opts[opts.index('--force')] + from .SvnMergeDialog import SvnMergeDialog dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], force) if dlg.exec_() == QDialog.Accepted: @@ -1421,6 +1404,7 @@ @param name directory name of the working directory (string) """ + from .SvnCommandDialog import SvnCommandDialog dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name) if dlg.exec_() == QDialog.Accepted: command, wd = dlg.getData() @@ -1452,6 +1436,7 @@ @param editable flag indicating that the project name is editable (boolean) @param parent parent widget (QWidget) """ + from .SvnOptionsDialog import SvnOptionsDialog return SvnOptionsDialog(self, project, parent) def vcsNewProjectOptionsDialog(self, parent=None): @@ -1460,6 +1445,7 @@ @param parent parent widget (QWidget) """ + from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog return SvnNewProjectOptionsDialog(self, parent) def vcsRepositoryInfos(self, ppath): @@ -1610,6 +1596,7 @@ @param project reference to the project object @return flag indicating successfull operation (boolean) """ + from .SvnCopyDialog import SvnCopyDialog rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+') dlg = SvnCopyDialog(name) res = False @@ -1648,6 +1635,7 @@ @param name file/directory name (string or list of strings) @param recursive flag indicating a recursive list is requested """ + from .SvnPropListDialog import SvnPropListDialog self.propList = SvnPropListDialog(self) self.propList.show() self.propList.start(name, recursive) @@ -1659,6 +1647,7 @@ @param name file/directory name (string or list of strings) @param recursive flag indicating a recursive list is requested """ + from .SvnPropSetDialog import SvnPropSetDialog dlg = SvnPropSetDialog() if dlg.exec_() == QDialog.Accepted: propName, fileFlag, propValue = dlg.getData() @@ -1737,6 +1726,7 @@ @param tags flag indicating listing of branches or tags (False = branches, True = tags) """ + from .SvnTagBranchListDialog import SvnTagBranchListDialog self.tagbranchList = SvnTagBranchListDialog(self) self.tagbranchList.show() if tags: @@ -1764,6 +1754,7 @@ @param name file name to show the blame for (string) """ + from .SvnBlameDialog import SvnBlameDialog self.blame = SvnBlameDialog(self) self.blame.show() self.blame.start(name) @@ -1794,9 +1785,11 @@ project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return + from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() if dlg.exec_() == QDialog.Accepted: revisions = dlg.getRevisions() + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() self.diff.start(name, revisions) @@ -1830,9 +1823,11 @@ dname = self.splitPath(names[0])[0] + from .SvnUrlSelectionDialog import SvnUrlSelectionDialog dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname) if dlg.exec_() == QDialog.Accepted: urls, summary = dlg.getURLs() + from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() @@ -1845,6 +1840,7 @@ @param path file/directory name to show the log of (string) """ + from .SvnLogBrowserDialog import SvnLogBrowserDialog self.logBrowser = SvnLogBrowserDialog(self) self.logBrowser.show() self.logBrowser.start(path) @@ -1905,6 +1901,7 @@ @param projectPath path name of the project (string) """ + from .SvnRelocateDialog import SvnRelocateDialog currUrl = self.svnGetReposName(projectPath) dlg = SvnRelocateDialog(currUrl) if dlg.exec_() == QDialog.Accepted: @@ -1942,6 +1939,7 @@ if not ok or not url: return + from .SvnRepoBrowserDialog import SvnRepoBrowserDialog self.repoBrowser = SvnRepoBrowserDialog(self) self.repoBrowser.show() self.repoBrowser.start(url) @@ -2013,6 +2011,7 @@ @param path directory name to show change lists for (string) """ + from .SvnChangeListsDialog import SvnChangeListsDialog self.changeLists = SvnChangeListsDialog(self) self.changeLists.show() QApplication.processEvents() @@ -2119,6 +2118,7 @@ translations browser (this needs some special treatment) @return the project browser helper object """ + from .ProjectBrowserHelper import SvnProjectBrowserHelper return SvnProjectBrowserHelper(self, browser, project, isTranslationsBrowser) def vcsGetProjectHelper(self, project): @@ -2147,4 +2147,5 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ + from .SvnStatusMonitorThread import SvnStatusMonitorThread return SvnStatusMonitorThread(interval, project, self)
