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

-:dd54d33d21d2
+:51aa6c6b66f7
 args.append(projectDir)
 # init is not possible with the command server
 dia = HgDialog(self.tr('Creating Mercurial repository'), self)
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 status = dia.normalExit()
 if status:
 ignoreName = os.path.join(projectDir, Hg.IgnoreFileName)
 if not os.path.exists(ignoreName):
 dia = HgDialog(
 self.tr('Initial commit to Mercurial repository'),
 self)
 res = dia.startProcess(args, projectDir)
 if res:
-dia.exec_()
+dia.exec()
 status = dia.normalExit()
 return status, False
 def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False):
 dia = HgDialog(
 self.tr('Cloning project from a Mercurial repository'),
 self)
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 return dia.normalExit()
 def vcsExport(self, vcsDataDict, projectDir):
 """
 Public method used to export a directory from the Mercurial repository.
 dia = HgDialog(
 self.tr('Committing changes to Mercurial repository'),
 self)
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 self.committed.emit()
 if self.__forgotNames:
 model = e5App().getObject("Project").getModel()
 for name in self.__forgotNames:
 model.updateVCSStatus(name)
 dia = HgDialog(self.tr(
 'Synchronizing with the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def vcsAdd(self, name, isDir=False, noDialog=False):
 self.tr(
 'Adding files/directories to the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def vcsAddBinary(self, name, isDir=False):
 """
 Public method used to add a file/directory in binary mode to the
 Mercurial repository.
 'Removing files/directories from the Mercurial'
 ' repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExitWithoutErrors()
 return res
 def vcsMove(self, name, project, target=None, noDialog=False):
 force = True
 accepted = True
 else:
 from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name, None, True)
-accepted = dlg.exec_() == QDialog.Accepted
+accepted = dlg.exec() == QDialog.Accepted
 if accepted:
 target, force = dlg.getData()
 if accepted:
 args = self.initCommand("rename")
 res = err == ""
 else:
 dia = HgDialog(self.tr('Renaming {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExit()
 if res:
 if target.startswith(project.getProjectPath()):
 if isDir:
 project.moveDirectory(name, target)
 return False
 from .HgTagDialog import HgTagDialog
 dlg = HgTagDialog(self.hgGetTagsList(repodir, withType=True),
 revision, tagName)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 tag, revision, tagOp, force = dlg.getParameters()
 else:
 return False
 args = self.initCommand("tag")
 dia = HgDialog(self.tr('Tagging in the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 return True
 def hgRevert(self, name):
 """
 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.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
 dia = HgDialog(self.tr('Reverting changes'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 else:
 res = False
 if not rev:
 from .HgMergeDialog import HgMergeDialog
 dlg = HgMergeDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev, force = dlg.getParameters()
 else:
 return
 else:
 force = False
 args.append(rev)
 dia = HgDialog(self.tr('Merging').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def hgReMerge(self, name):
 """
 Public method used to merge a URL/revision into the local project.
 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.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Re-Merge"),
 self.tr("""Do you really want to re-merge the project?"""))
 if yes:
 dia = HgDialog(self.tr('Re-Merging').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def vcsSwitch(self, name):
 """
 Public method used to switch a working directory to a different
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir),
 self.tr("Current branch tip"))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.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.Accepted:
 command = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 # This moves any previous occurrence of these arguments to the head
 # of the list.
 return
 dia = HgDialog(self.tr('Mercurial command'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 """
 Public method to get a dialog to enter repository info.
 @return flag indicating successful operation (boolean)
 """
 from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name)
 res = False
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 target, force = dlg.getData()
 args = self.initCommand("copy")
 args.append("-v")
 args.append(name)
 dia = HgDialog(
 self.tr('Copying {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExit()
 if (
 res and
 target.startswith(project.getProjectPath())
 ):
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
 from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 self.diff.show()
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev1, rev2 = dlg.getRevisions()
 else:
 return
 elif revisions:
 rev1, rev2 = revisions[0], revisions[1]
 return False
 dia = HgDialog(title, self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 if (
 self.bundleFile and
 os.path.exists(self.bundleFile)
 ):
 dia = HgDialog(
 self.tr('Pushing to a remote Mercurial repository'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def hgInfo(self, ppath, mode="heads"):
 """
 Public method to show information about the heads of the repository.
 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n"""
 """</table></p>""")
 .format(author, cdate, ctime))
 dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
-dlg.exec_()
+dlg.exec()
 def hgConflicts(self, name):
 """
 Public method used to show a list of files containing conflicts.
 else:
 title = self.tr("Marking as 'resolved'")
 dia = HgDialog(title, self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def hgAbortMerge(self, name):
 """
 Public method to abort an uncommitted merge.
 dia = HgDialog(
 self.tr('Aborting uncommitted merge'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def hgBranch(self, name):
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .HgBranchInputDialog import HgBranchInputDialog
 dlg = HgBranchInputDialog(self.hgGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 name, commit = dlg.getData()
 name = name.strip().replace(" ", "_")
 args = self.initCommand("branch")
 args.append(name)
 dia = HgDialog(
 self.tr('Creating branch in the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 if commit:
 self.vcsCommit(
 repodir,
 self.tr("Created new branch <{0}>.").format(
 name))
 args = self.initCommand("branch")
 dia = HgDialog(self.tr('Showing current branch'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def hgGetCurrentBranch(self, repodir):
 """
 Public method to get the current branch of the working directory.
 """
 Public method used to edit the user configuration file.
 """
 from .HgUserConfigDialog import HgUserConfigDialog
 dlg = HgUserConfigDialog(version=self.version)
-dlg.exec_()
+dlg.exec()
 def hgEditConfig(self, name, withLargefiles=True, largefilesData=None):
 """
 Public method used to edit the repository configuration file.
 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.Accepted:
 createContents = True
 defaultUrl, defaultPushUrl = dlg.getData()
 if withLargefiles:
 lfMinSize, lfPattern = dlg.getLargefilesData()
 else:
 dia = HgDialog(
 self.tr('Verifying the integrity of the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgShowConfig(self, name):
 """
 Public method to show the combined configuration.
 dia = HgDialog(
 self.tr('Showing the combined configuration settings'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def hgShowPaths(self, name):
 """
 Public method to show the path aliases for remote repositories.
 dia = HgDialog(
 self.tr('Showing aliases for remote repositories'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def hgRecover(self, name):
 """
 Public method to recover an interrupted transaction.
 dia = HgDialog(
 self.tr('Recovering from interrupted transaction'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def hgIdentify(self, name):
 """
 Public method to identify the current working directory.
 args = self.initCommand("identify")
 dia = HgDialog(self.tr('Identifying project directory'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def hgCreateIgnoreFile(self, name, autoAdd=False):
 """
 Public method to create the ignore file.
 from .HgBundleDialog import HgBundleDialog
 dlg = HgBundleDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir),
 version=self.version)
-if dlg.exec_() != QDialog.Accepted:
+if dlg.exec() != QDialog.Accepted:
 return
 revs, baseRevs, compression, bundleAll = dlg.getParameters()
 else:
 revs = bundleData["revs"]
 args.append(fname)
 dia = HgDialog(self.tr('Create changegroup'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgPreviewBundle(self, name):
 """
 Public method used to view the log of incoming changes from a
 changegroup file.
 args.extend(files)
 dia = HgDialog(self.tr('Apply changegroups'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 if subcommand in ("good", "bad", "skip"):
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev = dlg.getRevision()
 else:
 return
 args = self.initCommand("bisect")
 dia = HgDialog(
 self.tr('Mercurial Bisect ({0})').format(subcommand), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgForget(self, name):
 """
 Public method used to remove a file from the Mercurial repository.
 dia = HgDialog(
 self.tr('Removing files from the Mercurial repository only'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 if isinstance(name, list):
 self.__forgotNames.extend(name)
 else:
 self.__forgotNames.append(name)
 from .HgBackoutDialog import HgBackoutDialog
 dlg = HgBackoutDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 if not rev:
 E5MessageBox.warning(
 self.__ui,
 self.tr("Backing out changeset"),
 args.append(rev)
 dia = HgDialog(self.tr('Backing out changeset'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgRollback(self, name):
 """
 Public method used to rollback the last transaction.
 icon=E5MessageBox.Warning)
 if res:
 dia = HgDialog(self.tr('Rollback last transaction'), self)
 res = dia.startProcess(["rollback"], repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgServe(self, name):
 """
 Public method used to serve the project.
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 from .HgImportDialog import HgImportDialog
 dlg = HgImportDialog(self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 (patchFile, noCommit, message, date, user, withSecret, stripCount,
 force) = dlg.getParameters()
 args = self.initCommand("import")
 args.append("--verbose")
 args.append(patchFile)
 dia = HgDialog(self.tr("Import Patch"), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 else:
 res = False
 return
 from .HgExportDialog import HgExportDialog
 dlg = HgExportDialog(self.hgGetBookmarksList(repodir),
 self.version >= (4, 7, 0))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 (filePattern, revisions, bookmark, switchParent, allText,
 noDates, git) = dlg.getParameters()
 args = self.initCommand("export")
 args.append("--output")
 args.append(rev)
 dia = HgDialog(self.tr("Export Patches"), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgPhase(self, name, data=None):
 """
 Public method to change the phase of revisions.
 return False
 if data is None:
 from .HgPhaseDialog import HgPhaseDialog
 dlg = HgPhaseDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 data = dlg.getData()
 if data:
 revs, phase, force = data
 args.append(rev)
 dia = HgDialog(self.tr("Change Phase"), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExitWithoutErrors()
 else:
 res = False
 return res
 return False
 from .HgGraftDialog import HgGraftDialog
 res = False
 dlg = HgGraftDialog(self, revs)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 (revs,
 (userData, currentUser, userName),
 (dateData, currentDate, dateStr),
 log, dryrun, noCommit) = dlg.getData()
 args.extend(revs)
 dia = HgDialog(self.tr('Copy Changesets'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def __hgGraftSubCommand(self, path, subcommand, title):
 args.append("--verbose")
 dia = HgDialog(title, self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def hgGraftContinue(self, path):
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .HgArchiveDialog import HgArchiveDialog
 dlg = HgArchiveDialog(self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 archive, type_, prefix, subrepos = dlg.getData()
 args = self.initCommand("archive")
 if type_:
 args.append("--type")
 args.append(archive)
 dia = HgDialog(self.tr("Create Unversioned Archive"), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgDeleteBackups(self):
 """
 Public method to delete all backup bundles in the backup area.
 """
 """
 from .HgAddSubrepositoryDialog import HgAddSubrepositoryDialog
 ppath = self.__projectHelper.getProject().getProjectPath()
 hgsub = self.getHgSubPath()
 dlg = HgAddSubrepositoryDialog(ppath)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.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.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 try:
 f = open(hgsub, "w")
 f.write(contents)
 from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE,
 self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revision, bookmark = dlg.getData()
 ok = True
 else:
 ok = False
 args.append(bookmark)
 dia = HgDialog(self.tr('Mercurial Bookmark'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgBookmarkDelete(self, name, bookmark=None):
 """
 Public method to delete a bookmark.
 args.append(bookmark)
 dia = HgDialog(self.tr('Delete Mercurial Bookmark'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgBookmarkRename(self, name, renameInfo=None):
 """
 Public method to rename a bookmark.
 return
 if not renameInfo:
 from .HgBookmarkRenameDialog import HgBookmarkRenameDialog
 dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 renameInfo = dlg.getData()
 if renameInfo:
 args = self.initCommand("bookmarks")
 args.append("--rename")
 args.append(renameInfo[1])
 dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgBookmarkMove(self, name, revision=None, bookmark=None):
 """
 Public method to move a bookmark.
 from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE,
 self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.hgGetBookmarksList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revision, bookmark = dlg.getData()
 ok = True
 else:
 ok = False
 args.append(bookmark)
 dia = HgDialog(self.tr('Move Mercurial Bookmark'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgBookmarkIncoming(self, name):
 """
 Public method to show a list of incoming bookmarks.
 dia = HgDialog(self.tr(
 'Pulling bookmark from a remote Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def hgBookmarkPush(self, name, current=False, bookmark=None):
 """
 Public method to push a bookmark to a remote repository.
 dia = HgDialog(self.tr(
 'Pushing bookmark to a remote Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py