Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py	Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py	Wed Jul 13 14:55:47 2022 +0200
@@ -17,47 +17,47 @@
     """
     Class implementing a dialog to enter data for a Pull operation.
     """
+
     def __init__(self, vcs, repodir, parent=None):
         """
         Constructor
-        
+
         @param vcs reference to the git object
         @param repodir directory name of the local repository (string)
         @param parent reference to the parent widget (QWidget)
         """
         super().__init__(parent)
         self.setupUi(self)
-        
+
         self.__vcs = vcs
         self.__repodir = repodir
-        
+
         self.__all = self.tr("<All>")
         self.__custom = self.tr("<Custom>")
-        
+
         remoteUrlsList = self.__vcs.gitGetRemoteUrlsList(self.__repodir)
         self.__repos = {name: url for name, url in remoteUrlsList}
-        
-        self.__okButton = self.buttonBox.button(
-            QDialogButtonBox.StandardButton.Ok)
-        
+
+        self.__okButton = self.buttonBox.button(QDialogButtonBox.StandardButton.Ok)
+
         self.remotesComboBox.addItems(sorted(self.__repos.keys()))
         self.remotesComboBox.addItem(self.__all)
         self.remotesComboBox.addItem(self.__custom)
-        
+
         index = self.remotesComboBox.findText("origin")
         if index == -1:
             index = 0
         self.remotesComboBox.setCurrentIndex(index)
-    
+
     def __okButtonEnable(self):
         """
         Private slot to set the enabled state of the OK button.
         """
         self.__okButton.setEnabled(
-            self.remoteBranchesList.count() > 0 or
-            self.remotesComboBox.currentText() == self.__all
+            self.remoteBranchesList.count() > 0
+            or self.remotesComboBox.currentText() == self.__all
         )
-    
+
     def __updateButtonEnable(self):
         """
         Private slot to set the enabled state of the update button.
@@ -66,14 +66,14 @@
         enable = remote != self.__all
         if remote == self.__custom:
             enable = self.remoteEdit.text() != ""
-        
+
         self.updateButton.setEnabled(enable)
-    
+
     @pyqtSlot(str)
     def on_remotesComboBox_currentTextChanged(self, txt):
         """
         Private slot to handle changes of the selected repository.
-        
+
         @param txt current text of the combo box (string)
         """
         self.remoteEdit.setReadOnly(txt != self.__custom)
@@ -82,35 +82,30 @@
         self.remoteBranchesList.clear()
         self.__updateButtonEnable()
         self.__okButtonEnable()
-        
+
         if txt not in [self.__all, self.__custom]:
-            remoteBranches = self.__vcs.gitGetRemoteBranchesList(
-                self.__repodir, txt)
+            remoteBranches = self.__vcs.gitGetRemoteBranchesList(self.__repodir, txt)
             self.remoteBranchesList.addItems(sorted(remoteBranches))
-            
+
             if txt in self.__repos:
                 self.remoteEdit.setText(self.__repos[txt])
-    
+
     @pyqtSlot(str)
     def on_remoteEdit_textChanged(self, txt):
         """
         Private slot to handle changes of the URL edit.
-        
+
         @param txt current text of the URL edit (string)
         """
         self.__updateButtonEnable()
-        
-        if (
-            self.remotesComboBox.currentText() == self.__custom and
-            txt != ""
-        ):
-            remoteBranches = self.__vcs.gitGetRemoteBranchesList(
-                self.__repodir, txt)
+
+        if self.remotesComboBox.currentText() == self.__custom and txt != "":
+            remoteBranches = self.__vcs.gitGetRemoteBranchesList(self.__repodir, txt)
             self.remoteBranchesList.clear()
             self.remoteBranchesList.addItems(sorted(remoteBranches))
-        
+
         self.__okButtonEnable()
-    
+
     @pyqtSlot()
     def on_updateButton_clicked(self):
         """
@@ -120,24 +115,23 @@
         if remote == self.__all:
             # shouldn't happen
             return
-        
+
         if remote == self.__custom:
             remote = self.remoteEdit.text()
             if remote == "":
                 # shouldn't happen either
                 return
-        
-        remoteBranches = self.__vcs.gitGetRemoteBranchesList(
-            self.__repodir, remote)
+
+        remoteBranches = self.__vcs.gitGetRemoteBranchesList(self.__repodir, remote)
         self.remoteBranchesList.clear()
         self.remoteBranchesList.addItems(sorted(remoteBranches))
-        
+
         self.__okButtonEnable()
-    
+
     def getData(self):
         """
         Public method to get the entered data.
-        
+
         @return tuple of remote name, remote url (for custom remotes),
             remote branches, a flag indicating to pull from all repositories
             and a flag indicating to remove obsolete tracking references
@@ -147,7 +141,7 @@
         url = ""
         branches = []
         allRepos = False
-        
+
         remoteRepo = self.remotesComboBox.currentText()
         if remoteRepo == self.__all:
             allRepos = True
@@ -158,5 +152,5 @@
                 remote = remoteRepo
             for itm in self.remoteBranchesList.selectedItems():
                 branches.append(itm.text())
-        
+
         return remote, url, branches, allRepos, self.pruneCheckBox.isChecked()