Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2911
- ce77f0b1ee67
- parent 3009
- bf5ae5d7477d
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 14 pass | 14 pass |
| 15 | 15 |
| 16 import os | 16 import os |
| 17 | 17 |
| 18 from PyQt4.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot | 18 from PyQt4.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot |
| 19 from PyQt4.QtGui import QWidget, QLineEdit, QApplication, QTextCursor, QDialogButtonBox | 19 from PyQt4.QtGui import QWidget, QLineEdit, QApplication, QTextCursor, \ |
| 20 QDialogButtonBox | |
| 20 | 21 |
| 21 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 22 | 23 |
| 23 from .Ui_SvnLogDialog import Ui_SvnLogDialog | 24 from .Ui_SvnLogDialog import Ui_SvnLogDialog |
| 24 | 25 |
| 26 import Preferences | 27 import Preferences |
| 27 | 28 |
| 28 | 29 |
| 29 class SvnLogDialog(QWidget, Ui_SvnLogDialog): | 30 class SvnLogDialog(QWidget, Ui_SvnLogDialog): |
| 30 """ | 31 """ |
| 31 Class implementing a dialog to show the output of the svn log command process. | 32 Class implementing a dialog to show the output of the svn log command |
| 33 process. | |
| 32 | 34 |
| 33 The dialog is nonmodal. Clicking a link in the upper text pane shows | 35 The dialog is nonmodal. Clicking a link in the upper text pane shows |
| 34 a diff of the versions. | 36 a diff of the versions. |
| 35 """ | 37 """ |
| 36 def __init__(self, vcs, isFile=False, parent=None): | 38 def __init__(self, vcs, isFile=False, parent=None): |
| 58 | 60 |
| 59 self.contents.anchorClicked.connect(self.__sourceChanged) | 61 self.contents.anchorClicked.connect(self.__sourceChanged) |
| 60 | 62 |
| 61 self.rx_sep = QRegExp('\\-+\\s*') | 63 self.rx_sep = QRegExp('\\-+\\s*') |
| 62 self.rx_sep2 = QRegExp('=+\\s*') | 64 self.rx_sep2 = QRegExp('=+\\s*') |
| 63 self.rx_rev = QRegExp('rev ([0-9]+): ([^|]*) \| ([^|]*) \| ([0-9]+) .*') | 65 self.rx_rev = QRegExp( |
| 66 'rev ([0-9]+): ([^|]*) \| ([^|]*) \| ([0-9]+) .*') | |
| 64 # "rev" followed by one or more decimals followed by a colon followed | 67 # "rev" followed by one or more decimals followed by a colon followed |
| 65 # anything up to " | " (twice) followed by one or more decimals followed | 68 # anything up to " | " (twice) followed by one or more decimals |
| 66 # by anything | 69 # followed by anything |
| 67 self.rx_rev2 = QRegExp('r([0-9]+) \| ([^|]*) \| ([^|]*) \| ([0-9]+) .*') | 70 self.rx_rev2 = QRegExp( |
| 71 'r([0-9]+) \| ([^|]*) \| ([^|]*) \| ([0-9]+) .*') | |
| 68 # "r" followed by one or more decimals followed by " | " followed | 72 # "r" followed by one or more decimals followed by " | " followed |
| 69 # anything up to " | " (twice) followed by one or more decimals followed | 73 # anything up to " | " (twice) followed by one or more decimals |
| 70 # by anything | 74 # followed by anything |
| 71 self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') | 75 self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') |
| 72 # three blanks followed by A or D or M | 76 # three blanks followed by A or D or M |
| 73 self.rx_changed = QRegExp('Changed .*\\s*') | 77 self.rx_changed = QRegExp('Changed .*\\s*') |
| 74 | 78 |
| 75 self.flags = { | 79 self.flags = { |
