Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py	Tue Mar 02 17:17:09 2021 +0100
@@ -861,7 +861,7 @@
         else:
             from .SvnCopyDialog import SvnCopyDialog
             dlg = SvnCopyDialog(name, None, True, force)
-            accepted = (dlg.exec() == QDialog.Accepted)
+            accepted = (dlg.exec() == QDialog.DialogCode.Accepted)
             if accepted:
                 target, force = dlg.getData()
             if not target:
@@ -982,7 +982,7 @@
         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)
@@ -1064,7 +1064,7 @@
                 self.tr("Do you really want to revert all changes to"
                         " these files or directories?"),
                 names)
-            yes = dlg.exec() == QDialog.Accepted
+            yes = dlg.exec() == QDialog.DialogCode.Accepted
         else:
             yes = E5MessageBox.yesNo(
                 None,
@@ -1105,7 +1105,7 @@
         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)
@@ -1172,7 +1172,7 @@
         from .SvnMergeDialog import SvnMergeDialog
         dlg = SvnMergeDialog(
             self.mergeList[0], self.mergeList[1], self.mergeList[2], force)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             urlrev1, urlrev2, target, force = dlg.getParameters()
         else:
             return
@@ -1498,7 +1498,7 @@
         """
         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)
             
@@ -1707,7 +1707,7 @@
         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()
             
             args = []
@@ -1761,7 +1761,7 @@
         """
         from .SvnPropSetDialog import SvnPropSetDialog
         dlg = SvnPropSetDialog()
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             propName, fileFlag, propValue = dlg.getData()
             if not propName:
                 E5MessageBox.critical(
@@ -1803,7 +1803,7 @@
             None,
             self.tr("Subversion Delete Property"),
             self.tr("Enter property name"),
-            QLineEdit.Normal)
+            QLineEdit.EchoMode.Normal)
         
         if not ok:
             return
@@ -1908,7 +1908,7 @@
                     return
         from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
         dlg = SvnRevisionSelectionDialog()
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             revisions = dlg.getRevisions()
             from .SvnDiffDialog import SvnDiffDialog
             self.diff = SvnDiffDialog(self)
@@ -1948,7 +1948,7 @@
         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()
             from .SvnDiffDialog import SvnDiffDialog
             self.diff = SvnDiffDialog(self)
@@ -2015,7 +2015,7 @@
         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 = ""
@@ -2147,7 +2147,7 @@
         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()
             args = []
             args.append('switch')
@@ -2178,7 +2178,7 @@
                 None,
                 self.tr("Repository Browser"),
                 self.tr("Enter the repository URL."),
-                QLineEdit.Normal)
+                QLineEdit.EchoMode.Normal)
             if not ok or not url:
                 return