eric: comparison eric6/Plugins/VcsPlugins/vcsMercurial/hg.py

-:e01ae92db699
+:31965986ecd1
 force = True
 accepted = True
 else:
 from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name, None, True)
-accepted = dlg.exec() == QDialog.Accepted
+accepted = dlg.exec() == QDialog.DialogCode.Accepted
 if accepted:
 target, force = dlg.getData()
 if accepted:
 args = self.initCommand("rename")
 @return flag indicating a performed tag action (boolean)
 """
 from .HgTagDialog import HgTagDialog
 dlg = HgTagDialog(self.hgGetTagsList(withType=True),
 revision, tagName)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, revision, tagOp, force = dlg.getParameters()
 else:
 return False
 args = self.initCommand("tag")
 self.tr("Revert changes"),
 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,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 if not rev:
 from .HgMergeDialog import HgMergeDialog
 dlg = HgMergeDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev, force = dlg.getParameters()
 else:
 return
 else:
 force = False
 self.tr("Re-Merge"),
 self.tr(
 "Do you really want to re-merge these files"
 " or directories?"),
 names)
-yes = dlg.exec() == QDialog.Accepted
+yes = dlg.exec() == QDialog.DialogCode.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Re-Merge"),
 self.tr("""Do you really want to re-merge the project?"""))
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),
 self.tr("Current branch tip"))
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev = dlg.getRevision()
 return self.vcsUpdate(name, revision=rev)
 return False
 @param name directory name of the working directory (string)
 """
 from .HgCommandDialog import HgCommandDialog
 dlg = HgCommandDialog(self.commandHistory, name)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 command = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 # This moves any previous occurrence of these arguments to the head
 # of the list.
 @return flag indicating successful operation (boolean)
 """
 from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name)
 res = False
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 target, force = dlg.getData()
 args = self.initCommand("copy")
 args.append("-v")
 args.append(name)
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
 from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 self.diff.show()
 if extended:
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev1, rev2 = dlg.getRevisions()
 else:
 return
 elif revisions:
 rev1, rev2 = revisions[0], revisions[1]
 """
 Public method used to create a branch in the Mercurial repository.
 """
 from .HgBranchInputDialog import HgBranchInputDialog
 dlg = HgBranchInputDialog(self.hgGetBranchesList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 name, commit = dlg.getData()
 name = name.strip().replace(" ", "_")
 args = self.initCommand("branch")
 args.append(name)
 withLargefiles = (self.isExtensionActive("largefiles") and
 withLargefiles)
 from .HgRepoConfigDataDialog import HgRepoConfigDataDialog
 dlg = HgRepoConfigDataDialog(withLargefiles=withLargefiles,
 largefilesData=largefilesData)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 createContents = True
 defaultUrl, defaultPushUrl = dlg.getData()
 if withLargefiles:
 lfMinSize, lfPattern = dlg.getLargefilesData()
 else:
 from .HgBundleDialog import HgBundleDialog
 dlg = HgBundleDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),
 version=self.version)
-if dlg.exec() != QDialog.Accepted:
+if dlg.exec() != QDialog.DialogCode.Accepted:
 return
 revs, baseRevs, compression, bundleAll = dlg.getParameters()
 else:
 revs = bundleData["revs"]
 if subcommand in ("good", "bad", "skip"):
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev = dlg.getRevision()
 else:
 return
 args = self.initCommand("bisect")
 """
 from .HgBackoutDialog import HgBackoutDialog
 dlg = HgBackoutDialog(self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 if not rev:
 E5MessageBox.warning(
 self.__ui,
 self.tr("Backing out changeset"),
 @return flag indicating, that the import contained an add, a delete
 or a change to the project file (boolean)
 """
 from .HgImportDialog import HgImportDialog
 dlg = HgImportDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (patchFile, noCommit, message, date, user, withSecret, stripCount,
 force) = dlg.getParameters()
 args = self.initCommand("import")
 args.append("--verbose")
 Public method to export patches to files.
 """
 from .HgExportDialog import HgExportDialog
 dlg = HgExportDialog(self.hgGetBookmarksList(),
 self.version >= (4, 7, 0))
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (filePattern, revisions, bookmark, switchParent, allText,
 noDates, git) = dlg.getParameters()
 args = self.initCommand("export")
 args.append("--output")
 @exception ValueError raised to indicate an invalid phase
 """
 if data is None:
 from .HgPhaseDialog import HgPhaseDialog
 dlg = HgPhaseDialog()
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 data = dlg.getData()
 if data:
 revs, phase, force = data
 @return flag indicating that the project should be reread (boolean)
 """
 from .HgGraftDialog import HgGraftDialog
 res = False
 dlg = HgGraftDialog(self, revs)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (revs,
 (userData, currentUser, userName),
 (dateData, currentDate, dateStr),
 log, dryrun, noCommit) = dlg.getData()
 """
 Public method to create an unversioned archive from the repository.
 """
 from .HgArchiveDialog import HgArchiveDialog
 dlg = HgArchiveDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 archive, type_, prefix, subrepos = dlg.getData()
 args = self.initCommand("archive")
 if type_:
 args.append("--type")
 """
 from .HgAddSubrepositoryDialog import HgAddSubrepositoryDialog
 ppath = self.__projectHelper.getProject().getProjectPath()
 hgsub = self.getHgSubPath()
 dlg = HgAddSubrepositoryDialog(ppath)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 relPath, subrepoType, subrepoUrl = dlg.getData()
 if subrepoType == "hg":
 url = subrepoUrl
 else:
 url = "[{0}]{1}".format(subrepoType, subrepoUrl)
 from .HgRemoveSubrepositoriesDialog import (
 HgRemoveSubrepositoriesDialog
 )
 dlg = HgRemoveSubrepositoriesDialog(subrepositories)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 try:
 with open(hgsub, "w") as f:
 f.write(contents)
 from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE,
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 revision, bookmark = dlg.getData()
 ok = True
 else:
 ok = False
 @type tuple of str and str
 """
 if not renameInfo:
 from .HgBookmarkRenameDialog import HgBookmarkRenameDialog
 dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 renameInfo = dlg.getData()
 if renameInfo:
 args = self.initCommand("bookmarks")
 args.append("--rename")
 from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE,
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 revision, bookmark = dlg.getData()
 ok = True
 else:
 ok = False

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsMercurial/hg.py

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py