eric: comparison src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py

-:e9e7eca7efee
+:bf71ee032bb4
 class HgDiffDialog(QWidget, Ui_HgDiffDialog):
 """
 Class implementing a dialog to show the output of the hg diff command
 process.
 """
 def __init__(self, vcs, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param parent parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
 self.refreshButton = self.buttonBox.addButton(
-self.tr("Refresh"), QDialogButtonBox.ButtonRole.ActionRole)
+self.tr("Refresh"), QDialogButtonBox.ButtonRole.ActionRole
-self.refreshButton.setToolTip(
+)
-self.tr("Press to refresh the display"))
+self.refreshButton.setToolTip(self.tr("Press to refresh the display"))
 self.refreshButton.setEnabled(False)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Save).setEnabled(False)
-QDialogButtonBox.StandardButton.Save).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Close).setDefault(True)
 self.searchWidget.attachTextEdit(self.contents)
 self.vcs = vcs
 font = Preferences.getEditorOtherFonts("MonospacedFont")
 self.contents.document().setDefaultFont(font)
 self.highlighter = HgDiffHighlighter(self.contents.document())
 self.__diffGenerator = HgDiffGenerator(vcs, self)
 self.__diffGenerator.finished.connect(self.__generatorFinished)
 def closeEvent(self, e):
 """
 Protected slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
 self.__diffGenerator.stopProcess()
 e.accept()
-def start(self, fn, versions=None, bundle=None, qdiff=False,
+def start(self, fn, versions=None, bundle=None, qdiff=False, refreshable=False):
-refreshable=False):
 """
 Public slot to start the hg diff command.
 @param fn filename to be diffed (string)
 @param versions list of versions to be diffed (list of up to
 2 strings or None)
 @param bundle name of a bundle file (string)
 @param qdiff flag indicating qdiff command shall be used (boolean)
 @param refreshable flag indicating a refreshable diff (boolean)
 """
 self.refreshButton.setVisible(refreshable)
 self.errorGroup.hide()
 self.filename = fn
 self.contents.clear()
 self.filesCombo.clear()
 self.highlighter.regenerateRules()
 if qdiff:
 self.setWindowTitle(self.tr("Patch Contents"))
 self.raise_()
 self.activateWindow()
 procStarted = self.__diffGenerator.start(
-fn, versions=versions, bundle=bundle, qdiff=qdiff)
+fn, versions=versions, bundle=bundle, qdiff=qdiff
+)
 if not procStarted:
 EricMessageBox.critical(
 self,
-self.tr('Process Generation Error'),
+self.tr("Process Generation Error"),
 self.tr(
-'The process {0} could not be started. '
+"The process {0} could not be started. "
-'Ensure, that it is in the search path.'
+"Ensure, that it is in the search path."
-).format('hg'))
+).format("hg"),
+)
 def __generatorFinished(self):
 """
 Private slot connected to the finished signal.
 """
 self.refreshButton.setEnabled(True)
 diff, errors, fileSeparators = self.__diffGenerator.getResult()
 if diff:
 self.contents.setPlainText("".join(diff))
 else:
-self.contents.setPlainText(
+self.contents.setPlainText(self.tr("There is no difference."))
-self.tr('There is no difference.'))
 if errors:
 self.errorGroup.show()
 self.errors.setPlainText("".join(errors))
 self.errors.ensureCursorVisible()
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Save).setEnabled(
-QDialogButtonBox.StandardButton.Save).setEnabled(bool(diff))
+bool(diff)
-self.buttonBox.button(
+)
-QDialogButtonBox.StandardButton.Close).setEnabled(True)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
-QDialogButtonBox.StandardButton.Close).setDefault(True)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setFocus(
-self.buttonBox.button(
+Qt.FocusReason.OtherFocusReason
-QDialogButtonBox.StandardButton.Close).setFocus(
+)
-Qt.FocusReason.OtherFocusReason)
 tc = self.contents.textCursor()
 tc.movePosition(QTextCursor.MoveOperation.Start)
 self.contents.setTextCursor(tc)
 self.contents.ensureCursorVisible()
 self.filesCombo.addItem(self.tr("<Start>"), 0)
 self.filesCombo.addItem(self.tr("<End>"), -1)
 for oldFile, newFile, pos in sorted(fileSeparators):
 if not oldFile:
 self.filesCombo.addItem(newFile, pos)
 elif oldFile != newFile:
-self.filesCombo.addItem(
+self.filesCombo.addItem("{0}\n{1}".format(oldFile, newFile), pos)
-"{0}\n{1}".format(oldFile, newFile), pos)
 else:
 self.filesCombo.addItem(oldFile, pos)
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 @param button button that was clicked (QAbstractButton)
 """
-if button == self.buttonBox.button(
+if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Save):
-QDialogButtonBox.StandardButton.Save
-):
 self.on_saveButton_clicked()
 elif button == self.refreshButton:
 self.on_refreshButton_clicked()
 @pyqtSlot(int)
 def on_filesCombo_activated(self, index):
 """
 Private slot to handle the selection of a file.
 @param index activated row (integer)
 """
 para = self.filesCombo.itemData(index)
 if para == 0:
 tc = self.contents.textCursor()
 tc.movePosition(QTextCursor.MoveOperation.Start)
 self.contents.setTextCursor(tc)
 self.contents.ensureCursorVisible()
 # step 1: move cursor to end
 tc = self.contents.textCursor()
 tc.movePosition(QTextCursor.MoveOperation.End)
 self.contents.setTextCursor(tc)
 self.contents.ensureCursorVisible()
 # step 2: move cursor to desired line
 tc = self.contents.textCursor()
 delta = tc.blockNumber() - para
-tc.movePosition(QTextCursor.MoveOperation.PreviousBlock,
+tc.movePosition(
-QTextCursor.MoveMode.MoveAnchor,
+QTextCursor.MoveOperation.PreviousBlock,
-delta)
+QTextCursor.MoveMode.MoveAnchor,
-self.contents.setTextCursor(tc)
+delta,
-self.contents.ensureCursorVisible()
+)
+self.contents.setTextCursor(tc)
+self.contents.ensureCursorVisible()
 @pyqtSlot()
 def on_saveButton_clicked(self):
 """
 Private slot to handle the Save button press.
 It saves the diff shown in the dialog to a file in the local
 filesystem.
 """
 if isinstance(self.filename, list):
 if len(self.filename) > 1:
 fname = self.vcs.splitPathList(self.filename)[0]
 else:
 dname, fname = self.vcs.splitPath(self.filename[0])
-if fname != '.':
+if fname != ".":
 fname = "{0}.diff".format(self.filename[0])
 else:
 fname = dname
 else:
 fname = self.vcs.splitPath(self.filename)[0]
 fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Save Diff"),
 fname,
 self.tr("Patch Files (*.diff)"),
 None,
-EricFileDialog.DontConfirmOverwrite)
+EricFileDialog.DontConfirmOverwrite,
+)
 if not fname:
 return  # user aborted
 fpath = pathlib.Path(fname)
 if not fpath.suffix:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fpath = fpath.with_suffix(ex)
 if fpath.exists():
 res = EricMessageBox.yesNo(
 self,
 self.tr("Save Diff"),
-self.tr("<p>The patch file <b>{0}</b> already exists."
+self.tr(
-" Overwrite it?</p>").format(fpath),
+"<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
-icon=EricMessageBox.Warning)
+).format(fpath),
+icon=EricMessageBox.Warning,
+)
 if not res:
 return
 eol = ericApp().getObject("Project").getEolString()
 try:
 with fpath.open("w", encoding="utf-8", newline="") as f:
 f.write(eol.join(self.contents.toPlainText().splitlines()))
 except OSError as why:
 EricMessageBox.critical(
-self, self.tr('Save Diff'),
+self,
+self.tr("Save Diff"),
 self.tr(
-'<p>The patch file <b>{0}</b> could not be saved.'
+"<p>The patch file <b>{0}</b> could not be saved."
-'<br>Reason: {1}</p>')
+"<br>Reason: {1}</p>"
-.format(fpath, str(why)))
+).format(fpath, str(why)),
+)
 @pyqtSlot()
 def on_refreshButton_clicked(self):
 """
 Private slot to refresh the display.
 """
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
-QDialogButtonBox.StandardButton.Close).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Save).setEnabled(False)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Save).setEnabled(False)
 self.refreshButton.setEnabled(False)
 self.start(self.filename, refreshable=True)

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py

src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py