eric: comparison Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py

-:9986ec0e559a
+:10516539f238
 # Copyright (c) 2003 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 """
-Module implementing a dialog to show the output of the svn diff command process.
+Module implementing a dialog to show the output of the svn diff command
+process.
 """
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 import os
 import pysvn
 from PyQt4.QtCore import QMutexLocker, QFileInfo, QDateTime, Qt, pyqtSlot
-from PyQt4.QtGui import QWidget, QColor, QCursor, QBrush, QApplication, QTextCursor, \
+from PyQt4.QtGui import QWidget, QColor, QCursor, QBrush, QApplication, \
-QDialogButtonBox
+QTextCursor, QDialogButtonBox
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
 from .SvnDialogMixin import SvnDialogMixin
 self.client.callback_ssl_server_trust_prompt = \
 self._clientSslServerTrustPromptCallback
 def __getVersionArg(self, version):
 """
-Private method to get a pysvn revision object for the given version number.
+Private method to get a pysvn revision object for the given version
+number.
 @param version revision (integer or string)
 @return revision object (pysvn.Revision)
 """
 if isinstance(version, int):
 def start(self, fn, versions=None, urls=None, summary=False, pegRev=None):
 """
 Public slot to start the svn diff command.
 @param fn filename to be diffed (string)
-@param versions list of versions to be diffed (list of up to 2 integer or None)
+@param versions list of versions to be diffed (list of up to 2 integer
+or None)
 @keyparam urls list of repository URLs (list of 2 strings)
 @keyparam summary flag indicating a summarizing diff
 (only valid for URL diffs) (boolean)
 @keyparam pegRev revision number the filename is valid (integer)
 """
 try:
 dname = e5App().getObject('Project').getRelativePath(dname)
 if dname:
 dname += "/"
 for name in fnames:
-self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name))
+self.__showError(
+self.trUtf8("Processing file '{0}'...\n").format(name))
 if urls is not None:
 url1 = "{0}/{1}{2}".format(urls[0], dname, name)
 url2 = "{0}/{1}{2}".format(urls[1], dname, name)
 if summary:
 diff_summary = self.client.diff_summarize(
 url_or_path2=url2, revision2=rev2,
 recurse=recurse)
 diff_list = []
 for diff_sum in diff_summary:
 diff_list.append("{0} {1}".format(
-self.__getDiffSummaryKind(diff_sum['summarize_kind']),
+self.__getDiffSummaryKind(
+diff_sum['summarize_kind']),
 diff_sum['path']))
 diffText = os.linesep.join(diff_list)
 else:
 diffText = self.client.diff(tmpdir,
 url1, revision1=rev1,
 url_or_path2=url2, revision2=rev2,
 recurse=recurse)
 else:
 if pegRev is not None:
-diffText = self.client.diff_peg(tmpdir, name,
+diffText = self.client.diff_peg(
+tmpdir, name,
 peg_revision=self.__getVersionArg(pegRev),
-revision_start=rev1, revision_end=rev2, recurse=recurse)
+revision_start=rev1, revision_end=rev2,
+recurse=recurse)
 else:
 diffText = self.client.diff(tmpdir, name,
 revision1=rev1, revision2=rev2, recurse=recurse)
 counter = 0
 for line in diffText.splitlines():
 """
 Private method to append text to the end of the contents pane.
 @param line line of text to insert (string)
 """
-if line.startswith('+') or line.startswith('>') or line.startswith('A '):
+if line.startswith('+') or line.startswith('>') or \
+line.startswith('A '):
 format = self.cAddedFormat
-elif line.startswith('-') or line.startswith('<') or line.startswith('D '):
+elif line.startswith('-') or line.startswith('<') or \
+line.startswith('D '):
 format = self.cRemovedFormat
 elif line.startswith('@@'):
 format = self.cLineNoFormat
 else:
 format = self.cNormalFormat
 if line.startswith('---'):
 self.__oldFileLine = self.paras
 self.__oldFile = self.__extractFileName(line)
 else:
 self.__fileSeparators.append(
-(self.__oldFile, self.__extractFileName(line), self.__oldFileLine))
+(self.__oldFile, self.__extractFileName(line),
+self.__oldFileLine))
 def __finish(self):
 """
 Private slot called when the user pressed the button.
 """
 self.filesCombo.addItem(self.trUtf8("<Start>"), 0)
 self.filesCombo.addItem(self.trUtf8("<End>"), -1)
 for oldFile, newFile, pos in sorted(self.__fileSeparators):
 if oldFile != newFile:
-self.filesCombo.addItem("{0}\n{1}".format(oldFile, newFile), pos)
+self.filesCombo.addItem(
+"{0}\n{1}".format(oldFile, newFile), pos)
 else:
 self.filesCombo.addItem(oldFile, pos)
 self._cancel()
 self.contents.ensureCursorVisible()
 # step 2: move cursor to desired line
 tc = self.contents.textCursor()
 delta = tc.blockNumber() - para
-tc.movePosition(QTextCursor.PreviousBlock, QTextCursor.MoveAnchor, delta)
+tc.movePosition(QTextCursor.PreviousBlock, QTextCursor.MoveAnchor,
+delta)
 self.contents.setTextCursor(tc)
 self.contents.ensureCursorVisible()
 @pyqtSlot()
 def on_saveButton_clicked(self):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py

Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py