diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Fri Jan 27 19:18:52 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,348 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing a dialog to show the output of the svn log command process.
-"""
-
-from __future__ import unicode_literals
-try:
- str = unicode
-except NameError:
- pass
-
-import os
-
-from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot, qVersion, \
- QByteArray
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox
-
-from E5Gui import E5MessageBox
-
-from .Ui_SvnLogDialog import Ui_SvnLogDialog
-
-import Utilities
-import Preferences
-
-
-class SvnLogDialog(QWidget, Ui_SvnLogDialog):
- """
- Class implementing a dialog to show the output of the svn log command
- process.
-
- The dialog is nonmodal. Clicking a link in the upper text pane shows
- a diff of the versions.
- """
- def __init__(self, vcs, isFile=False, parent=None):
- """
- Constructor
-
- @param vcs reference to the vcs object
- @param isFile flag indicating log for a file is to be shown (boolean)
- @param parent parent widget (QWidget)
- """
- super(SvnLogDialog, self).__init__(parent)
- self.setupUi(self)
-
- self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
-
- self.process = QProcess()
- self.vcs = vcs
-
- self.contents.setHtml(
- self.tr('<b>Processing your request, please wait...</b>'))
-
- self.process.finished.connect(self.__procFinished)
- self.process.readyReadStandardOutput.connect(self.__readStdout)
- self.process.readyReadStandardError.connect(self.__readStderr)
-
- self.contents.anchorClicked.connect(self.__sourceChanged)
-
- self.rx_sep = QRegExp('\\-+\\s*')
- self.rx_sep2 = QRegExp('=+\\s*')
- self.rx_rev = QRegExp(
- 'rev ([0-9]+): ([^|]*) \| ([^|]*) \| ([0-9]+) .*')
- # "rev" followed by one or more decimals followed by a colon followed
- # anything up to " | " (twice) followed by one or more decimals
- # followed by anything
- self.rx_rev2 = QRegExp(
- 'r([0-9]+) \| ([^|]*) \| ([^|]*) \| ([0-9]+) .*')
- # "r" followed by one or more decimals followed by " | " followed
- # anything up to " | " (twice) followed by one or more decimals
- # followed by anything
- self.rx_flags = QRegExp(' ([ADM])( .*)\\s*')
- # three blanks followed by A or D or M
- self.rx_changed = QRegExp('Changed .*\\s*')
-
- self.flags = {
- 'A': self.tr('Added'),
- 'D': self.tr('Deleted'),
- 'M': self.tr('Modified')
- }
-
- self.revisions = [] # stack of remembered revisions
- self.revString = self.tr('revision')
-
- self.buf = [] # buffer for stdout
- self.diff = None
-
- self.sbsCheckBox.setEnabled(isFile)
- self.sbsCheckBox.setVisible(isFile)
-
- def closeEvent(self, e):
- """
- Protected slot implementing a close event handler.
-
- @param e close event (QCloseEvent)
- """
- if self.process is not None and \
- self.process.state() != QProcess.NotRunning:
- self.process.terminate()
- QTimer.singleShot(2000, self.process.kill)
- self.process.waitForFinished(3000)
-
- e.accept()
-
- def start(self, fn, noEntries=0):
- """
- Public slot to start the cvs log command.
-
- @param fn filename to show the log for (string)
- @param noEntries number of entries to show (integer)
- """
- self.errorGroup.hide()
- QApplication.processEvents()
-
- self.intercept = False
- self.filename = fn
- self.dname, self.fname = self.vcs.splitPath(fn)
-
- self.process.kill()
-
- args = []
- args.append('log')
- self.vcs.addArguments(args, self.vcs.options['global'])
- self.vcs.addArguments(args, self.vcs.options['log'])
- if noEntries:
- args.append('--limit')
- args.append(str(noEntries))
- self.activateWindow()
- self.raise_()
- args.append(self.fname)
-
- self.process.setWorkingDirectory(self.dname)
-
- self.process.start('svn', args)
- procStarted = self.process.waitForStarted(5000)
- if not procStarted:
- self.inputGroup.setEnabled(False)
- E5MessageBox.critical(
- self,
- self.tr('Process Generation Error'),
- self.tr(
- 'The process {0} could not be started. '
- 'Ensure, that it is in the search path.'
- ).format('svn'))
-
- def __procFinished(self, exitCode, exitStatus):
- """
- Private slot connected to the finished signal.
-
- @param exitCode exit code of the process (integer)
- @param exitStatus exit status of the process (QProcess.ExitStatus)
- """
- self.inputGroup.setEnabled(False)
- self.inputGroup.hide()
-
- self.contents.clear()
-
- lvers = 1
- for s in self.buf:
- rev_match = False
- if self.rx_rev.exactMatch(s):
- ver = self.rx_rev.cap(1)
- author = self.rx_rev.cap(2)
- date = self.rx_rev.cap(3)
- # number of lines is ignored
- rev_match = True
- elif self.rx_rev2.exactMatch(s):
- ver = self.rx_rev2.cap(1)
- author = self.rx_rev2.cap(2)
- date = self.rx_rev2.cap(3)
- # number of lines is ignored
- rev_match = True
-
- if rev_match:
- dstr = '<b>{0} {1}</b>'.format(self.revString, ver)
- try:
- lv = self.revisions[lvers]
- lvers += 1
- url = QUrl()
- url.setScheme("file")
- url.setPath(self.filename)
- if qVersion() >= "5.0.0":
- query = lv + '_' + ver
- url.setQuery(query)
- else:
- query = QByteArray()
- query.append(lv).append('_').append(ver)
- url.setEncodedQuery(query)
- dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format(
- url.toString(), query,
- self.tr('diff to {0}').format(lv),
- )
- except IndexError:
- pass
- dstr += '<br />\n'
- self.contents.insertHtml(dstr)
-
- dstr = self.tr('<i>author: {0}</i><br />\n').format(author)
- self.contents.insertHtml(dstr)
-
- dstr = self.tr('<i>date: {0}</i><br />\n').format(date)
- self.contents.insertHtml(dstr)
-
- elif self.rx_sep.exactMatch(s) or self.rx_sep2.exactMatch(s):
- self.contents.insertHtml('<hr />\n')
-
- elif self.rx_flags.exactMatch(s):
- dstr = self.flags[self.rx_flags.cap(1)]
- dstr += self.rx_flags.cap(2)
- dstr += '<br />\n'
- self.contents.insertHtml(dstr)
-
- elif self.rx_changed.exactMatch(s):
- dstr = '<br />{0}<br />\n'.format(s)
- self.contents.insertHtml(dstr)
-
- else:
- if s == "":
- s = self.contents.insertHtml('<br />\n')
- else:
- self.contents.insertHtml(Utilities.html_encode(s))
- self.contents.insertHtml('<br />\n')
-
- tc = self.contents.textCursor()
- tc.movePosition(QTextCursor.Start)
- self.contents.setTextCursor(tc)
- self.contents.ensureCursorVisible()
-
- def __readStdout(self):
- """
- Private slot to handle the readyReadStandardOutput signal.
-
- It reads the output of the process and inserts it into a buffer.
- """
- self.process.setReadChannel(QProcess.StandardOutput)
-
- while self.process.canReadLine():
- line = str(self.process.readLine(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
- self.buf.append(line)
- if self.rx_rev.exactMatch(line):
- ver = self.rx_rev.cap(1)
- # save revision number for later use
- self.revisions.append(ver)
- elif self.rx_rev2.exactMatch(line):
- ver = self.rx_rev2.cap(1)
- # save revision number for later use
- self.revisions.append(ver)
-
- def __readStderr(self):
- """
- Private slot to handle the readyReadStandardError signal.
-
- It reads the error output of the process and inserts it into the
- error pane.
- """
- if self.process is not None:
- self.errorGroup.show()
- s = str(self.process.readAllStandardError(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
- self.errors.insertPlainText(s)
- self.errors.ensureCursorVisible()
-
- def __sourceChanged(self, url):
- """
- Private slot to handle the sourceChanged signal of the contents pane.
-
- @param url the url that was clicked (QUrl)
- """
- self.contents.setSource(QUrl(''))
- filename = url.path()
- if Utilities.isWindowsPlatform():
- if filename.startswith("/"):
- filename = filename[1:]
- if qVersion() >= "5.0.0":
- ver = url.query()
- else:
- ver = bytes(url.encodedQuery()).decode()
- v1 = ver.split('_')[0]
- v2 = ver.split('_')[1]
- if v1 == "" or v2 == "":
- return
- self.contents.scrollToAnchor(ver)
-
- if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked():
- self.vcs.svnSbsDiff(filename, revisions=(v1, v2))
- else:
- if self.diff is None:
- from .SvnDiffDialog import SvnDiffDialog
- self.diff = SvnDiffDialog(self.vcs)
- self.diff.show()
- self.diff.start(filename, [v1, v2])
-
- def on_passwordCheckBox_toggled(self, isOn):
- """
- Private slot to handle the password checkbox toggled.
-
- @param isOn flag indicating the status of the check box (boolean)
- """
- if isOn:
- self.input.setEchoMode(QLineEdit.Password)
- else:
- self.input.setEchoMode(QLineEdit.Normal)
-
- @pyqtSlot()
- def on_sendButton_clicked(self):
- """
- Private slot to send the input to the subversion process.
- """
- input = self.input.text()
- input += os.linesep
-
- if self.passwordCheckBox.isChecked():
- self.errors.insertPlainText(os.linesep)
- self.errors.ensureCursorVisible()
- else:
- self.errors.insertPlainText(input)
- self.errors.ensureCursorVisible()
-
- self.process.write(input)
-
- self.passwordCheckBox.setChecked(False)
- self.input.clear()
-
- def on_input_returnPressed(self):
- """
- Private slot to handle the press of the return key in the input field.
- """
- self.intercept = True
- self.on_sendButton_clicked()
-
- def keyPressEvent(self, evt):
- """
- Protected slot to handle a key press event.
-
- @param evt the key press event (QKeyEvent)
- """
- if self.intercept:
- self.intercept = False
- evt.accept()
- return
- super(SvnLogDialog, self).keyPressEvent(evt)
