eric: comparison Plugins/VcsPlugins/vcsPySvn/subversion.py

-:d4b5f3bd4720
+:975af671146d
 from VCS.VersionControl import VersionControl
 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
 class Subversion(VersionControl):
 @param noDialog flag indicating quiet operations
 """
 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()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 if target is None:
 return False
 force = True
 accepted = True
 else:
+from .SvnCopyDialog import SvnCopyDialog
 dlg = SvnCopyDialog(name, None, True, "--force" in opts)
 accepted = (dlg.exec_() == QDialog.Accepted)
 if accepted:
 target, force = dlg.getData()
 None,
 self.trUtf8("Subversion Log"),
 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()
 self.log.start(name, noEntries)
 return
 else:
 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()
 self.diff.start(name)
 Subversion repository.
 @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()
 self.status.start(name)
 if self.otherData["standardLayout"]:
 url = None
 else:
 url = self.svnNormalizeURL(reposURL)
+from .SvnTagDialog import SvnTagDialog
 dlg = SvnTagDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec_() == QDialog.Accepted:
 tag, tagOp = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 recurse = True
 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"
 " or directories?"),
 name)
 if self.otherData["standardLayout"]:
 url = None
 else:
 url = self.svnNormalizeURL(reposURL)
+from .SvnSwitchDialog import SvnSwitchDialog
 dlg = SvnSwitchDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec_() == QDialog.Accepted:
 tag, tagType = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 @param name file/directory name to be merged (string)
 """
 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:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 """
 Public method used to execute arbitrary subversion commands.
 @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()
 commandList = Utilities.parseOptionString(command)
 self.wdHistory.insert(0, wd)
 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:
 dia.exec_()
 @param project reference to the project object
 @param archive name of the project in the repository (string)
 @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):
 """
 Public method to get a dialog to enter repository info for getting a new project.
 @param parent parent widget (QWidget)
 """
+from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog
 return SvnNewProjectOptionsDialog(self, parent)
 def vcsRepositoryInfos(self, ppath):
 """
 Public method to retrieve information about the repository.
 @param name file/directory name to be copied (string)
 @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
 if dlg.exec_() == QDialog.Accepted:
 target, force = dlg.getData()
 Public method used to list the properties of a file/directory.
 @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()
 self.propList.start(name, recursive)
 Public method used to add a property to a file/directory.
 @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()
 if not propName:
 E5MessageBox.critical(self.__ui,
 Public method used to delete a property of a file/directory.
 @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()
 if not propName:
 @param path directory name of the project (string)
 @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()
 res = self.tagbranchList.start(path, tags)
 if res:
 """
 Public method to show the output of the svn blame command.
 @param name file name to show the blame for (string)
 """
+from .SvnBlameDialog import SvnBlameDialog
 self.blame = SvnBlameDialog(self)
 self.blame.show()
 QApplication.processEvents()
 self.blame.start(name)
 return
 else:
 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()
 self.diff.start(name, revisions)
 if nam == project.ppath and not project.saveAllScripts():
 return
 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()
 self.diff.start(name, urls=urls, summary=summary)
 Public method used to browse the log of a file/directory from the
 Subversion repository.
 @param path file/directory name to show the log of (string)
 """
+from .SvnLogBrowserDialog import SvnLogBrowserDialog
 self.logBrowser = SvnLogBrowserDialog(self)
 self.logBrowser.show()
 QApplication.processEvents()
 self.logBrowser.start(path)
 Public method to show repository information about a file or directory.
 @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_()
 def svnRelocate(self, projectPath):
 """
 Public method to relocate the working copy to a new repository URL.
 @param projectPath path name of the project (string)
 """
+from .SvnRelocateDialog import SvnRelocateDialog
 currUrl = self.svnGetReposName(projectPath)
 dlg = SvnRelocateDialog(currUrl)
 if dlg.exec_() == QDialog.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
 self.trUtf8("Enter the repository URL."),
 QLineEdit.Normal)
 if not ok or not url:
 return
+from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
 self.repoBrowser = SvnRepoBrowserDialog(self)
 self.repoBrowser.start(url)
 def svnRemoveFromChangelist(self, names):
 """
 """
 Public method used to inspect the change lists defined for the project.
 @param path directory name to show change lists for (string)
 """
+from .SvnChangeListsDialog import SvnChangeListsDialog
 self.changeLists = SvnChangeListsDialog(self)
 self.changeLists.show()
 QApplication.processEvents()
 self.changeLists.start(path)
 @param project reference to the project object
 @param isTranslationsBrowser flag indicating, the helper is requested for the
 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):
 """
 Public method to instanciate a helper object for the project.
 @param project reference to the project object
 @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)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py