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

-:0b936ff1bbb9
+:a2bc06a54d9d
 from eric7 import Preferences, Utilities
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 from eric7.VCS.VersionControl import VersionControl
 from .SvnDialog import SvnDialog
 from .SvnUtilities import amendConfig, createDefaultConfig, getConfigPath
 @param name file/directory name to be committed (string or
 list of strings)
 @param message message for this operation (string)
 @param noDialog flag indicating quiet operations
 """
+from .SvnCommitDialog import SvnCommitDialog
 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, self.__ui)
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 @param project reference to the project object
 @param target new name of the file/directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
+from .SvnCopyDialog import SvnCopyDialog
 rx_prot = re.compile("(file:|svn:|svn+ssh:|http:|https:).+")
 opts = self.options["global"]
 res = False
 if noDialog:
 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.DialogCode.Accepted
 if accepted:
 target, force = dlg.getData()
 if not target:
 being edited and has unsaved modification, they can be saved or the
 operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
+from .SvnDiffDialog import SvnDiffDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 else:
 project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 if self.diff is None:
-from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 QApplication.processEvents()
 self.diff.start(name, refreshable=True)
 Subversion repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
+from .SvnStatusDialog import SvnStatusDialog
 if self.status is None:
-from .SvnStatusDialog import SvnStatusDialog
 self.status = SvnStatusDialog(self)
 self.status.show()
 self.status.raise_()
 QApplication.processEvents()
 self.status.start(name)
 Public method used to set the tag of a file/directory in the
 Subversion repository.
 @param name file/directory name to be tagged (string)
 """
+from .SvnTagDialog import SvnTagDialog
 dname, fname = self.splitPath(name)
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 EricMessageBox.critical(
 return
 url = (
 None if self.otherData["standardLayout"] else self.svnNormalizeURL(reposURL)
 )
-from .SvnTagDialog import SvnTagDialog
 dlg = SvnTagDialog(
 self.allTagsBranchesList, url, self.otherData["standardLayout"]
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagOp = dlg.getParameters()
 recurse = True
 project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in name]
 if names[0]:
-from eric7.UI.DeleteFilesConfirmationDialog import (
-DeleteFilesConfirmationDialog,
-)
 dia = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 @param name directory name to be switched (string)
 @return flag indicating, that the switch contained an add
 or delete (boolean)
 """
+from .SvnSwitchDialog import SvnSwitchDialog
 dname, fname = self.splitPath(name)
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 EricMessageBox.critical(
 return False
 url = (
 None if self.otherData["standardLayout"] else self.svnNormalizeURL(reposURL)
 )
-from .SvnSwitchDialog import SvnSwitchDialog
 dlg = SvnSwitchDialog(
 self.allTagsBranchesList, url, self.otherData["standardLayout"]
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagType = dlg.getParameters()
 """
 Public method used to merge a URL/revision into the local project.
 @param name file/directory name to be merged (string)
 """
+from .SvnMergeDialog import SvnMergeDialog
 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.DialogCode.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 @param dname directory to check in (string)
 @param shortcut flag indicating a shortcut should be taken (boolean)
 @return the received dictionary completed with a combination of
 canBeCommited and canBeAdded or None in order to signal an error
 """
+from .SvnDialogMixin import SvnDialogMixin
 if dname.endswith(os.sep):
 dname = dname[:-1]
 dname = os.path.normcase(dname)
 found = False
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return names
-from .SvnDialogMixin import SvnDialogMixin
 mixin = SvnDialogMixin()
 client = self.getClient()
 client.callback_get_login = mixin._clientLoginCallback
 client.callback_ssl_server_trust_prompt = (
 @param dname directory to check in (string)
 @param shortcut flag indicating a shortcut should be taken (boolean)
 @return the received dictionary completed with a combination of
 canBeCommited and canBeAdded or None in order to signal an error
 """
+from .SvnDialogMixin import SvnDialogMixin
 if not os.path.isdir(os.path.join(dname, self.adminDir)):
 # not under version control -> do nothing
 return names
 found = False
 if name in names:
 found = True
 names[name] = self.statusCache[name]
 if not found:
-from .SvnDialogMixin import SvnDialogMixin
 mixin = SvnDialogMixin()
 client = self.getClient()
 client.callback_get_login = mixin._clientLoginCallback
 client.callback_ssl_server_trust_prompt = (
 mixin._clientSslServerTrustPromptCallback
 """
 Public method used to execute arbitrary subversion commands.
 @param name directory name of the working directory (string)
 """
+from eric7.Plugins.VcsPlugins.vcsSubversion.SvnDialog import (
+SvnDialog as SvnProcessDialog,
+)
 from .SvnCommandDialog import SvnCommandDialog
 dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 command, wd = dlg.getData()
 self.wdHistory.remove(wd)
 self.wdHistory.insert(0, wd)
 args = []
 self.addArguments(args, commandList)
-from eric7.Plugins.VcsPlugins.vcsSubversion.SvnDialog import (
-SvnDialog as SvnProcessDialog,
-)
 dia = SvnProcessDialog(self.tr("Subversion command"))
 res = dia.startProcess(args, wd)
 if res:
 dia.exec()
 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
 if self.propList is None:
-from .SvnPropListDialog import SvnPropListDialog
 self.propList = SvnPropListDialog(self)
 self.propList.show()
 self.propList.raise_()
 QApplication.processEvents()
 self.propList.start(name, recursive)
 @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
 if self.tagbranchList is None:
-from .SvnTagBranchListDialog import SvnTagBranchListDialog
 self.tagbranchList = SvnTagBranchListDialog(self)
 self.tagbranchList.show()
 self.tagbranchList.raise_()
 QApplication.processEvents()
 res = self.tagbranchList.start(path, tags)
 """
 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
 if self.blame is None:
-from .SvnBlameDialog import SvnBlameDialog
 self.blame = SvnBlameDialog(self)
 self.blame.show()
 self.blame.raise_()
 QApplication.processEvents()
 self.blame.start(name)
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
+from .SvnDiffDialog import SvnDiffDialog
+from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 else:
 project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
-from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
-from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 QApplication.processEvents()
 self.diff.start(name, revisions)
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
+from .SvnDiffDialog import SvnDiffDialog
+from .SvnUrlSelectionDialog import SvnUrlSelectionDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 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.DialogCode.Accepted:
 urls, summary = dlg.getURLs()
 if self.diff is None:
-from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 QApplication.processEvents()
 self.diff.start(name, urls=urls, summary=summary)
 @param name file name to be diffed (string)
 @param extended flag indicating the extended variant (boolean)
 @param revisions tuple of two revisions (tuple of strings)
 @exception ValueError raised to indicate an invalid name parameter type
 """
+from eric7.UI.CompareDialog import CompareDialog
+from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
-from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 rev1, rev2 = dlg.getRevisions()
 if rev1 == "WORKING":
 rev1 = ""
 ),
 )
 return
 if self.sbsDiff is None:
-from eric7.UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 self.sbsDiff.show()
 self.sbsDiff.raise_()
 self.sbsDiff.compare(output1, output2, name1, name2)
 Subversion repository.
 @param name file/directory name to show the log of (string)
 @param isFile flag indicating log for a file is to be shown (boolean)
 """
+from .SvnLogBrowserDialog import SvnLogBrowserDialog
 if self.logBrowser is None:
-from .SvnLogBrowserDialog import SvnLogBrowserDialog
 self.logBrowser = SvnLogBrowserDialog(self)
 self.logBrowser.show()
 self.logBrowser.raise_()
 QApplication.processEvents()
 self.logBrowser.start(name, isFile=isFile)
 """
 Public method to open the repository browser.
 @param projectPath path name of the project (string)
 """
+from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
 url = self.svnGetReposName(projectPath) if projectPath else None
 if url is None:
 url, ok = QInputDialog.getText(
 None,
 self.tr("Repository Browser"),
 )
 if not ok or not url:
 return
 if self.repoBrowser is None:
-from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
 self.repoBrowser = SvnRepoBrowserDialog(self)
 self.repoBrowser.start(url)
 self.repoBrowser.show()
 self.repoBrowser.raise_()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py

src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py