eric: comparison eric7/VCS/StatusWidget.py

-:8c9f41115c04
+:149d51870ce8
 self.__statusList.setTextElideMode(Qt.TextElideMode.ElideLeft)
 self.__statusList.setSelectionMode(
 QAbstractItemView.SelectionMode.ExtendedSelection)
 self.__statusList.itemSelectionChanged.connect(
 self.__updateButtonStates)
+self.__statusList.itemDoubleClicked.connect(self.__itemDoubleClicked)
 self.__layout.addWidget(self.__statusList)
 self.setLayout(self.__layout)
 self.__statusIcons = {
 self.__actionsMenu.aboutToShow.connect(self.__showActionsMenu)
 self.__commitAct = self.__actionsMenu.addAction(
 UI.PixmapCache.getIcon("vcsCommit"),
 self.tr("Commit"), self.__commit)
-self.__commitAct.setToolTip(self.tr("Commit the selected changes"))
+self.__commitAct.setToolTip(self.tr(
+"Commit the selected changes"))
 self.__commitSelectAct = self.__actionsMenu.addAction(
 self.tr("Select all for commit"), self.__commitSelectAll)
 self.__commitDeselectAct = self.__actionsMenu.addAction(
 self.tr("Unselect all from commit"), self.__commitDeselectAll)
 self.__actionsMenu.addSeparator()
 self.__addAct = self.__actionsMenu.addAction(
 UI.PixmapCache.getIcon("vcsAdd"),
 self.tr("Add"), self.__addUntracked)
+self.__addAct.setToolTip(self.tr(
+"Add the selected, untracked entries"))
+self.__addAllAct = self.__actionsMenu.addAction(
+self.tr("Add All"), self.__addAllUntracked)
+self.__addAllAct.setToolTip(self.tr(
+"Add all untracked entries"))
 self.__actionsMenu.addSeparator()
 self.__diffAct = self.__actionsMenu.addAction(
 UI.PixmapCache.getIcon("vcsDiff"),
 UI.PixmapCache.getIcon("vcsSbsDiff"),
 self.tr("Differences Side-By-Side"), self.__sbsDiff)
 self.__sbsDiffAct.setToolTip(self.tr(
 "Shows the differences of the selected entry side-by-side in"
 " a separate dialog"))
+self.__diffAllAct = self.__actionsMenu.addAction(
+self.tr("All Differences"), self.__diffAll)
+self.__diffAllAct.setToolTip(self.tr(
+"Shows the differences of all entries in a separate dialog"))
 self.__actionsMenu.addSeparator()
 self.__revertAct = self.__actionsMenu.addAction(
 UI.PixmapCache.getIcon("vcsRevert"),
 self.__editAct = self.__actionsMenu.addAction(
 UI.PixmapCache.getIcon("open"),
 self.tr("Edit Conflict"), self.__editConflict)
 self.__editAct.setToolTip(self.tr(
 "Edit the selected conflicting file"))
-# TODO: add menu entry for 'Conflict Resolved'
+self.__resolvedAct = self.__actionsMenu.addAction(
+UI.PixmapCache.getIcon("vcsResolved"),
+self.tr("Conflict Resolved"), self.__conflictResolved)
+self.__resolvedAct.setToolTip(self.tr(
+"Mark the selected conflicting file as resolved"))
 self.__actionsButton.setMenu(self.__actionsMenu)
 @pyqtSlot()
 def __projectOpened(self):
 def __updateButtonStates(self):
 """
 Private method to set the button states depending on the list state.
 """
 modified = len(self.__getModifiedItems())
-unversioned = len(self.__getUnversionedItems())
+unversioned = len(self.__getSelectedUnversionedItems())
 commitable = len(self.__getCommitableItems())
 self.__commitToggleButton.setEnabled(modified)
 self.__commitButton.setEnabled(commitable)
 self.__addButton.setEnabled(unversioned)
 Private slot to deselect all entries from commit.
 """
 self.__setCheckMark(False)
 @pyqtSlot()
-def __addUntracked(self):
+def __addUntracked(self, allItems=False):
 """
 Private slot to add the selected untracked entries.
-"""
-projectPath = self.__project.getProjectPath()
+@param allItems flag indicating to show the differences of all files
+(defaults to False)
-names = [os.path.join(projectPath, itm.text())
+@type bool (optional)
-for itm in self.__getUnversionedItems()]
+"""
+projectPath = self.__project.getProjectPath()
+names = [
+os.path.join(projectPath, itm.text())
+for itm in self.__getUnversionedItems()
+] if allItems else [
+os.path.join(projectPath, itm.text())
+for itm in self.__getSelectedUnversionedItems()
+]
 if not names:
 EricMessageBox.information(
 self,
 self.tr("Add"),
 vcs = self.__project.getVcs()
 vcs and vcs.vcsAdd(names)
 self.__reload()
+@pyqtSlot(QListWidgetItem)
+def __itemDoubleClicked(self, itm):
+"""
+Private slot to handle double clicking an item.
+@param itm reference to the double clicked item
+@type QListWidgetItem
+"""
+projectPath = self.__project.getProjectPath()
+if itm.data(self.StatusDataRole) in "MZ":
+# modified and conflicting items
+name = os.path.join(projectPath, itm.text())
+vcs = self.__project.getVcs()
+vcs and vcs.vcsDiff(name)
 ###########################################################################
 ## Menu handling methods
 ###########################################################################
 def __showActionsMenu(self):
 """
 Private slot to prepare the actions button menu before it is shown.
 """
 modified = len(self.__getSelectedModifiedItems())
-unversioned = len(self.__getUnversionedItems())
+allModified = len(self.__getModifiedItems())
+unversioned = len(self.__getSelectedUnversionedItems())
+allUnversioned = len(self.__getUnversionedItems())
 missing = len(self.__getMissingItems())
 commitable = len(self.__getCommitableItems())
 commitableUnselected = len(self.__getCommitableUnselectedItems())
 conflicting = len(self.__getSelectedConflictingItems())
 self.__addAct.setEnabled(unversioned)
+self.__addAllAct.setEnabled(allUnversioned)
 self.__diffAct.setEnabled(modified)
 self.__sbsDiffAct.setEnabled(modified == 1)
+self.__diffAllAct.setEnabled(allModified)
 self.__revertAct.setEnabled(modified)
 self.__forgetAct.setEnabled(missing)
 self.__restoreAct.setEnabled(missing)
 self.__commitAct.setEnabled(commitable)
 self.__commitSelectAct.setEnabled(commitableUnselected)
 self.__commitDeselectAct.setEnabled(commitable)
 self.__editAct.setEnabled(conflicting == 1)
+self.__resolvedAct.setEnabled(conflicting)
 def __getCommitableItems(self):
 """
 Private method to retrieve all entries the user wants to commit.
 status.
 @return list of all items with an unversioned status
 @rtype list of QListWidgetItem
 """
+items = []
+for row in range(self.__statusList.count()):
+itm = self.__statusList.item(row)
+if itm.data(self.StatusDataRole) == "?":
+items.append(itm)
+return items
+def __getSelectedUnversionedItems(self):
+"""
+Private method to retrieve all selected entries, that have an
+unversioned status.
+@return list of all items with an unversioned status
+@rtype list of QListWidgetItem
+"""
 return [itm for itm in self.__statusList.selectedItems()
 if itm.data(self.StatusDataRole) == "?"]
 def __getMissingItems(self):
 """
 """
 return [itm for itm in self.__statusList.selectedItems()
 if itm.data(self.StatusDataRole) == "Z"]
 @pyqtSlot()
-def __diff(self):
+def __addAllUntracked(self):
 """
-Private slot to handle the Diff action menu entry.
+Private slot to handle the Add All action menu entry.
+"""
+self.__addUntracked(allItems=True)
+@pyqtSlot()
+def __diff(self, allItems=False):
+"""
+Private slot to handle the Differences action menu entry.
+@param allItems flag indicating to show the differences of all files
+(defaults to False)
+@type bool (optional)
+"""
+projectPath = self.__project.getProjectPath()
+names = [
+os.path.join(projectPath, itm.text())
+for itm in self.__getModifiedItems()
+] if allItems else [
+os.path.join(projectPath, itm.text())
+for itm in self.__getSelectedModifiedItems()
+]
+if not names:
+EricMessageBox.information(
+self,
+self.tr("Differences"),
+self.tr("""There are no uncommitted changes"""
+""" available/selected."""))
+return
+vcs = self.__project.getVcs()
+vcs and vcs.vcsDiff(names)
+@pyqtSlot()
+def __diffAll(self):
+"""
+Private slot to handle the All Differences action menu entry.
+"""
+self.__diff(allItems=True)
+@pyqtSlot()
+def __sbsDiff(self):
+"""
+Private slot to handle the Side-By-Side Differences action menu entry.
 """
 projectPath = self.__project.getProjectPath()
 names = [os.path.join(projectPath, itm.text())
 for itm in self.__getSelectedModifiedItems()]
 if not names:
 EricMessageBox.information(
 self,
-self.tr("Differences"),
+self.tr("Differences Side-By-Side"),
 self.tr("""There are no uncommitted changes"""
 """ available/selected."""))
 return
+elif len(names) > 1:
+EricMessageBox.information(
+self,
+self.tr("Differences Side-By-Side"),
+self.tr("""Only one file with uncommitted changes"""
+""" must be selected."""))
+return
 vcs = self.__project.getVcs()
-vcs and vcs.vcsDiff(names)
+vcs and vcs.vcsSbsDiff(names[0])
 @pyqtSlot()
-def __sbsDiff(self):
+def __revert(self):
 """
-Private slot to handle the Side-By-Side Diff action menu entry.
+Private slot to handle the Revert action menu entry.
 """
 projectPath = self.__project.getProjectPath()
 names = [os.path.join(projectPath, itm.text())
 for itm in self.__getSelectedModifiedItems()]
 if not names:
 EricMessageBox.information(
 self,
-self.tr("Differences Side-By-Side"),
-self.tr("""There are no uncommitted changes"""
-""" available/selected."""))
-return
-elif len(names) > 1:
-EricMessageBox.information(
-self,
-self.tr("Differences Side-By-Side"),
-self.tr("""Only one file with uncommitted changes"""
-""" must be selected."""))
-return
-vcs = self.__project.getVcs()
-vcs and vcs.vcsSbsDiff(names[0])
-def __revert(self):
-"""
-Private slot to handle the Revert action menu entry.
-"""
-projectPath = self.__project.getProjectPath()
-names = [os.path.join(projectPath, itm.text())
-for itm in self.__getSelectedModifiedItems()]
-if not names:
-EricMessageBox.information(
-self,
 self.tr("Revert"),
 self.tr("""There are no uncommitted changes"""
 """ available/selected."""))
 return
 vcs = self.__project.getVcs()
 vcs and vcs.vcsRevert(names)
 self.__reload()
+@pyqtSlot()
 def __forgetMissing(self):
 """
 Private slot to handle the Forget action menu entry.
 """
 projectPath = self.__project.getProjectPath()
 vcs = self.__project.getVcs()
 vcs and vcs.vcsForget(names)
 self.__reload()
+@pyqtSlot()
 def __restoreMissing(self):
 """
 Private slot to handle the Restore Missing context menu entry.
 """
 projectPath = self.__project.getProjectPath()
 vcs = self.__project.getVcs()
 vcs and vcs.vcsRevert(names)
 self.__reload()
+@pyqtSlot()
 def __editConflict(self):
 """
 Private slot to handle the Edit Conflict action menu entry.
 """
 projectPath = self.__project.getProjectPath()
 itm = self.__getSelectedConflictingItems()[0]
 filename = os.path.join(projectPath, itm.text())
 if Utilities.MimeTypes.isTextFile(filename):
 self.__vm.getEditor(filename)
+@pyqtSlot()
+def __conflictResolved(self):
+"""
+Private slot to handle the Conflict Resolved action menu entry.
+"""
+projectPath = self.__project.getProjectPath()
+names = [os.path.join(projectPath, itm.text())
+for itm in self.__getSelectedConflictingItems()]
+if not names:
+EricMessageBox.information(
+self,
+self.tr("Conflict Resolved"),
+self.tr("""There are no conflicting entries"""
+""" available/selected."""))
+return
+vcs = self.__project.getVcs()
+vcs and vcs.vcsResolved(names)
+self.__reload()

Mercurial Repositories > eric / file comparison

comparison: eric7/VCS/StatusWidget.py

eric7/VCS/StatusWidget.py