13 import copy |
13 import copy |
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 E4Gui.E4Application import e4App |
18 from E4Gui.E4Application import e5App |
19 |
19 |
20 import VCS |
20 import VCS |
21 from .CommandOptionsDialog import vcsCommandOptionsDialog |
21 from .CommandOptionsDialog import vcsCommandOptionsDialog |
22 from .RepositoryInfoDialog import VcsRepositoryInfoDialog |
22 from .RepositoryInfoDialog import VcsRepositoryInfoDialog |
23 |
23 |
128 should be performed |
128 should be performed |
129 """ |
129 """ |
130 if not self.project.checkDirty(): |
130 if not self.project.checkDirty(): |
131 return |
131 return |
132 |
132 |
133 vcsSystemsDict = e4App().getObject("PluginManager")\ |
133 vcsSystemsDict = e5App().getObject("PluginManager")\ |
134 .getPluginDisplayStrings("version_control") |
134 .getPluginDisplayStrings("version_control") |
135 vcsSystemsDisplay = [] |
135 vcsSystemsDisplay = [] |
136 keys = sorted(vcsSystemsDict.keys()) |
136 keys = sorted(vcsSystemsDict.keys()) |
137 for key in keys: |
137 for key in keys: |
138 vcsSystemsDisplay.append(vcsSystemsDict[key]) |
138 vcsSystemsDisplay.append(vcsSystemsDict[key]) |
299 pdata_vcs = self.project.pdata["VCS"][:] |
299 pdata_vcs = self.project.pdata["VCS"][:] |
300 pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"]) |
300 pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"]) |
301 pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) |
301 pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) |
302 vcs = self.project.vcs |
302 vcs = self.project.vcs |
303 vcsHelper = self.project.vcsProjectHelper |
303 vcsHelper = self.project.vcsProjectHelper |
304 vcsSystemsDict = e4App().getObject("PluginManager")\ |
304 vcsSystemsDict = e5App().getObject("PluginManager")\ |
305 .getPluginDisplayStrings("version_control") |
305 .getPluginDisplayStrings("version_control") |
306 vcsSystemsDisplay = [] |
306 vcsSystemsDisplay = [] |
307 keys = sorted(list(vcsSystemsDict.keys())) |
307 keys = sorted(list(vcsSystemsDict.keys())) |
308 for key in keys: |
308 for key in keys: |
309 vcsSystemsDisplay.append(vcsSystemsDict[key]) |
309 vcsSystemsDisplay.append(vcsSystemsDict[key]) |