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

-:27f636beebad
+:2c730d5fd177
 force = True
 accepted = True
 else:
 from .SvnCopyDialog import SvnCopyDialog
 dlg = SvnCopyDialog(name, None, True, "--force" in opts)
-accepted = (dlg.exec() == QDialog.Accepted)
+accepted = (dlg.exec() == QDialog.DialogCode.Accepted)
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
 else:
 url = self.svnNormalizeURL(reposURL)
 from .SvnTagDialog import SvnTagDialog
 dlg = SvnTagDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagOp = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 self.allTagsBranchesList.insert(0, tag)
 else:
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 " or directories?"),
 name)
-yes = dia.exec() == QDialog.Accepted
+yes = dia.exec() == QDialog.DialogCode.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 else:
 url = self.svnNormalizeURL(reposURL)
 from .SvnSwitchDialog import SvnSwitchDialog
 dlg = SvnSwitchDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagType = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 self.allTagsBranchesList.insert(0, tag)
 else:
 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:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 # remember URL or revision
 @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:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 command, wd = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 # This moves any previous occurrence of these arguments to the head
 # of the list.
 """
 from .SvnCopyDialog import SvnCopyDialog
 rx_prot = re.compile('(file:|svn:|svn+ssh:|http:|https:).+')
 dlg = SvnCopyDialog(name)
 res = False
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 target, force = dlg.getData()
 client = self.getClient()
 if bool(rx_prot.fullmatch(target)):
 target = self.__svnURL(target)
 @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:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 propName, propValue, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
 self.tr("Subversion Set Property"),
 @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:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 propName, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
-if dlg.exec() == QDialog.Accepted:
+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()
 dname = self.splitPath(names[0])[0]
 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog
 dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList,
 dname)
-if dlg.exec() == QDialog.Accepted:
+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()
 if isinstance(rev, int) or rev.isdecimal():
 rev = pysvn.Revision(
 pysvn.opt_revision_kind.number, int(rev))
 elif rev.startswith("{"):
 dateStr = rev[1:-1]
-secs = QDateTime.fromString(dateStr, Qt.ISODate).toTime_t()
+secs = QDateTime.fromString(
+dateStr, Qt.DateFormat.ISODate).toTime_t()
 rev = pysvn.Revision(pysvn.opt_revision_kind.date, secs)
 elif rev == "HEAD":
 rev = pysvn.Revision(pysvn.opt_revision_kind.head)
 elif rev == "COMMITTED":
 rev = pysvn.Revision(pysvn.opt_revision_kind.committed)
 raise ValueError("Wrong parameter type")
 if extended:
 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev1, rev2 = dlg.getRevisions()
 if rev1 == "WORKING":
 rev1 = ""
 if rev2 == "WORKING":
 rev2 = ""
 """
 comment, ok = QInputDialog.getText(
 None,
 self.tr("Subversion Lock"),
 self.tr("Enter lock comment"),
-QLineEdit.Normal)
+QLineEdit.EchoMode.Normal)
 if not ok:
 return
 if isinstance(name, list):
 @param projectPath path name of the project (string)
 """
 from .SvnRelocateDialog import SvnRelocateDialog
 currUrl = self.svnGetReposName(projectPath)
 dlg = SvnRelocateDialog(currUrl)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
 msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
 msg = "relocate {0} {1} {2}".format(currUrl, newUrl,
 if url is None:
 url, ok = QInputDialog.getText(
 None,
 self.tr("Repository Browser"),
 self.tr("Enter the repository URL."),
-QLineEdit.Normal)
+QLineEdit.EchoMode.Normal)
 if not ok or not url:
 return
 if self.repoBrowser is None:
 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py