Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
- branch
- eric7
- changeset 9576
- be9f8e7e42e0
- parent 9573
- 9960d19d66b5
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9575:635b6c5a36e1 | 9576:be9f8e7e42e0 |
|---|---|
| 159 | 159 |
| 160 self.__diffAct = self.__actionsMenu.addAction( | 160 self.__diffAct = self.__actionsMenu.addAction( |
| 161 self.tr("Differences"), self.__diff | 161 self.tr("Differences"), self.__diff |
| 162 ) | 162 ) |
| 163 self.__diffAct.setToolTip( | 163 self.__diffAct.setToolTip( |
| 164 self.tr( | 164 self.tr("Shows the differences of the selected entry in a separate dialog") |
| 165 "Shows the differences of the selected entry in a" " separate dialog" | |
| 166 ) | |
| 167 ) | 165 ) |
| 168 self.__sbsDiffAct = self.__actionsMenu.addAction( | 166 self.__sbsDiffAct = self.__actionsMenu.addAction( |
| 169 self.tr("Differences Side-By-Side"), self.__sbsDiff | 167 self.tr("Differences Side-By-Side"), self.__sbsDiff |
| 170 ) | 168 ) |
| 171 self.__sbsDiffAct.setToolTip( | 169 self.__sbsDiffAct.setToolTip( |
| 198 self.__actionsMenu.addSeparator() | 196 self.__actionsMenu.addSeparator() |
| 199 | 197 |
| 200 self.__commitMergeAct = self.__actionsMenu.addAction( | 198 self.__commitMergeAct = self.__actionsMenu.addAction( |
| 201 self.tr("Commit Merge"), self.__commitMerge | 199 self.tr("Commit Merge"), self.__commitMerge |
| 202 ) | 200 ) |
| 203 self.__commitMergeAct.setToolTip(self.tr("Commit all the merged" " changes.")) | 201 self.__commitMergeAct.setToolTip(self.tr("Commit all the merged changes.")) |
| 204 self.__abortMergeAct = self.__actionsMenu.addAction( | 202 self.__abortMergeAct = self.__actionsMenu.addAction( |
| 205 self.tr("Abort Merge"), self.__abortMerge | 203 self.tr("Abort Merge"), self.__abortMerge |
| 206 ) | 204 ) |
| 207 self.__commitMergeAct.setToolTip( | 205 self.__commitMergeAct.setToolTip( |
| 208 self.tr("Abort an uncommitted merge " "and lose all changes") | 206 self.tr("Abort an uncommitted merge and lose all changes") |
| 209 ) | 207 ) |
| 210 | 208 |
| 211 self.__actionsMenu.addSeparator() | 209 self.__actionsMenu.addSeparator() |
| 212 | 210 |
| 213 act = self.__actionsMenu.addAction( | 211 act = self.__actionsMenu.addAction( |
| 523 ] | 521 ] |
| 524 if not names: | 522 if not names: |
| 525 EricMessageBox.information( | 523 EricMessageBox.information( |
| 526 self, | 524 self, |
| 527 self.tr("Commit"), | 525 self.tr("Commit"), |
| 528 self.tr( | 526 self.tr("""There are no entries selected to be committed."""), |
| 529 """There are no entries selected to be committed.""" | |
| 530 ), | |
| 531 ) | 527 ) |
| 532 return | 528 return |
| 533 | 529 |
| 534 if Preferences.getVCS("AutoSaveFiles"): | 530 if Preferences.getVCS("AutoSaveFiles"): |
| 535 vm = ericApp().getObject("ViewManager") | 531 vm = ericApp().getObject("ViewManager") |
| 567 ] | 563 ] |
| 568 if not names: | 564 if not names: |
| 569 EricMessageBox.information( | 565 EricMessageBox.information( |
| 570 self, | 566 self, |
| 571 self.tr("Add"), | 567 self.tr("Add"), |
| 572 self.tr( | 568 self.tr("""There are no unversioned entries available/selected."""), |
| 573 """There are no unversioned entries available/selected.""" | |
| 574 ), | |
| 575 ) | 569 ) |
| 576 return | 570 return |
| 577 | 571 |
| 578 self.vcs.vcsAdd(names) | 572 self.vcs.vcsAdd(names) |
| 579 self.on_refreshButton_clicked() | 573 self.on_refreshButton_clicked() |
| 595 ] | 589 ] |
| 596 if not names: | 590 if not names: |
| 597 EricMessageBox.information( | 591 EricMessageBox.information( |
| 598 self, | 592 self, |
| 599 self.tr("Add"), | 593 self.tr("Add"), |
| 600 self.tr( | 594 self.tr("""There are no unversioned entries available/selected."""), |
| 601 """There are no unversioned entries available/selected.""" | |
| 602 ), | |
| 603 ) | 595 ) |
| 604 return | 596 return |
| 605 | 597 |
| 606 self.vcs.getExtensionObject("largefiles").hgAdd(names, mode) | 598 self.vcs.getExtensionObject("largefiles").hgAdd(names, mode) |
| 607 self.on_refreshButton_clicked() | 599 self.on_refreshButton_clicked() |
| 640 ] | 632 ] |
| 641 if not names: | 633 if not names: |
| 642 EricMessageBox.information( | 634 EricMessageBox.information( |
| 643 self, | 635 self, |
| 644 self.tr("Revert"), | 636 self.tr("Revert"), |
| 645 self.tr( | 637 self.tr("""There are no uncommitted changes available/selected."""), |
| 646 """There are no uncommitted changes available/selected.""" | |
| 647 ), | |
| 648 ) | 638 ) |
| 649 return | 639 return |
| 650 | 640 |
| 651 self.vcs.vcsRevert(names) | 641 self.vcs.vcsRevert(names) |
| 652 self.raise_() | 642 self.raise_() |
| 690 ] | 680 ] |
| 691 if not names: | 681 if not names: |
| 692 EricMessageBox.information( | 682 EricMessageBox.information( |
| 693 self, | 683 self, |
| 694 self.tr("Differences"), | 684 self.tr("Differences"), |
| 695 self.tr( | 685 self.tr("""There are no uncommitted changes available/selected."""), |
| 696 """There are no uncommitted changes available/selected.""" | |
| 697 ), | |
| 698 ) | 686 ) |
| 699 return | 687 return |
| 700 | 688 |
| 701 if self.diff is None: | 689 if self.diff is None: |
| 702 self.diff = HgDiffDialog(self.vcs) | 690 self.diff = HgDiffDialog(self.vcs) |
| 713 ] | 701 ] |
| 714 if not names: | 702 if not names: |
| 715 EricMessageBox.information( | 703 EricMessageBox.information( |
| 716 self, | 704 self, |
| 717 self.tr("Differences Side-By-Side"), | 705 self.tr("Differences Side-By-Side"), |
| 718 self.tr( | 706 self.tr("""There are no uncommitted changes available/selected."""), |
| 719 """There are no uncommitted changes available/selected.""" | |
| 720 ), | |
| 721 ) | 707 ) |
| 722 return | 708 return |
| 723 elif len(names) > 1: | 709 elif len(names) > 1: |
| 724 EricMessageBox.information( | 710 EricMessageBox.information( |
| 725 self, | 711 self, |
