Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 4058
- 99ec13e695f9
- parent 4021
- 195a471c327b
- child 4079
- a3319822d303
equal
deleted
inserted
replaced
| 4054:3ef699270e61 | 4058:99ec13e695f9 |
|---|---|
| 1325 subrepoMenu.addAction(self.hgRemoveSubreposAct) | 1325 subrepoMenu.addAction(self.hgRemoveSubreposAct) |
| 1326 | 1326 |
| 1327 changesMenu = QMenu(self.tr("Manage Changes"), menu) | 1327 changesMenu = QMenu(self.tr("Manage Changes"), menu) |
| 1328 changesMenu.setTearOffEnabled(True) | 1328 changesMenu.setTearOffEnabled(True) |
| 1329 changesMenu.addAction(self.vcsRevertAct) | 1329 changesMenu.addAction(self.vcsRevertAct) |
| 1330 changesMenu.addSeparator() | |
| 1330 changesMenu.addAction(self.vcsMergeAct) | 1331 changesMenu.addAction(self.vcsMergeAct) |
| 1331 changesMenu.addAction(self.hgShowConflictsAct) | 1332 changesMenu.addAction(self.hgShowConflictsAct) |
| 1332 changesMenu.addAction(self.vcsResolveAct) | 1333 changesMenu.addAction(self.vcsResolveAct) |
| 1333 changesMenu.addAction(self.hgUnresolveAct) | 1334 changesMenu.addAction(self.hgUnresolveAct) |
| 1334 changesMenu.addAction(self.hgReMergeAct) | 1335 changesMenu.addAction(self.hgReMergeAct) |
| 1335 changesMenu.addAction(self.hgCancelMergeAct) | 1336 changesMenu.addAction(self.hgCancelMergeAct) |
| 1337 if self.vcs.version >= (2, 1): | |
| 1338 changesMenu.addSeparator() | |
| 1339 changesMenu.addAction(self.hgPhaseAct) | |
| 1336 | 1340 |
| 1337 act = menu.addAction( | 1341 act = menu.addAction( |
| 1338 UI.PixmapCache.getIcon( | 1342 UI.PixmapCache.getIcon( |
| 1339 os.path.join("VcsPlugins", "vcsMercurial", "icons", | 1343 os.path.join("VcsPlugins", "vcsMercurial", "icons", |
| 1340 "mercurial.png")), | 1344 "mercurial.png")), |
| 1350 menu.addSeparator() | 1354 menu.addSeparator() |
| 1351 menu.addAction(self.vcsCommitAct) | 1355 menu.addAction(self.vcsCommitAct) |
| 1352 menu.addAction(self.hgOutgoingAct) | 1356 menu.addAction(self.hgOutgoingAct) |
| 1353 menu.addAction(self.hgPushAct) | 1357 menu.addAction(self.hgPushAct) |
| 1354 menu.addSeparator() | 1358 menu.addSeparator() |
| 1359 menu.addMenu(changesMenu) | |
| 1360 menu.addSeparator() | |
| 1355 if graftMenu is not None: | 1361 if graftMenu is not None: |
| 1356 menu.addMenu(graftMenu) | 1362 menu.addMenu(graftMenu) |
| 1357 menu.addSeparator() | 1363 menu.addSeparator() |
| 1358 menu.addMenu(bundleMenu) | 1364 menu.addMenu(bundleMenu) |
| 1359 menu.addMenu(patchMenu) | 1365 menu.addMenu(patchMenu) |
| 1360 menu.addSeparator() | |
| 1361 menu.addMenu(self.__extensionsMenu) | |
| 1362 menu.addSeparator() | |
| 1363 menu.addAction(self.vcsNewAct) | |
| 1364 menu.addAction(self.vcsExportAct) | |
| 1365 menu.addSeparator() | 1366 menu.addSeparator() |
| 1366 menu.addMenu(tagsMenu) | 1367 menu.addMenu(tagsMenu) |
| 1367 menu.addMenu(branchesMenu) | 1368 menu.addMenu(branchesMenu) |
| 1368 menu.addMenu(bookmarksMenu) | 1369 menu.addMenu(bookmarksMenu) |
| 1369 menu.addSeparator() | 1370 menu.addSeparator() |
| 1374 menu.addAction(self.hgSummaryAct) | 1375 menu.addAction(self.hgSummaryAct) |
| 1375 menu.addSeparator() | 1376 menu.addSeparator() |
| 1376 menu.addAction(self.vcsDiffAct) | 1377 menu.addAction(self.vcsDiffAct) |
| 1377 menu.addAction(self.hgExtDiffAct) | 1378 menu.addAction(self.hgExtDiffAct) |
| 1378 menu.addSeparator() | 1379 menu.addSeparator() |
| 1379 if self.vcs.version >= (2, 1): | 1380 menu.addMenu(self.__extensionsMenu) |
| 1380 menu.addAction(self.hgPhaseAct) | |
| 1381 menu.addSeparator() | |
| 1382 menu.addMenu(changesMenu) | |
| 1383 menu.addSeparator() | 1381 menu.addSeparator() |
| 1384 menu.addAction(self.vcsSwitchAct) | 1382 menu.addAction(self.vcsSwitchAct) |
| 1385 menu.addSeparator() | 1383 menu.addSeparator() |
| 1386 menu.addMenu(subrepoMenu) | 1384 menu.addMenu(subrepoMenu) |
| 1387 menu.addSeparator() | 1385 menu.addSeparator() |
| 1394 menu.addMenu(adminMenu) | 1392 menu.addMenu(adminMenu) |
| 1395 menu.addMenu(specialsMenu) | 1393 menu.addMenu(specialsMenu) |
| 1396 menu.addSeparator() | 1394 menu.addSeparator() |
| 1397 menu.addAction(self.hgEditUserConfigAct) | 1395 menu.addAction(self.hgEditUserConfigAct) |
| 1398 menu.addAction(self.hgConfigAct) | 1396 menu.addAction(self.hgConfigAct) |
| 1397 menu.addSeparator() | |
| 1398 menu.addAction(self.vcsNewAct) | |
| 1399 menu.addAction(self.vcsExportAct) | |
| 1399 | 1400 |
| 1400 def showMenu(self): | 1401 def showMenu(self): |
| 1401 """ | 1402 """ |
| 1402 Public slot called before the vcs menu is shown. | 1403 Public slot called before the vcs menu is shown. |
| 1403 """ | 1404 """ |
