14 import pysvn |
14 import pysvn |
15 |
15 |
16 from PyQt4.QtCore import * |
16 from PyQt4.QtCore import * |
17 from PyQt4.QtGui import * |
17 from PyQt4.QtGui import * |
18 |
18 |
19 from E4Gui.E4Application import e4App |
19 from E4Gui.E4Application import e5App |
20 |
20 |
21 from .SvnDialogMixin import SvnDialogMixin |
21 from .SvnDialogMixin import SvnDialogMixin |
22 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog |
22 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog |
23 |
23 |
24 import Utilities |
24 import Utilities |
184 |
184 |
185 locker = QMutexLocker(self.vcs.vcsExecutionMutex) |
185 locker = QMutexLocker(self.vcs.vcsExecutionMutex) |
186 cwd = os.getcwd() |
186 cwd = os.getcwd() |
187 os.chdir(dname) |
187 os.chdir(dname) |
188 try: |
188 try: |
189 ppath = e4App().getObject('Project').getProjectPath() |
189 ppath = e5App().getObject('Project').getProjectPath() |
190 dname = dname.replace(ppath, '') |
190 dname = dname.replace(ppath, '') |
191 if dname: |
191 if dname: |
192 dname += "/" |
192 dname += "/" |
193 for name in fnames: |
193 for name in fnames: |
194 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) |
194 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) |