Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py

changeset 53
c3eb7cc1ff8b
parent 45
9a18f4dbb493
child 55
b5c84934de9c
equal deleted inserted replaced
52:ba69827929ee 53:c3eb7cc1ff8b
12 import types 12 import types
13 13
14 from PyQt4.QtCore import * 14 from PyQt4.QtCore import *
15 from PyQt4.QtGui import * 15 from PyQt4.QtGui import *
16 16
17 from E4Gui.E4Application import e4App 17 from E4Gui.E4Application import e5App
18 18
19 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog 19 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog
20 20
21 import Utilities 21 import Utilities
22 import Preferences 22 import Preferences
141 if isinstance(fn, list): 141 if isinstance(fn, list):
142 dname, fnames = self.vcs.splitPathList(fn) 142 dname, fnames = self.vcs.splitPathList(fn)
143 else: 143 else:
144 dname, fname = self.vcs.splitPath(fn) 144 dname, fname = self.vcs.splitPath(fn)
145 fnames = [fname] 145 fnames = [fname]
146 ppath = e4App().getObject('Project').getProjectPath() 146 ppath = e5App().getObject('Project').getProjectPath()
147 if dname == ppath: 147 if dname == ppath:
148 path = "" 148 path = ""
149 else: 149 else:
150 path = dname.replace(ppath + os.sep, '') 150 path = dname.replace(ppath + os.sep, '')
151 if path: 151 if path:

eric ide

mercurial