Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3020
- 542e97d4ecb3
- parent 3008
- 7848489bcb92
- child 3023
- 34ce20603bf7
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 422 "The hg process did not finish within 30s.") | 422 "The hg process did not finish within 30s.") |
| 423 else: | 423 else: |
| 424 errMsg = self.trUtf8("Could not start the hg executable.") | 424 errMsg = self.trUtf8("Could not start the hg executable.") |
| 425 | 425 |
| 426 if errMsg: | 426 if errMsg: |
| 427 E5MessageBox.critical(self, | 427 E5MessageBox.critical( |
| 428 self, | |
| 428 self.trUtf8("Mercurial Error"), | 429 self.trUtf8("Mercurial Error"), |
| 429 errMsg) | 430 errMsg) |
| 430 | 431 |
| 431 if output: | 432 if output: |
| 432 parents = [int(p) for p in output.strip().splitlines()] | 433 parents = [int(p) for p in output.strip().splitlines()] |
| 464 "The hg process did not finish within 30s.") | 465 "The hg process did not finish within 30s.") |
| 465 else: | 466 else: |
| 466 errMsg = self.trUtf8("Could not start the hg executable.") | 467 errMsg = self.trUtf8("Could not start the hg executable.") |
| 467 | 468 |
| 468 if errMsg: | 469 if errMsg: |
| 469 E5MessageBox.critical(self, | 470 E5MessageBox.critical( |
| 471 self, | |
| 470 self.trUtf8("Mercurial Error"), | 472 self.trUtf8("Mercurial Error"), |
| 471 errMsg) | 473 errMsg) |
| 472 | 474 |
| 473 if output: | 475 if output: |
| 474 outputList = output.strip().split(None, 1) | 476 outputList = output.strip().split(None, 1) |
| 510 "The hg process did not finish within 30s.") | 512 "The hg process did not finish within 30s.") |
| 511 else: | 513 else: |
| 512 errMsg = self.trUtf8("Could not start the hg executable.") | 514 errMsg = self.trUtf8("Could not start the hg executable.") |
| 513 | 515 |
| 514 if errMsg: | 516 if errMsg: |
| 515 E5MessageBox.critical(self, | 517 E5MessageBox.critical( |
| 518 self, | |
| 516 self.trUtf8("Mercurial Error"), | 519 self.trUtf8("Mercurial Error"), |
| 517 errMsg) | 520 errMsg) |
| 518 | 521 |
| 519 if output: | 522 if output: |
| 520 for line in output.splitlines(): | 523 for line in output.splitlines(): |
| 705 self.process.start('hg', args) | 708 self.process.start('hg', args) |
| 706 procStarted = self.process.waitForStarted(5000) | 709 procStarted = self.process.waitForStarted(5000) |
| 707 if not procStarted: | 710 if not procStarted: |
| 708 self.inputGroup.setEnabled(False) | 711 self.inputGroup.setEnabled(False) |
| 709 self.inputGroup.hide() | 712 self.inputGroup.hide() |
| 710 E5MessageBox.critical(self, | 713 E5MessageBox.critical( |
| 714 self, | |
| 711 self.trUtf8('Process Generation Error'), | 715 self.trUtf8('Process Generation Error'), |
| 712 self.trUtf8( | 716 self.trUtf8( |
| 713 'The process {0} could not be started. ' | 717 'The process {0} could not be started. ' |
| 714 'Ensure, that it is in the search path.' | 718 'Ensure, that it is in the search path.' |
| 715 ).format('hg')) | 719 ).format('hg')) |
| 1383 itm.text(self.RevisionColumn).strip().split(":", 1)[0]) | 1387 itm.text(self.RevisionColumn).strip().split(":", 1)[0]) |
| 1384 | 1388 |
| 1385 if revs: | 1389 if revs: |
| 1386 shouldReopen = self.vcs.hgGraft(self.repodir, revs) | 1390 shouldReopen = self.vcs.hgGraft(self.repodir, revs) |
| 1387 if shouldReopen: | 1391 if shouldReopen: |
| 1388 res = E5MessageBox.yesNo(None, | 1392 res = E5MessageBox.yesNo( |
| 1393 None, | |
| 1389 self.trUtf8("Copy Changesets"), | 1394 self.trUtf8("Copy Changesets"), |
| 1390 self.trUtf8( | 1395 self.trUtf8( |
| 1391 """The project should be reread. Do this now?"""), | 1396 """The project should be reread. Do this now?"""), |
| 1392 yesDefault=True) | 1397 yesDefault=True) |
| 1393 if res: | 1398 if res: |
