eric: comparison UI/DiffDialog.py

-:9986ec0e559a
+:10516539f238
 # The header lines contain a tab after the filename.
 def context_diff(a, b, fromfile='', tofile='',
 fromfiledate='', tofiledate='', n=3, lineterm='\n'):
-"""
+r"""
 Compare two sequences of lines; generate the delta as a context diff.
 Context diffs are a compact way of showing line changes and a few
 lines of context.  The number of context lines is set by 'n' which
 defaults to three.
 by time.ctime().  If not specified, the strings default to blanks.
 Example:
 <pre>
-&gt;&gt;&gt; print ''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
+&gt;&gt;&gt; print ''.join(
+...       context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
 ...       'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
 ...       'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
 *** Original Sat Jan 26 23:30:50 1991
 --- Current Fri Jun 06 10:22:46 2003
 ***************
 @param tofiledate modification time of the second file (string)
 @param n number of lines of context (integer)
 @param lineterm line termination string (string)
 @return a generator yielding lines of differences
 """
 started = False
-prefixmap = {'insert': '+ ', 'delete': '- ', 'replace': '! ', 'equal': '  '}
+prefixmap = {'insert': '+ ', 'delete': '- ', 'replace': '! ',
+'equal': '  '}
 for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n):
 if not started:
 yield '*** {0}\t{1}{2}'.format(fromfile, fromfiledate, lineterm)
 yield '--- {0}\t{1}{2}'.format(tofile, tofiledate, lineterm)
 started = True
 yield '***************{0}'.format(lineterm)
 if group[-1][2] - group[0][1] >= 2:
-yield '*** {0:d},{1:d} ****{2}'.format(group[0][1] + 1, group[-1][2], lineterm)
+yield '*** {0:d},{1:d} ****{2}'.format(
+group[0][1] + 1, group[-1][2], lineterm)
 else:
 yield '*** {0:d} ****{1}'.format(group[-1][2], lineterm)
 visiblechanges = [e for e in group if e[0] in ('replace', 'delete')]
 if visiblechanges:
 for tag, i1, i2, _, _ in group:
 if tag != 'insert':
 for line in a[i1:i2]:
 yield prefixmap[tag] + line
 if group[-1][4] - group[0][3] >= 2:
-yield '--- {0:d},{1:d} ----{2}'.format(group[0][3] + 1, group[-1][4], lineterm)
+yield '--- {0:d},{1:d} ----{2}'.format(
+group[0][3] + 1, group[-1][4], lineterm)
 else:
 yield '--- {0:d} ----{1}'.format(group[-1][4], lineterm)
 visiblechanges = [e for e in group if e[0] in ('replace', 'insert')]
 if visiblechanges:
 for tag, _, _, j1, j2 in group:
 Class implementing a dialog to compare two files.
 """
 def __init__(self, parent=None):
 """
 Constructor
+@param parent reference to the parent widget (QWidget)
 """
 super(DiffDialog, self).__init__(parent)
 self.setupUi(self)
 self.file1Completer = E5FileCompleter(self.file1Edit)
 self.file2Completer = E5FileCompleter(self.file2Edit)
-self.diffButton = \
+self.diffButton = self.buttonBox.addButton(
-self.buttonBox.addButton(self.trUtf8("Compare"), QDialogButtonBox.ActionRole)
+self.trUtf8("Compare"), QDialogButtonBox.ActionRole)
 self.diffButton.setToolTip(
 self.trUtf8("Press to perform the comparison of the two files"))
-self.saveButton = \
+self.saveButton = self.buttonBox.addButton(
-self.buttonBox.addButton(self.trUtf8("Save"), QDialogButtonBox.ActionRole)
+self.trUtf8("Save"), QDialogButtonBox.ActionRole)
-self.saveButton.setToolTip(self.trUtf8("Save the output to a patch file"))
+self.saveButton.setToolTip(
+self.trUtf8("Save the output to a patch file"))
 self.diffButton.setEnabled(False)
 self.saveButton.setEnabled(False)
 self.diffButton.setDefault(True)
 self.filename1 = ''
 f.write(txt)
 except UnicodeError:
 pass
 f.close()
 except IOError as why:
-E5MessageBox.critical(self, self.trUtf8('Save Diff'),
+E5MessageBox.critical(
-self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.<br />'
+self, self.trUtf8('Save Diff'),
-'Reason: {1}</p>')
+self.trUtf8(
-.format(fname, str(why)))
+'<p>The patch file <b>{0}</b> could not be saved.<br />'
+'Reason: {1}</p>').format(fname, str(why)))
 @pyqtSlot()
 def on_diffButton_clicked(self):
 """
 Private slot to handle the Compare button press.
 lines1 = f1.readlines()
 f1.close()
 except IOError:
 E5MessageBox.critical(self,
 self.trUtf8("Compare Files"),
-self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""")
+self.trUtf8(
+"""<p>The file <b>{0}</b> could not be read.</p>""")
 .format(self.filename1))
 return
 self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text())
 try:
 lines2 = f2.readlines()
 f2.close()
 except IOError:
 E5MessageBox.critical(self,
 self.trUtf8("Compare Files"),
-self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""")
+self.trUtf8(
+"""<p>The file <b>{0}</b> could not be read.</p>""")
 .format(self.filename2))
 return
 self.contents.clear()
 self.saveButton.setEnabled(False)
 if self.unifiedRadioButton.isChecked():
-self.__generateUnifiedDiff(lines1, lines2, self.filename1, self.filename2,
+self.__generateUnifiedDiff(
-filemtime1, filemtime2)
+lines1, lines2, self.filename1, self.filename2,
+filemtime1, filemtime2)
 else:
-self.__generateContextDiff(lines1, lines2, self.filename1, self.filename2,
+self.__generateContextDiff(
-filemtime1, filemtime2)
+lines1, lines2, self.filename1, self.filename2,
+filemtime1, filemtime2)
 tc = self.contents.textCursor()
 tc.movePosition(QTextCursor.Start)
 self.contents.setTextCursor(tc)
 self.contents.ensureCursorVisible()
 paras += 1
 if not (paras % self.updateInterval):
 QApplication.processEvents()
 if paras == 0:
-self.__appendText(self.trUtf8('There is no difference.'), self.cNormalFormat)
+self.__appendText(
+self.trUtf8('There is no difference.'), self.cNormalFormat)
 def __generateContextDiff(self, a, b, fromfile, tofile,
 fromfiledate, tofiledate):
 """
 Private slot to generate a context diff output.
 format = self.cAddedFormat
 elif line.startswith('- '):
 format = self.cRemovedFormat
 elif line.startswith('! '):
 format = self.cReplacedFormat
-elif (line.startswith('*** ') or line.startswith('--- ')) and paras > 1:
+elif (line.startswith('*** ') or line.startswith('--- ')) and \
+paras > 1:
 format = self.cLineNoFormat
 else:
 format = self.cNormalFormat
 self.__appendText(line, format)
 paras += 1
 if not (paras % self.updateInterval):
 QApplication.processEvents()
 if paras == 0:
-self.__appendText(self.trUtf8('There is no difference.'), self.cNormalFormat)
+self.__appendText(
+self.trUtf8('There is no difference.'), self.cNormalFormat)
 def __fileChanged(self):
 """
 Private slot to enable/disable the Compare button.
 """
 @param parent reference to the parent widget (QWidget)
 """
 super(DiffWindow, self).__init__(parent)
-self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
+self.setStyle(Preferences.getUI("Style"),
+Preferences.getUI("StyleSheet"))
 self.cw = DiffDialog(self)
 self.cw.installEventFilter(self)
 size = self.cw.size()
 self.setCentralWidget(self.cw)

Mercurial Repositories > eric / file comparison

comparison: UI/DiffDialog.py

UI/DiffDialog.py