--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -25,10 +25,11 @@
"""
Class implementing a dialog to enter the data to add a submodule.
"""
+
def __init__(self, vcs, repodir, parent=None):
"""
Constructor
-
+
@param vcs reference to the version control object
@type Git
@param repodir directory containing the superproject
@@ -38,67 +39,62 @@
"""
super().__init__(parent)
self.setupUi(self)
-
+
self.__vcs = vcs
self.__repodir = repodir
-
+
self.submoduleDirButton.setIcon(UI.PixmapCache.getIcon("open"))
self.submoduleUrlButton.setIcon(UI.PixmapCache.getIcon("open"))
self.submoduleUrlClearHistoryButton.setIcon(
- UI.PixmapCache.getIcon("editDelete"))
-
+ UI.PixmapCache.getIcon("editDelete")
+ )
+
submoduleUrlHistory = self.__vcs.getPlugin().getPreferences(
- "RepositoryUrlHistory")
+ "RepositoryUrlHistory"
+ )
self.submoduleUrlCombo.addItems(submoduleUrlHistory)
self.submoduleUrlCombo.setEditText("")
-
- self.submoduleUrlDirCompleter = EricDirCompleter(
- self.submoduleUrlCombo)
- self.submoduleDirCompleter = EricDirCompleter(
- self.submoduleDirEdit)
-
- ipath = (
- Preferences.getMultiProject("Workspace") or
- Utilities.getHomeDir()
- )
+
+ self.submoduleUrlDirCompleter = EricDirCompleter(self.submoduleUrlCombo)
+ self.submoduleDirCompleter = EricDirCompleter(self.submoduleDirEdit)
+
+ ipath = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
self.__initPaths = [
Utilities.fromNativeSeparators(ipath),
Utilities.fromNativeSeparators(ipath) + "/",
]
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Ok).setEnabled(False)
-
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False)
+
msh = self.minimumSizeHint()
self.resize(max(self.width(), msh.width()), msh.height())
-
+
@pyqtSlot(str)
def on_submoduleUrlCombo_editTextChanged(self, txt):
"""
Private slot to handle changes of the submodule repository URL.
-
+
@param txt current text of the combo box
@type str
"""
enable = False
vcsUrlEnable = False
-
+
if txt:
url = QUrl.fromUserInput(txt)
if url.isValid():
if url.scheme() in ConfigGitSchemes:
enable = True
vcsUrlEnable = url.scheme() == "file"
- elif ':' in txt:
+ elif ":" in txt:
# assume scp like repository URL
enable = True
else:
vcsUrlEnable = True
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
self.submoduleUrlButton.setEnabled(vcsUrlEnable)
-
+
@pyqtSlot()
def on_submoduleUrlButton_clicked(self):
"""
@@ -108,12 +104,12 @@
self,
self.tr("Select Submodule Repository Directory"),
self.submoduleUrlCombo.currentText(),
- EricFileDialog.ShowDirsOnly)
-
+ EricFileDialog.ShowDirsOnly,
+ )
+
if directory:
- self.submoduleUrlCombo.setEditText(
- Utilities.toNativeSeparators(directory))
-
+ self.submoduleUrlCombo.setEditText(Utilities.toNativeSeparators(directory))
+
@pyqtSlot()
def on_submoduleUrlClearHistoryButton_clicked(self):
"""
@@ -122,9 +118,9 @@
currentUrl = self.submoduleUrlCombo.currentText()
self.submoduleUrlCombo.clear()
self.submoduleUrlCombo.setEditText(currentUrl)
-
+
self.__saveHistory()
-
+
@pyqtSlot()
def on_submoduleDirButton_clicked(self):
"""
@@ -134,27 +130,27 @@
self,
self.tr("Select Submodule Directory"),
self.submoduleDirEdit.text(),
- EricFileDialog.ShowDirsOnly)
-
+ EricFileDialog.ShowDirsOnly,
+ )
+
if directory:
- self.submoduleDirEdit.setText(
- Utilities.toNativeSeparators(directory))
-
+ self.submoduleDirEdit.setText(Utilities.toNativeSeparators(directory))
+
def getData(self):
"""
Public method to get the entered data.
-
+
@return tuple containing the repository URL, optional branch name,
optional logical name, optional submodule path and a flag
indicating to enforce the operation
@rtype tuple of (str, str, str, str, bool)
"""
self.__saveHistory()
-
+
path = self.submoduleDirEdit.text()
if path:
path = self.__getRelativePath(path)
-
+
return (
self.submoduleUrlCombo.currentText().replace("\\", "/"),
self.branchEdit.text(),
@@ -162,7 +158,7 @@
path,
self.forceCheckBox.isChecked(),
)
-
+
def __saveHistory(self):
"""
Private method to save the repository URL history.
@@ -173,19 +169,20 @@
submoduleUrlHistory.append(self.submoduleUrlCombo.itemText(index))
if url not in submoduleUrlHistory:
submoduleUrlHistory.insert(0, url)
-
+
# max. list sizes is hard coded to 20 entries
newSubmoduleUrlHistory = [url for url in submoduleUrlHistory if url]
if len(newSubmoduleUrlHistory) > 20:
newSubmoduleUrlHistory = newSubmoduleUrlHistory[:20]
-
+
self.__vcs.getPlugin().setPreferences(
- "RepositoryUrlHistory", newSubmoduleUrlHistory)
-
+ "RepositoryUrlHistory", newSubmoduleUrlHistory
+ )
+
def __getRelativePath(self, path):
"""
Private method to convert a file path to a relative path.
-
+
@param path file or directory name to convert
@type str
@return relative path or unchanged path, if path doesn't
@@ -194,12 +191,10 @@
"""
if path == self.__repodir:
return ""
- elif (
- Utilities.normcasepath(Utilities.toNativeSeparators(path))
- .startswith(Utilities.normcasepath(
- Utilities.toNativeSeparators(self.__repodir + "/")))
+ elif Utilities.normcasepath(Utilities.toNativeSeparators(path)).startswith(
+ Utilities.normcasepath(Utilities.toNativeSeparators(self.__repodir + "/"))
):
- relpath = path[len(self.__repodir):]
+ relpath = path[len(self.__repodir) :]
if relpath.startswith(("/", "\\")):
relpath = relpath[1:]
return relpath
