Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
- changeset 3020
- 542e97d4ecb3
- parent 3009
- bf5ae5d7477d
- child 3025
- 67064c71df21
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 387 self.process.start('svn', args) | 387 self.process.start('svn', args) |
| 388 procStarted = self.process.waitForStarted(5000) | 388 procStarted = self.process.waitForStarted(5000) |
| 389 if not procStarted: | 389 if not procStarted: |
| 390 self.inputGroup.setEnabled(False) | 390 self.inputGroup.setEnabled(False) |
| 391 self.inputGroup.hide() | 391 self.inputGroup.hide() |
| 392 E5MessageBox.critical(self, | 392 E5MessageBox.critical( |
| 393 self, | |
| 393 self.trUtf8('Process Generation Error'), | 394 self.trUtf8('Process Generation Error'), |
| 394 self.trUtf8( | 395 self.trUtf8( |
| 395 'The process {0} could not be started. ' | 396 'The process {0} could not be started. ' |
| 396 'Ensure, that it is in the search path.' | 397 'Ensure, that it is in the search path.' |
| 397 ).format('svn')) | 398 ).format('svn')) |
| 703 Private slot to handle the Commit context menu entry. | 704 Private slot to handle the Commit context menu entry. |
| 704 """ | 705 """ |
| 705 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 706 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 706 for itm in self.__getCommitableItems()] | 707 for itm in self.__getCommitableItems()] |
| 707 if not names: | 708 if not names: |
| 708 E5MessageBox.information(self, | 709 E5MessageBox.information( |
| 710 self, | |
| 709 self.trUtf8("Commit"), | 711 self.trUtf8("Commit"), |
| 710 self.trUtf8("""There are no entries selected to be""" | 712 self.trUtf8("""There are no entries selected to be""" |
| 711 """ committed.""")) | 713 """ committed.""")) |
| 712 return | 714 return |
| 713 | 715 |
| 742 Private slot to handle the Add context menu entry. | 744 Private slot to handle the Add context menu entry. |
| 743 """ | 745 """ |
| 744 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 746 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 745 for itm in self.__getUnversionedItems()] | 747 for itm in self.__getUnversionedItems()] |
| 746 if not names: | 748 if not names: |
| 747 E5MessageBox.information(self, | 749 E5MessageBox.information( |
| 750 self, | |
| 748 self.trUtf8("Add"), | 751 self.trUtf8("Add"), |
| 749 self.trUtf8("""There are no unversioned entries""" | 752 self.trUtf8("""There are no unversioned entries""" |
| 750 """ available/selected.""")) | 753 """ available/selected.""")) |
| 751 return | 754 return |
| 752 | 755 |
| 763 Private slot to handle the Revert context menu entry. | 766 Private slot to handle the Revert context menu entry. |
| 764 """ | 767 """ |
| 765 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 768 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 766 for itm in self.__getModifiedItems()] | 769 for itm in self.__getModifiedItems()] |
| 767 if not names: | 770 if not names: |
| 768 E5MessageBox.information(self, | 771 E5MessageBox.information( |
| 772 self, | |
| 769 self.trUtf8("Revert"), | 773 self.trUtf8("Revert"), |
| 770 self.trUtf8("""There are no uncommitted changes""" | 774 self.trUtf8("""There are no uncommitted changes""" |
| 771 """ available/selected.""")) | 775 """ available/selected.""")) |
| 772 return | 776 return |
| 773 | 777 |
| 786 Private slot to handle the Restore Missing context menu entry. | 790 Private slot to handle the Restore Missing context menu entry. |
| 787 """ | 791 """ |
| 788 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 792 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 789 for itm in self.__getMissingItems()] | 793 for itm in self.__getMissingItems()] |
| 790 if not names: | 794 if not names: |
| 791 E5MessageBox.information(self, | 795 E5MessageBox.information( |
| 796 self, | |
| 792 self.trUtf8("Revert"), | 797 self.trUtf8("Revert"), |
| 793 self.trUtf8("""There are no missing entries""" | 798 self.trUtf8("""There are no missing entries""" |
| 794 """ available/selected.""")) | 799 """ available/selected.""")) |
| 795 return | 800 return |
| 796 | 801 |
| 803 Private slot to handle the Diff context menu entry. | 808 Private slot to handle the Diff context menu entry. |
| 804 """ | 809 """ |
| 805 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 810 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 806 for itm in self.__getModifiedItems()] | 811 for itm in self.__getModifiedItems()] |
| 807 if not names: | 812 if not names: |
| 808 E5MessageBox.information(self, | 813 E5MessageBox.information( |
| 814 self, | |
| 809 self.trUtf8("Differences"), | 815 self.trUtf8("Differences"), |
| 810 self.trUtf8("""There are no uncommitted changes""" | 816 self.trUtf8("""There are no uncommitted changes""" |
| 811 """ available/selected.""")) | 817 """ available/selected.""")) |
| 812 return | 818 return |
| 813 | 819 |
| 823 Private slot to handle the Side-by-Side Diff context menu entry. | 829 Private slot to handle the Side-by-Side Diff context menu entry. |
| 824 """ | 830 """ |
| 825 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 831 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 826 for itm in self.__getModifiedItems()] | 832 for itm in self.__getModifiedItems()] |
| 827 if not names: | 833 if not names: |
| 828 E5MessageBox.information(self, | 834 E5MessageBox.information( |
| 835 self, | |
| 829 self.trUtf8("Side-by-Side Diff"), | 836 self.trUtf8("Side-by-Side Diff"), |
| 830 self.trUtf8("""There are no uncommitted changes""" | 837 self.trUtf8("""There are no uncommitted changes""" |
| 831 """ available/selected.""")) | 838 """ available/selected.""")) |
| 832 return | 839 return |
| 833 elif len(names) > 1: | 840 elif len(names) > 1: |
| 834 E5MessageBox.information(self, | 841 E5MessageBox.information( |
| 842 self, | |
| 835 self.trUtf8("Side-by-Side Diff"), | 843 self.trUtf8("Side-by-Side Diff"), |
| 836 self.trUtf8("""Only one file with uncommitted changes""" | 844 self.trUtf8("""Only one file with uncommitted changes""" |
| 837 """ must be selected.""")) | 845 """ must be selected.""")) |
| 838 return | 846 return |
| 839 | 847 |
| 844 Private slot to handle the Lock context menu entry. | 852 Private slot to handle the Lock context menu entry. |
| 845 """ | 853 """ |
| 846 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 854 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 847 for itm in self.__getLockActionItems(self.unlockedIndicators)] | 855 for itm in self.__getLockActionItems(self.unlockedIndicators)] |
| 848 if not names: | 856 if not names: |
| 849 E5MessageBox.information(self, | 857 E5MessageBox.information( |
| 858 self, | |
| 850 self.trUtf8("Lock"), | 859 self.trUtf8("Lock"), |
| 851 self.trUtf8("""There are no unlocked files""" | 860 self.trUtf8("""There are no unlocked files""" |
| 852 """ available/selected.""")) | 861 """ available/selected.""")) |
| 853 return | 862 return |
| 854 | 863 |
| 860 Private slot to handle the Unlock context menu entry. | 869 Private slot to handle the Unlock context menu entry. |
| 861 """ | 870 """ |
| 862 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 871 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 863 for itm in self.__getLockActionItems(self.lockedIndicators)] | 872 for itm in self.__getLockActionItems(self.lockedIndicators)] |
| 864 if not names: | 873 if not names: |
| 865 E5MessageBox.information(self, | 874 E5MessageBox.information( |
| 875 self, | |
| 866 self.trUtf8("Unlock"), | 876 self.trUtf8("Unlock"), |
| 867 self.trUtf8("""There are no locked files""" | 877 self.trUtf8("""There are no locked files""" |
| 868 """ available/selected.""")) | 878 """ available/selected.""")) |
| 869 return | 879 return |
| 870 | 880 |
| 877 """ | 887 """ |
| 878 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 888 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 879 for itm in self.__getLockActionItems( | 889 for itm in self.__getLockActionItems( |
| 880 self.stealBreakLockIndicators)] | 890 self.stealBreakLockIndicators)] |
| 881 if not names: | 891 if not names: |
| 882 E5MessageBox.information(self, | 892 E5MessageBox.information( |
| 893 self, | |
| 883 self.trUtf8("Break Lock"), | 894 self.trUtf8("Break Lock"), |
| 884 self.trUtf8("""There are no locked files""" | 895 self.trUtf8("""There are no locked files""" |
| 885 """ available/selected.""")) | 896 """ available/selected.""")) |
| 886 return | 897 return |
| 887 | 898 |
| 894 """ | 905 """ |
| 895 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 906 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 896 for itm in self.__getLockActionItems( | 907 for itm in self.__getLockActionItems( |
| 897 self.stealBreakLockIndicators)] | 908 self.stealBreakLockIndicators)] |
| 898 if not names: | 909 if not names: |
| 899 E5MessageBox.information(self, | 910 E5MessageBox.information( |
| 911 self, | |
| 900 self.trUtf8("Steal Lock"), | 912 self.trUtf8("Steal Lock"), |
| 901 self.trUtf8("""There are no locked files""" | 913 self.trUtf8("""There are no locked files""" |
| 902 """ available/selected.""")) | 914 """ available/selected.""")) |
| 903 return | 915 return |
| 904 | 916 |
| 910 Private slot to add entries to a changelist. | 922 Private slot to add entries to a changelist. |
| 911 """ | 923 """ |
| 912 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 924 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 913 for itm in self.__getNonChangelistItems()] | 925 for itm in self.__getNonChangelistItems()] |
| 914 if not names: | 926 if not names: |
| 915 E5MessageBox.information(self, | 927 E5MessageBox.information( |
| 928 self, | |
| 916 self.trUtf8("Remove from Changelist"), | 929 self.trUtf8("Remove from Changelist"), |
| 917 self.trUtf8( | 930 self.trUtf8( |
| 918 """There are no files available/selected not """ | 931 """There are no files available/selected not """ |
| 919 """belonging to a changelist.""" | 932 """belonging to a changelist.""" |
| 920 ) | 933 ) |
| 928 Private slot to remove entries from their changelists. | 941 Private slot to remove entries from their changelists. |
| 929 """ | 942 """ |
| 930 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 943 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 931 for itm in self.__getChangelistItems()] | 944 for itm in self.__getChangelistItems()] |
| 932 if not names: | 945 if not names: |
| 933 E5MessageBox.information(self, | 946 E5MessageBox.information( |
| 947 self, | |
| 934 self.trUtf8("Remove from Changelist"), | 948 self.trUtf8("Remove from Changelist"), |
| 935 self.trUtf8( | 949 self.trUtf8( |
| 936 """There are no files available/selected belonging""" | 950 """There are no files available/selected belonging""" |
| 937 """ to a changelist.""" | 951 """ to a changelist.""" |
| 938 ) | 952 ) |
