Mercurial Repositories > eric / file comparison
comparison: VCS/ProjectHelper.py
VCS/ProjectHelper.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 16 from PyQt4.QtGui import * | 16 from PyQt4.QtGui import * |
| 17 | 17 |
| 18 from E4Gui.E4Application import e4App | 18 from E4Gui.E4Application import e4App |
| 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 |
| 24 from E4Gui.E4Action import E4Action | 24 from E4Gui.E4Action import E4Action |
| 25 | 25 |
| 26 import Utilities | 26 import Utilities |
| 27 import Preferences | 27 import Preferences |
| 142 self.trUtf8("Select version control system for the project"), | 142 self.trUtf8("Select version control system for the project"), |
| 143 vcsSystemsDisplay, | 143 vcsSystemsDisplay, |
| 144 0, False) | 144 0, False) |
| 145 if not ok: | 145 if not ok: |
| 146 return | 146 return |
| 147 for vcsSystem, vcsSystemDisplay in vcsSystemsDict.items(): | 147 for vcsSystem, vcsSystemDisplay in list(vcsSystemsDict.items()): |
| 148 if vcsSystemDisplay == vcsSelected: | 148 if vcsSystemDisplay == vcsSelected: |
| 149 break | 149 break |
| 150 | 150 |
| 151 self.project.pdata["VCS"] = [vcsSystem] | 151 self.project.pdata["VCS"] = [vcsSystem] |
| 152 self.project.vcs = self.project.initVCS(vcsSystem) | 152 self.project.vcs = self.project.initVCS(vcsSystem) |
| 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 = e4App().getObject("PluginManager")\ |
| 305 .getPluginDisplayStrings("version_control") | 305 .getPluginDisplayStrings("version_control") |
| 306 vcsSystemsDisplay = [] | 306 vcsSystemsDisplay = [] |
| 307 keys = vcsSystemsDict.keys() | 307 keys = sorted(list(vcsSystemsDict.keys())) |
| 308 keys.sort() | |
| 309 for key in keys: | 308 for key in keys: |
| 310 vcsSystemsDisplay.append(vcsSystemsDict[key]) | 309 vcsSystemsDisplay.append(vcsSystemsDict[key]) |
| 311 vcsSelected, ok = QInputDialog.getItem(\ | 310 vcsSelected, ok = QInputDialog.getItem(\ |
| 312 None, | 311 None, |
| 313 self.trUtf8("Import Project"), | 312 self.trUtf8("Import Project"), |
| 314 self.trUtf8("Select version control system for the project"), | 313 self.trUtf8("Select version control system for the project"), |
| 315 vcsSystemsDisplay, | 314 vcsSystemsDisplay, |
| 316 0, False) | 315 0, False) |
| 317 if not ok: | 316 if not ok: |
| 318 return | 317 return |
| 319 for vcsSystem, vcsSystemDisplay in vcsSystemsDict.items(): | 318 for vcsSystem, vcsSystemDisplay in list(vcsSystemsDict.items()): |
| 320 if vcsSystemDisplay == vcsSelected: | 319 if vcsSystemDisplay == vcsSelected: |
| 321 break | 320 break |
| 322 | 321 |
| 323 self.project.pdata["VCS"] = [vcsSystem] | 322 self.project.pdata["VCS"] = [vcsSystem] |
| 324 self.project.vcs = self.project.initVCS(vcsSystem) | 323 self.project.vcs = self.project.initVCS(vcsSystem) |
