eric: comparison src/eric7/Plugins/VcsPlugins/vcsGit/git.py

-:0b936ff1bbb9
+:a2bc06a54d9d
 import contextlib
 import os
 import pathlib
 import re
 import shutil
+import sys
 from PyQt6.QtCore import QProcess, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
 from eric7 import Globals, Preferences, Utilities
 @param message message for this operation (string)
 @param noDialog flag indicating quiet operations (boolean)
 @param commitAll flag indicating to commit all local changes (boolean)
 @param amend flag indicating to amend the HEAD commit (boolean)
 """
+from .GitCommitDialog import GitCommitDialog
 if not noDialog:
 # call CommitDialog and get message from there
 if self.__commitDialog is None:
-from .GitCommitDialog import GitCommitDialog
 self.__commitDialog = GitCommitDialog(
 self, message, amend, commitAll, self.__ui
 )
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 @param project reference to the project object
 @param target new name of the file/directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating successful operation (boolean)
 """
+from .GitCopyDialog import GitCopyDialog
 isDir = os.path.isdir(name)
 res = False
 if noDialog:
 if target is None:
 return False
 force = True
 accepted = True
 else:
-from .GitCopyDialog import GitCopyDialog
 dlg = GitCopyDialog(name, None, True)
 accepted = dlg.exec() == QDialog.DialogCode.Accepted
 if accepted:
 target, force = dlg.getData()
 @param name file/directory name to show the log of (string)
 @param isFile flag indicating log for a file is to be shown
 (boolean)
 """
+from .GitLogBrowserDialog import GitLogBrowserDialog
 if self.logBrowser is None:
-from .GitLogBrowserDialog import GitLogBrowserDialog
 self.logBrowser = GitLogBrowserDialog(self)
 self.logBrowser.show()
 self.logBrowser.raise_()
 self.logBrowser.start(name, isFile=isFile)
 """
 Public method used to browse the reflog of the project.
 @param projectDir name of the project directory (string)
 """
+from .GitReflogBrowserDialog import GitReflogBrowserDialog
 if self.reflogBrowser is None:
-from .GitReflogBrowserDialog import GitReflogBrowserDialog
 self.reflogBrowser = GitReflogBrowserDialog(self)
 self.reflogBrowser.show()
 self.reflogBrowser.raise_()
 self.reflogBrowser.start(projectDir)
 being edited and has unsaved modification, they can be saved or the
 operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
+from .GitDiffDialog import GitDiffDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 else:
 project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 if self.diff is None:
-from .GitDiffDialog import GitDiffDialog
 self.diff = GitDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 QApplication.processEvents()
 self.diff.start(name, diffMode="work2stage2repo", refreshable=True)
 Git repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
+from .GitStatusDialog import GitStatusDialog
 if self.status is None:
-from .GitStatusDialog import GitStatusDialog
 self.status = GitStatusDialog(self)
 self.status.show()
 self.status.raise_()
 self.status.start(name)
 @type str
 @return flag indicating, that the update contained an add
 or delete
 @rtype bool
 """
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 args = self.initCommand("checkout")
 args.append("--")
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 self.addArguments(args, name)
 return False
 project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from eric7.UI.DeleteFilesConfirmationDialog import (
-DeleteFilesConfirmationDialog,
-)
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 """
 Public method used to merge a URL/revision into the local project.
 @param name file/directory name to be merged (string)
 """
+from .GitMergeDialog import GitMergeDialog
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitMergeDialog import GitMergeDialog
 dlg = GitMergeDialog(
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir, withMaster=True),
 self.gitGetCurrentBranch(repodir),
 @param name directory name to be switched (string)
 @return flag indicating, that the switch contained an add
 or delete (boolean)
 """
+from .GitRevisionSelectionDialog import GitRevisionSelectionDialog
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
-from .GitRevisionSelectionDialog import GitRevisionSelectionDialog
 dlg = GitRevisionSelectionDialog(
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir),
 trackingBranchesList=self.gitGetBranchesList(repodir, remotes=True),
 @param name file name to show the annotations for
 @type str
 @param skiplist name of a skip list file
 @type str
 """
+from .GitBlameDialog import GitBlameDialog
 if self.blame is None:
-from .GitBlameDialog import GitBlameDialog
 self.blame = GitBlameDialog(self)
 self.blame.show()
 self.blame.raise_()
 self.blame.start(name, skiplist=skiplist)
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
+from .GitDiffDialog import GitDiffDialog
+from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 names = name[:]
 else:
 dname, fname = self.splitPath(name)
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
 dlg = GitRevisionsSelectionDialog(
 self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
-from .GitDiffDialog import GitDiffDialog
 self.diff = GitDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 self.diff.start(name, revisions)
 @param name file name to be diffed (string)
 @param extended flag indicating the extended variant (boolean)
 @param revisions tuple of two revisions (tuple of strings)
 @exception ValueError raised to indicate an invalid name parameter
 """
+from eric7.UI.CompareDialog import CompareDialog
+from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
 # find the root of the repo
 repodir = self.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
 dlg = GitRevisionsSelectionDialog(
 self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 ),
 )
 return
 if self.sbsDiff is None:
-from eric7.UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 self.sbsDiff.show()
 self.sbsDiff.raise_()
 self.sbsDiff.compare(output1, output2, name1, name2)
 """
 Public method to fetch changes from a remote repository.
 @param name directory name (string)
 """
+from .GitFetchDialog import GitFetchDialog
 # find the root of the repo
 repodir = self.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitFetchDialog import GitFetchDialog
 dlg = GitFetchDialog(self, repodir)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 (
 remote,
 @param name directory name of the project to be pulled to (string)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
+from .GitPullDialog import GitPullDialog
 # find the root of the repo
 repodir = self.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
-from .GitPullDialog import GitPullDialog
 dlg = GitPullDialog(self, repodir)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 remote, url, branches, pullAll, prune = dlg.getData()
 """
 Public method used to push changes to a remote Git repository.
 @param name directory name of the project to be pushed from (string)
 """
+from .GitPushDialog import GitPushDialog
 # find the root of the repo
 repodir = self.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitPushDialog import GitPushDialog
 dlg = GitPushDialog(self, repodir)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 remote, refspecs, tags, tracking, submodule = dlg.getData()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-import sys
 editor = sys.argv[0].replace(".py", "_editor.py")
 env = {"GIT_EDITOR": "{0} {1}".format(Globals.getPythonExecutable(), editor)}
 args = self.initCommand("commit")
 apply cleanly.
 @param projectDir directory name of the project (string)
 @param check flag indicating to perform a check operation (boolean)
 """
+from .GitPatchFilesDialog import GitPatchFilesDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitPatchFilesDialog import GitPatchFilesDialog
 dlg = GitPatchFilesDialog(repodir, self.__patchCheckData)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 patchFilesList, stripCount, inaccurateEof, recount = dlg.getData()
 if patchFilesList:
 """
 Public method to show statistics for a set of patch files.
 @param projectDir directory name of the project (string)
 """
+from .GitPatchStatisticsDialog import GitPatchStatisticsDialog
 if self.patchStatisticsDialog is None:
-from .GitPatchStatisticsDialog import GitPatchStatisticsDialog
 self.patchStatisticsDialog = GitPatchStatisticsDialog(self)
 self.patchStatisticsDialog.show()
 self.patchStatisticsDialog.raise_()
 self.patchStatisticsDialog.start(projectDir, self.__patchCheckData)
 self.__patchCheckData = self.patchStatisticsDialog.getData()
 (string)
 @param revision revision to set tag for (string)
 @param tagName name of the tag (string)
 @return flag indicating a performed tag action (boolean)
 """
+from .GitTagDialog import GitTagDialog
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 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.DialogCode.Accepted:
 tag, revision, tagOp, tagType, force = dlg.getParameters()
 else:
 (False = branches, True = tags)
 @param listAll flag indicating to show all tags or branches (boolean)
 @param merged flag indicating to show only merged or non-merged
 branches (boolean)
 """
+from .GitTagBranchListDialog import GitTagBranchListDialog
 if self.tagbranchList is None:
-from .GitTagBranchListDialog import GitTagBranchListDialog
 self.tagbranchList = GitTagBranchListDialog(self)
 self.tagbranchList.show()
 self.tagbranchList.raise_()
 if tags:
 self.tagbranchList.start(path, tags)
 @param branchOp desired branch operation (integer)
 @return flag indicating a performed branch action (boolean) and
 a flag indicating, that the branch operation contained an add
 or delete (boolean)
 """
+from .GitBranchDialog import GitBranchDialog
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False, False
-from .GitBranchDialog import GitBranchDialog
 dlg = GitBranchDialog(
 self.gitGetBranchesList(repodir, allBranches=True),
 revision,
 branchName,
 """
 Public method to delete a branch from a remote repository.
 @param name file/directory name (string)
 """
+from .GitBranchPushDialog import GitBranchPushDialog
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitBranchPushDialog import GitBranchPushDialog
 dlg = GitBranchPushDialog(
 self.gitGetBranchesList(repodir),
 self.gitGetRemotesList(repodir),
 delete=True,
 """
 Public method to create a bundle file.
 @param projectDir name of the project directory (string)
 """
+from .GitBundleDialog import GitBundleDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitBundleDialog import GitBundleDialog
 dlg = GitBundleDialog(
 self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 Public method to fetch a head of a bundle file into the local
 repository.
 @param projectDir name of the project directory (string)
 """
+from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"),
 )
 if fname:
 self.__lastBundlePath = os.path.dirname(fname)
-from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 dlg = GitApplyBundleDataDialog(
 self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 bundleHead, branch = dlg.getData()
 @param projectDir name of the project directory (string)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
+from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 self.tr("Git Bundle Files (*.bundle);;All Files (*)"),
 )
 if fname:
 self.__lastBundlePath = os.path.dirname(fname)
-from .GitApplyBundleDataDialog import GitApplyBundleDataDialog
 dlg = GitApplyBundleDataDialog(
 self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 bundleHead, branch = dlg.getData()
 'start_extended', 'good', 'bad', 'skip' or 'reset')
 @return flag indicating, that the update contained an add
 or delete (boolean)
 @exception ValueError raised to indicate an invalid bisect subcommand
 """
+from .GitBisectStartDialog import GitBisectStartDialog
+from .GitRevisionSelectionDialog import GitRevisionSelectionDialog
 if subcommand not in (
 "start",
 "start_extended",
 "good",
 "bad",
 res = False
 rev = ""
 if subcommand in ("good", "bad", "skip", "reset"):
 showBranches = subcommand == "reset"
 showHead = subcommand == "reset"
-from .GitRevisionSelectionDialog import GitRevisionSelectionDialog
 dlg = GitRevisionSelectionDialog(
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir),
 showBranches=showBranches,
 showHead=showHead,
 else:
 return False
 args = self.initCommand("bisect")
 if subcommand == "start_extended":
-from .GitBisectStartDialog import GitBisectStartDialog
 dlg = GitBisectStartDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 bad, good, noCheckout = dlg.getData()
 args.append("start")
 if noCheckout:
 """
 Public method used to browse the bisect log of the project.
 @param projectDir name of the project directory (string)
 """
+from .GitBisectLogBrowserDialog import GitBisectLogBrowserDialog
 if self.bisectlogBrowser is None:
-from .GitBisectLogBrowserDialog import GitBisectLogBrowserDialog
 self.bisectlogBrowser = GitBisectLogBrowserDialog(self)
 self.bisectlogBrowser.show()
 self.bisectlogBrowser.raise_()
 self.bisectlogBrowser.start(projectDir)
 """
 Public method to show available remote repositories.
 @param projectDir name of the project directory (string)
 """
+from .GitRemoteRepositoriesDialog import GitRemoteRepositoriesDialog
 if self.remotesDialog is None:
-from .GitRemoteRepositoriesDialog import GitRemoteRepositoriesDialog
 self.remotesDialog = GitRemoteRepositoriesDialog(self)
 self.remotesDialog.show()
 self.remotesDialog.raise_()
 self.remotesDialog.start(projectDir)
 """
 Public method to add a remote repository.
 @param projectDir name of the project directory (string)
 """
+from .GitAddRemoteDialog import GitAddRemoteDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitAddRemoteDialog import GitAddRemoteDialog
 dlg = GitAddRemoteDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 name, url = dlg.getData()
 args = self.initCommand("remote")
 @param remoteName name of the remote repository
 @type str
 @param remoteUrl URL of the remote repository
 @type str
 """
+from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if not remoteUrl:
 remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
-from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog
 dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 name, url = dlg.getData()
 if url != remoteUrl:
 @param remoteName name of the remote repository
 @type str
 @param remoteUrl URL of the remote repository
 @type str
 """
+from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if not remoteUrl:
 remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
-from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog
 dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 name, url = dlg.getData()
 if url != remoteUrl:
 @param projectDir name of the project directory (string)
 @param commits list of commits to start the search from
 (list of strings)
 """
+from .GitDescribeDialog import GitDescribeDialog
 if self.describeDialog is None:
-from .GitDescribeDialog import GitDescribeDialog
 self.describeDialog = GitDescribeDialog(self)
 self.describeDialog.show()
 self.describeDialog.raise_()
 self.describeDialog.start(projectDir, commits)
 @param projectDir name of the project directory (string)
 @param commits list of commits to be applied (list of strings)
 @return flag indicating that the project should be reread (boolean)
 """
+from .GitCherryPickDialog import GitCherryPickDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 res = False
-from .GitCherryPickDialog import GitCherryPickDialog
 dlg = GitCherryPickDialog(commits)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 commits, cherrypickInfo, signoff, nocommit = dlg.getData()
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
-import sys
 editor = sys.argv[0].replace(".py", "_editor.py")
 env = {"GIT_EDITOR": "{0} {1}".format(Globals.getPythonExecutable(), editor)}
 args = self.initCommand("cherry-pick")
 @param projectDir name of the project directory (string)
 @return flag indicating, that the save contained an add
 or delete (boolean)
 """
+from .GitStashDataDialog import GitStashDataDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 res = False
-from .GitStashDataDialog import GitStashDataDialog
 dlg = GitStashDataDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 message, keepIndex, untracked = dlg.getData()
 args = self.initCommand("stash")
 args.append("save")
 """
 Public method used to browse the stashed changes.
 @param projectDir name of the project directory (string)
 """
+from .GitStashBrowserDialog import GitStashBrowserDialog
 if self.stashBrowser is None:
-from .GitStashBrowserDialog import GitStashBrowserDialog
 self.stashBrowser = GitStashBrowserDialog(self)
 self.stashBrowser.show()
 self.stashBrowser.raise_()
 self.stashBrowser.start(projectDir)
 Public method to show the contents of a stash.
 @param projectDir name of the project directory (string)
 @param stashName name of a stash (string)
 """
+from .GitDiffDialog import GitDiffDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 )
 if not ok:
 return
 if self.diff is None:
-from .GitDiffDialog import GitDiffDialog
 self.diff = GitDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 self.diff.start(repodir, diffMode="stash", stashName=stashName)
 def gitEditUserConfig(self):
 """
 Public method used to edit the user configuration file.
 """
+from .GitUserConfigDataDialog import GitUserConfigDataDialog
 from .GitUtilities import getConfigPath
 cfgFile = getConfigPath()
 if not os.path.exists(cfgFile):
-from .GitUserConfigDataDialog import GitUserConfigDataDialog
 dlg = GitUserConfigDataDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 firstName, lastName, email = dlg.getData()
 else:
 firstName, lastName, email = ("Firstname", "Lastname", "email_address")
 """
 Public method to show some statistics of the local repository.
 @param projectDir name of the project directory (string)
 """
+from .GitArchiveDataDialog import GitArchiveDataDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitArchiveDataDialog import GitArchiveDataDialog
 dlg = GitArchiveDataDialog(
 self.gitGetTagsList(repodir),
 self.gitGetBranchesList(repodir, withMaster=True),
 self.gitGetArchiveFormats(repodir),
 Public method to add a submodule to the project.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmoduleAddDialog import GitSubmoduleAddDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .GitSubmoduleAddDialog import GitSubmoduleAddDialog
 dlg = GitSubmoduleAddDialog(self, repodir)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 repo, branch, name, path, force = dlg.getData()
 args = self.initCommand("submodule")
 Public method to show a list of all submodules of the project.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesListDialog import GitSubmodulesListDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 submodulesList = self.__gitSubmodulesList(repodir)
 if submodulesList:
-from .GitSubmodulesListDialog import GitSubmodulesListDialog
 dlg = GitSubmodulesListDialog(submodulesList)
 dlg.exec()
 else:
 EricMessageBox.information(
 None,
 @type str
 @return tuple of selected submodule paths and flag indicating
 a cancellation
 @rtype tuple of (list of str, bool)
 """
+from .GitListDialog import GitListDialog
 paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
-from .GitListDialog import GitListDialog
 dlg = GitListDialog(sorted(paths))
 if dlg.exec() == QDialog.DialogCode.Accepted:
 selectedPaths = dlg.getSelection()
 return selectedPaths, True
 Public method to unregister submodules.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
-from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog
 dlg = GitSubmodulesDeinitDialog(paths)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 deinitAll, submodulePaths, force = dlg.getData()
 args = self.initCommand("submodule")
 update options.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesUpdateOptionsDialog import GitSubmodulesUpdateOptionsDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
-from .GitSubmodulesUpdateOptionsDialog import GitSubmodulesUpdateOptionsDialog
 dlg = GitSubmodulesUpdateOptionsDialog(paths)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 procedure, init, remote, noFetch, force, submodulePaths = dlg.getData()
 Public method to synchronize submodules.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
-from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog
 dlg = GitSubmodulesSyncDialog(paths)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 submodulePaths, recursive = dlg.getData()
 args = self.initCommand("submodule")
 Public method to show the status of the submodules.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesStatusDialog import GitSubmodulesStatusDialog
 if self.submoduleStatusDialog is None:
-from .GitSubmodulesStatusDialog import GitSubmodulesStatusDialog
 self.submoduleStatusDialog = GitSubmodulesStatusDialog(self)
 self.submoduleStatusDialog.show()
 self.submoduleStatusDialog.raise_()
 self.submoduleStatusDialog.start(projectDir)
 Public method to show the status of the submodules.
 @param projectDir name of the project directory
 @type str
 """
+from .GitSubmodulesSummaryOptionsDialog import GitSubmodulesSummaryOptionsDialog
 # find the root of the repo
 repodir = projectDir
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
-from .GitSubmodulesSummaryOptionsDialog import GitSubmodulesSummaryOptionsDialog
 dlg = GitSubmodulesSummaryOptionsDialog(paths)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 submodulePaths, superProject, index, commit, limit = dlg.getData()
 args = self.initCommand("submodule")

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py

src/eric7/Plugins/VcsPlugins/vcsGit/git.py