Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 3020
- 542e97d4ecb3
- parent 3008
- 7848489bcb92
- child 3023
- 34ce20603bf7
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 1182 """ | 1182 """ |
| 1183 Private slot used to pull changes from a remote repository. | 1183 Private slot used to pull changes from a remote repository. |
| 1184 """ | 1184 """ |
| 1185 shouldReopen = self.vcs.hgPull(self.project.ppath) | 1185 shouldReopen = self.vcs.hgPull(self.project.ppath) |
| 1186 if shouldReopen: | 1186 if shouldReopen: |
| 1187 res = E5MessageBox.yesNo(self.parent(), | 1187 res = E5MessageBox.yesNo( |
| 1188 self.parent(), | |
| 1188 self.trUtf8("Pull"), | 1189 self.trUtf8("Pull"), |
| 1189 self.trUtf8("""The project should be reread. Do this now?"""), | 1190 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1190 yesDefault=True) | 1191 yesDefault=True) |
| 1191 if res: | 1192 if res: |
| 1192 self.project.reopenProject() | 1193 self.project.reopenProject() |
| 1344 """ | 1345 """ |
| 1345 Private slot used to apply changegroup files. | 1346 Private slot used to apply changegroup files. |
| 1346 """ | 1347 """ |
| 1347 shouldReopen = self.vcs.hgUnbundle(self.project.ppath) | 1348 shouldReopen = self.vcs.hgUnbundle(self.project.ppath) |
| 1348 if shouldReopen: | 1349 if shouldReopen: |
| 1349 res = E5MessageBox.yesNo(self.parent(), | 1350 res = E5MessageBox.yesNo( |
| 1351 self.parent(), | |
| 1350 self.trUtf8("Apply changegroups"), | 1352 self.trUtf8("Apply changegroups"), |
| 1351 self.trUtf8("""The project should be reread. Do this now?"""), | 1353 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1352 yesDefault=True) | 1354 yesDefault=True) |
| 1353 if res: | 1355 if res: |
| 1354 self.project.reopenProject() | 1356 self.project.reopenProject() |
| 1399 """ | 1401 """ |
| 1400 Private slot used to import a patch file. | 1402 Private slot used to import a patch file. |
| 1401 """ | 1403 """ |
| 1402 shouldReopen = self.vcs.hgImport(self.project.ppath) | 1404 shouldReopen = self.vcs.hgImport(self.project.ppath) |
| 1403 if shouldReopen: | 1405 if shouldReopen: |
| 1404 res = E5MessageBox.yesNo(self.parent(), | 1406 res = E5MessageBox.yesNo( |
| 1407 self.parent(), | |
| 1405 self.trUtf8("Import Patch"), | 1408 self.trUtf8("Import Patch"), |
| 1406 self.trUtf8("""The project should be reread. Do this now?"""), | 1409 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1407 yesDefault=True) | 1410 yesDefault=True) |
| 1408 if res: | 1411 if res: |
| 1409 self.project.reopenProject() | 1412 self.project.reopenProject() |
| 1418 """ | 1421 """ |
| 1419 Private slot used to revert changes made to the local project. | 1422 Private slot used to revert changes made to the local project. |
| 1420 """ | 1423 """ |
| 1421 shouldReopen = self.vcs.hgRevert(self.project.ppath) | 1424 shouldReopen = self.vcs.hgRevert(self.project.ppath) |
| 1422 if shouldReopen: | 1425 if shouldReopen: |
| 1423 res = E5MessageBox.yesNo(self.parent(), | 1426 res = E5MessageBox.yesNo( |
| 1427 self.parent(), | |
| 1424 self.trUtf8("Revert Changes"), | 1428 self.trUtf8("Revert Changes"), |
| 1425 self.trUtf8("""The project should be reread. Do this now?"""), | 1429 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1426 yesDefault=True) | 1430 yesDefault=True) |
| 1427 if res: | 1431 if res: |
| 1428 self.project.reopenProject() | 1432 self.project.reopenProject() |
| 1437 """ | 1441 """ |
| 1438 Private slot used to copy changesets from another branch. | 1442 Private slot used to copy changesets from another branch. |
| 1439 """ | 1443 """ |
| 1440 shouldReopen = self.vcs.hgGraft(self.project.getProjectPath()) | 1444 shouldReopen = self.vcs.hgGraft(self.project.getProjectPath()) |
| 1441 if shouldReopen: | 1445 if shouldReopen: |
| 1442 res = E5MessageBox.yesNo(None, | 1446 res = E5MessageBox.yesNo( |
| 1447 None, | |
| 1443 self.trUtf8("Copy Changesets"), | 1448 self.trUtf8("Copy Changesets"), |
| 1444 self.trUtf8("""The project should be reread. Do this now?"""), | 1449 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1445 yesDefault=True) | 1450 yesDefault=True) |
| 1446 if res: | 1451 if res: |
| 1447 self.project.reopenProject() | 1452 self.project.reopenProject() |
| 1451 Private slot used to continue the last copying session after conflicts | 1456 Private slot used to continue the last copying session after conflicts |
| 1452 were resolved. | 1457 were resolved. |
| 1453 """ | 1458 """ |
| 1454 shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath()) | 1459 shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath()) |
| 1455 if shouldReopen: | 1460 if shouldReopen: |
| 1456 res = E5MessageBox.yesNo(None, | 1461 res = E5MessageBox.yesNo( |
| 1462 None, | |
| 1457 self.trUtf8("Copy Changesets (Continue)"), | 1463 self.trUtf8("Copy Changesets (Continue)"), |
| 1458 self.trUtf8("""The project should be reread. Do this now?"""), | 1464 self.trUtf8("""The project should be reread. Do this now?"""), |
| 1459 yesDefault=True) | 1465 yesDefault=True) |
| 1460 if res: | 1466 if res: |
| 1461 self.project.reopenProject() | 1467 self.project.reopenProject() |
