13 import pysvn |
13 import pysvn |
14 |
14 |
15 from PyQt4.QtCore import * |
15 from PyQt4.QtCore import * |
16 from PyQt4.QtGui import * |
16 from PyQt4.QtGui import * |
17 |
17 |
18 from SvnUtilities import formatTime |
18 from .SvnUtilities import formatTime |
19 |
19 |
20 from SvnDialogMixin import SvnDialogMixin |
20 from .SvnDialogMixin import SvnDialogMixin |
21 from Ui_SvnLogDialog import Ui_SvnLogDialog |
21 from .Ui_SvnLogDialog import Ui_SvnLogDialog |
22 from SvnDiffDialog import SvnDiffDialog |
22 from .SvnDiffDialog import SvnDiffDialog |
23 |
23 |
24 import Utilities |
24 import Utilities |
25 |
25 |
26 class SvnLogDialog(QWidget, SvnDialogMixin, Ui_SvnLogDialog): |
26 class SvnLogDialog(QWidget, SvnDialogMixin, Ui_SvnLogDialog): |
27 """ |
27 """ |
168 changeInfo["copyfrom_revision"].number) |
168 changeInfo["copyfrom_revision"].number) |
169 dstr += '<br />\n' |
169 dstr += '<br />\n' |
170 self.contents.insertHtml(dstr) |
170 self.contents.insertHtml(dstr) |
171 |
171 |
172 self.contents.insertHtml('<hr /><br />\n') |
172 self.contents.insertHtml('<hr /><br />\n') |
173 except pysvn.ClientError, e: |
173 except pysvn.ClientError as e: |
174 locker.unlock() |
174 locker.unlock() |
175 self.__showError(e.args[0]) |
175 self.__showError(e.args[0]) |
176 os.chdir(cwd) |
176 os.chdir(cwd) |
177 self.__finish() |
177 self.__finish() |
178 |
178 |
213 self.contents.setSource(QUrl('')) |
213 self.contents.setSource(QUrl('')) |
214 filename = url.path() |
214 filename = url.path() |
215 if Utilities.isWindowsPlatform(): |
215 if Utilities.isWindowsPlatform(): |
216 if filename.startswith("/"): |
216 if filename.startswith("/"): |
217 filename = filename[1:] |
217 filename = filename[1:] |
218 ver = unicode(url.encodedQuery()) |
218 ver = str(url.encodedQuery()) |
219 v1 = ver.split('_')[0] |
219 v1 = ver.split('_')[0] |
220 v2 = ver.split('_')[1] |
220 v2 = ver.split('_')[1] |
221 if not v1 or not v2: |
221 if not v1 or not v2: |
222 return |
222 return |
223 try: |
223 try: |