eric: comparison eric6/Plugins/VcsPlugins/vcsGit/git.py

-:dd54d33d21d2
+:51aa6c6b66f7
 args = self.initCommand("init")
 args.append(projectDir)
 dia = GitDialog(self.tr('Creating Git repository'), self)
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 status = dia.normalExit()
 if status:
 ignoreName = os.path.join(projectDir, Git.IgnoreFileName)
 if not os.path.exists(ignoreName):
 dia = GitDialog(
 self.tr('Adding files to Git repository'),
 self)
 res = dia.startProcess(args, projectDir)
 if res:
-dia.exec_()
+dia.exec()
 status = dia.normalExit()
 if status:
 args = self.initCommand("commit")
 args.append('--message={0}'.format(msg))
 dia = GitDialog(
 self.tr('Initial commit to Git 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 = GitDialog(
 self.tr('Cloning project from a Git 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 Git repository.
 dia = GitDialog(
 self.tr('Committing changes to Git repository'),
 self)
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 self.committed.emit()
 self.checkVCSStatus()
 def vcsUpdate(self, name, noDialog=False, revision=None):
 """
 dia = GitDialog(self.tr(
 'Synchronizing with the Git 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 Git 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
 Git repository.
 'Removing files/directories from the Git'
 ' 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 .GitCopyDialog import GitCopyDialog
 dlg = GitCopyDialog(name, None, True)
-accepted = dlg.exec_() == QDialog.Accepted
+accepted = dlg.exec() == QDialog.Accepted
 if accepted:
 target, force = dlg.getData()
 if accepted:
 args = self.initCommand("mv")
 QProcess(), 'git', args, repodir)
 else:
 dia = GitDialog(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)
 dia = GitDialog(
 self.tr('Unstage files/directories'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 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 = GitDialog(self.tr('Reverting changes'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 else:
 res = False
 from .GitMergeDialog import GitMergeDialog
 dlg = GitMergeDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir, withMaster=True),
 self.gitGetCurrentBranch(repodir),
 self.gitGetBranchesList(repodir, remotes=True))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 commit, doCommit, commitMessage, addLog, diffStat = (
 dlg.getParameters()
 )
 args = self.initCommand("merge")
 if doCommit:
 args.append(commit)
 dia = GitDialog(self.tr('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
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir),
 trackingBranchesList=self.gitGetBranchesList(
 repodir, remotes=True),
 noneLabel=self.tr("Master branch head"))
-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 .GitCommandDialog import GitCommandDialog
 dlg = GitCommandDialog(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 = GitDialog(self.tr('Git 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.
 @param project reference to the project object
 @return flag indicating successful operation (boolean)
 """
 from .GitCopyDialog import GitCopyDialog
 dlg = GitCopyDialog(name)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 target, force = dlg.getData()
 # step 1: copy the file/directory:
 if os.path.isdir(name):
 try:
 return
 from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
 dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
 from .GitDiffDialog import GitDiffDialog
 self.diff = GitDiffDialog(self)
 self.diff.show()
 from .GitRevisionsSelectionDialog import (
 GitRevisionsSelectionDialog
 )
 dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev1, rev2 = dlg.getRevisions()
 elif revisions:
 rev1, rev2 = revisions[0], revisions[1]
 else:
 rev1, rev2 = "", ""
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .GitFetchDialog import GitFetchDialog
 dlg = GitFetchDialog(self, repodir)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 (remote, url, remoteBranches, localBranch, fetchAll, prune,
 includeTags) = dlg.getData()
 args = self.initCommand("fetch")
 args.append('--verbose')
 dia = GitDialog(self.tr('Fetching from a remote Git repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def gitPull(self, name):
 """
 Public method used to pull changes from a remote Git repository.
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 from .GitPullDialog import GitPullDialog
 dlg = GitPullDialog(self, repodir)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 remote, url, branches, pullAll, prune = dlg.getData()
 args = self.initCommand('pull')
 args.append('--no-commit')
 args.append('--verbose')
 dia = GitDialog(self.tr('Pulling from a remote Git repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 else:
 return False
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .GitPushDialog import GitPushDialog
 dlg = GitPushDialog(self, repodir)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 remote, refspecs, tags, tracking, submodule = dlg.getData()
 args = self.initCommand("push")
 args.append('--verbose')
 args.append('--porcelain')
 dia = GitDialog(
 self.tr('Pushing to a remote Git repository'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def gitCommitMerge(self, name):
 """
 Public method to commit a failed merge.
 args = self.initCommand("commit")
 dia = GitDialog(self.tr('Committing failed merge'), self)
 res = dia.startProcess(args, repodir, environment=env)
 if res:
-dia.exec_()
+dia.exec()
 self.committed.emit()
 self.checkVCSStatus()
 def gitCancelMerge(self, name):
 """
 dia = GitDialog(
 self.tr('Aborting uncommitted/failed merge'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitApply(self, repodir, patchFile, cached=False, reverse=False,
 dia = GitDialog(
 self.tr('Applying patch'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitApplyCheckPatches(self, projectDir, check=False):
 """
 Public method to apply a list of patch files or check, if they would
 apply cleanly.
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .GitPatchFilesDialog import GitPatchFilesDialog
 dlg = GitPatchFilesDialog(repodir, self.__patchCheckData)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 patchFilesList, stripCount, inaccurateEof, recount = dlg.getData()
 if patchFilesList:
 args = self.initCommand("apply")
 if check:
 args.append("--check")
 dia = GitDialog(
 title,
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 if not check:
 self.checkVCSStatus()
 def gitShowPatchesStatistics(self, projectDir):
 """
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 from .GitTagDialog import GitTagDialog
 dlg = GitTagDialog(self.gitGetTagsList(repodir), revision, tagName)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 tag, revision, tagOp, tagType, force = dlg.getParameters()
 else:
 return False
 args = self.initCommand("tag")
 dia = GitDialog(self.tr('Tagging in the Git repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 return True
 def gitGetTagsList(self, repodir, withType=False):
 """
 from .GitBranchDialog import GitBranchDialog
 dlg = GitBranchDialog(
 self.gitGetBranchesList(repodir, allBranches=True),
 revision, branchName, branchOp)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 branchOp, branch, revision, newBranch, remoteBranch, force = (
 dlg.getParameters()
 )
 else:
 return False, False
 dia = GitDialog(self.tr('Branching in the Git repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 if branchOp in [GitBranchDialog.CreateSwitchBranch,
 GitBranchDialog.CreateTrackingBranch]:
 update = dia.hasAddOrDelete()
 self.checkVCSStatus()
 else:
 from .GitBranchPushDialog import GitBranchPushDialog
 dlg = GitBranchPushDialog(self.gitGetBranchesList(repodir),
 self.gitGetRemotesList(repodir),
 delete=True)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 branchName, remoteName = dlg.getData()[:2]
 args = self.initCommand("push")
 args.append(remoteName)
 args.append(":{0}".format(branchName))
 dia = GitDialog(self.tr('Delete Remote Branch'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitShowBranch(self, name):
 """
 Public method used to show the current branch of the working directory.
 return
 from .GitBundleDialog import GitBundleDialog
 dlg = GitBundleDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revs = dlg.getData()
 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 None,
 self.tr("Create Bundle"),
 args.append(rev)
 dia = GitDialog(self.tr('Create Bundle'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitVerifyBundle(self, projectDir):
 """
 Public method to verify a bundle file.
 args.append(fname)
 dia = GitDialog(self.tr('Verify Bundle'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitBundleListHeads(self, projectDir):
 """
 Public method to list the heads contained in a bundle file.
 args.append(fname)
 dia = GitDialog(self.tr('List Bundle Heads'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitGetBundleHeads(self, repodir, bundleFile):
 """
 Public method to get a list of heads contained in a bundle file.
 from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 dlg = GitApplyBundleDataDialog(
 self.gitGetBundleHeads(repodir, fname),
 self.gitGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 bundleHead, branch = dlg.getData()
 args = self.initCommand("fetch")
 args.append('--verbose')
 args.append(fname)
 dia = GitDialog(self.tr('Applying a bundle file (fetch)'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 def gitBundlePull(self, projectDir):
 """
 from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 dlg = GitApplyBundleDataDialog(
 self.gitGetBundleHeads(repodir, fname),
 self.gitGetBranchesList(repodir))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 bundleHead, branch = dlg.getData()
 args = self.initCommand("pull")
 args.append('--verbose')
 args.append(fname)
 dia = GitDialog(self.tr('Applying a bundle file (fetch)'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 from .GitRevisionSelectionDialog import GitRevisionSelectionDialog
 dlg = GitRevisionSelectionDialog(self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir),
 showBranches=showBranches,
 showHead=showHead)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev = dlg.getRevision()
 else:
 return False
 args = self.initCommand("bisect")
 if subcommand == "start_extended":
 from .GitBisectStartDialog import GitBisectStartDialog
 dlg = GitBisectStartDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 bad, good, noCheckout = dlg.getData()
 args.append("start")
 if noCheckout:
 args.append("--no-checkout")
 args.append(bad)
 dia = GitDialog(
 self.tr('Git Bisect ({0})').format(subcommand), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 dia = GitDialog(
 self.tr('Git Bisect ({0})').format("replay"), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 args.append(remoteName)
 dia = GitDialog(self.tr('Show Remote Info'), self)
 res = dia.startProcess(args, repodir, showArgs=False)
 if res:
-dia.exec_()
+dia.exec()
 def gitShowRemotes(self, projectDir):
 """
 Public method to show available remote repositories.
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .GitAddRemoteDialog import GitAddRemoteDialog
 dlg = GitAddRemoteDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 name, url = dlg.getData()
 args = self.initCommand("remote")
 args.append("add")
 args.append(name)
 args.append(url)
 if not remoteUrl:
 remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
 from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog
 dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 name, url = dlg.getData()
 if url != remoteUrl:
 args = self.initCommand("remote")
 args.append("set-url")
 args.append(name)
 if not remoteUrl:
 remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
 from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog
 dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 name, url = dlg.getData()
 if url != remoteUrl:
 args = self.initCommand("remote")
 args.append("set-url")
 args.append(name)
 args.append(remoteName)
 dia = GitDialog(self.tr('Show Remote Info'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitShortlog(self, projectDir, commit):
 """
 Public method to show a short log suitable for inclusion in release
 announcements.
 args.append(commit)
 dia = GitDialog(self.tr('Show Shortlog'), self)
 res = dia.startProcess(args, repodir, showArgs=False)
 if res:
-dia.exec_()
+dia.exec()
 def gitDescribe(self, projectDir, commits):
 """
 Public method to find the most recent tag reachable from each commit.
 res = False
 from .GitCherryPickDialog import GitCherryPickDialog
 dlg = GitCherryPickDialog(commits)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 commits, cherrypickInfo, signoff, nocommit = (
 dlg.getData()
 )
 args = self.initCommand("cherry-pick")
 args.extend(commits)
 dia = GitDialog(self.tr('Cherry-pick'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitCherryPickContinue(self, projectDir):
 args.append("--continue")
 dia = GitDialog(self.tr('Copy Changesets (Continue)'), self)
 res = dia.startProcess(args, repodir, environment=env)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitCherryPickQuit(self, projectDir):
 args.append("--quit")
 dia = GitDialog(self.tr('Copy Changesets (Quit)'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitCherryPickAbort(self, projectDir):
 args.append("--abort")
 dia = GitDialog(self.tr('Copy Changesets (Cancel)'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 ###########################################################################
 return False
 res = False
 from .GitStashDataDialog import GitStashDataDialog
 dlg = GitStashDataDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 message, keepIndex, untracked = dlg.getData()
 args = self.initCommand("stash")
 args.append("save")
 if keepIndex:
 args.append("--keep-index")
 args.append(message)
 dia = GitDialog(self.tr('Saving stash'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitStashBrowser(self, projectDir):
 args.append(stashName)
 dia = GitDialog(self.tr('Restoring stash'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitStashPop(self, projectDir, stashName=""):
 args.append(stashName)
 dia = GitDialog(self.tr('Restoring stash'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitStashBranch(self, projectDir, stashName=""):
 args.append(stashName)
 dia = GitDialog(self.tr('Creating branch'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def gitStashDrop(self, projectDir, stashName=""):
 args.append(stashName)
 dia = GitDialog(self.tr('Deleting stash'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 return res
 def gitStashClear(self, projectDir):
 """
 Public method to delete all stashes.
 args.append("clear")
 dia = GitDialog(self.tr('Deleting all stashes'), self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 return res
 def gitEditConfig(self, projectDir):
 """
 Public method used to edit the repository configuration file.
 from .GitUtilities import getConfigPath
 cfgFile = getConfigPath()
 if not os.path.exists(cfgFile):
 from .GitUserConfigDataDialog import GitUserConfigDataDialog
 dlg = GitUserConfigDataDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 firstName, lastName, email = dlg.getData()
 else:
 firstName, lastName, email = (
 "Firstname", "Lastname", "email_address")
 try:
 dia = GitDialog(
 self.tr('Showing the combined configuration settings'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def gitVerify(self, projectDir):
 """
 Public method to verify the connectivity and validity of objects
 of the database.
 dia = GitDialog(
 self.tr('Verifying the integrity of the Git repository'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
-dia.exec_()
+dia.exec()
 def gitHouseKeeping(self, projectDir):
 """
 Public method to cleanup and optimize the local repository.
 dia = GitDialog(
 self.tr('Performing Repository Housekeeping'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitStatistics(self, projectDir):
 """
 Public method to show some statistics of the local repository.
 .format(statistics["size-garbage"]))
 info.append("""</table></p>""")
 else:
 info.append(self.tr("<p><b>No statistics available.</b></p>"))
 dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
-dlg.exec_()
+dlg.exec()
 def gitGetArchiveFormats(self, repodir):
 """
 Public method to get a list of supported archive formats.
 dlg = GitArchiveDataDialog(
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir, withMaster=True),
 self.gitGetArchiveFormats(repodir)
 )
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 commit, archiveFormat, fileName, prefix = dlg.getData()
 args = self.initCommand("archive")
 args.append("--format={0}".format(archiveFormat))
 args.append("--output={0}".format(fileName))
 if prefix:
 dia = GitDialog(
 self.tr('Creating Archive'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 ###########################################################################
 ## Methods related to submodules.
 ###########################################################################
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .GitSubmoduleAddDialog import GitSubmoduleAddDialog
 dlg = GitSubmoduleAddDialog(self, repodir)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 repo, branch, name, path, force = dlg.getData()
 args = self.initCommand("submodule")
 args.append("add")
 if branch:
 args.append("--branch")
 dia = GitDialog(
 self.tr("Add Submodule"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def __gitSubmodulesList(self, repodir):
 """
 Private method to get the data of defined submodules.
 submodulesList = self.__gitSubmodulesList(repodir)
 if submodulesList:
 from .GitSubmodulesListDialog import GitSubmodulesListDialog
 dlg = GitSubmodulesListDialog(submodulesList)
-dlg.exec_()
+dlg.exec()
 else:
 E5MessageBox.information(
 None,
 self.tr("List Submodules"),
 self.tr("""No submodules defined for the project."""))
 paths = [submodule["path"]
 for submodule in self.__gitSubmodulesList(repodir)]
 from .GitListDialog import GitListDialog
 dlg = GitListDialog(sorted(paths))
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 selectedPaths = dlg.getSelection()
 return selectedPaths, True
 else:
 return [], False
 dia = GitDialog(
 self.tr("Initialize Submodules"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitSubmoduleDeinit(self, projectDir):
 """
 Public method to unregister submodules.
 paths = [submodule["path"]
 for submodule in self.__gitSubmodulesList(repodir)]
 from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog
 dlg = GitSubmodulesDeinitDialog(paths)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 deinitAll, submodulePaths, force = dlg.getData()
 args = self.initCommand("submodule")
 args.append("deinit")
 if deinitAll:
 args.append("--all")
 dia = GitDialog(
 self.tr("Unregister Submodules"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitSubmoduleUpdate(self, projectDir, initialize=False, remote=False):
 """
 Public method to update submodules.
 dia = GitDialog(
 self.tr("Update Submodules"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitSubmoduleUpdateWithOptions(self, projectDir):
 """
 Public method to update submodules offering a dialog to select the
 update options.
 from .GitSubmodulesUpdateOptionsDialog import (
 GitSubmodulesUpdateOptionsDialog
 )
 dlg = GitSubmodulesUpdateOptionsDialog(paths)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 procedure, init, remote, noFetch, force, submodulePaths = (
 dlg.getData()
 )
 args = self.initCommand("submodule")
 dia = GitDialog(
 self.tr("Update Submodules"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitSubmoduleSync(self, projectDir):
 """
 Public method to synchronize submodules.
 paths = [submodule["path"]
 for submodule in self.__gitSubmodulesList(repodir)]
 from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog
 dlg = GitSubmodulesSyncDialog(paths)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 submodulePaths, recursive = dlg.getData()
 args = self.initCommand("submodule")
 args.append("sync")
 if recursive:
 args.append("--recursive")
 dia = GitDialog(
 self.tr("Synchronize Submodules"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 def gitSubmoduleStatus(self, projectDir):
 """
 Public method to show the status of the submodules.
 from .GitSubmodulesSummaryOptionsDialog import (
 GitSubmodulesSummaryOptionsDialog
 )
 dlg = GitSubmodulesSummaryOptionsDialog(paths)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 submodulePaths, superProject, index, commit, limit = dlg.getData()
 args = self.initCommand("submodule")
 args.append("summary")
 if superProject:
 args.append("--files")
 dia = GitDialog(
 self.tr("Submodules Summary"),
 self)
 res = dia.startProcess(args, repodir)
 if res:
-dia.exec_()
+dia.exec()
 ###########################################################################
 ## Methods to get the helper objects are below.
 ###########################################################################

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsGit/git.py

eric6/Plugins/VcsPlugins/vcsGit/git.py