Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 963
- b672d2191a04
- parent 945
- 8cd4d08fa9f6
- child 992
- 566e87428fc8
equal
deleted
inserted
replaced
| 961:c13b1d86db75 | 963:b672d2191a04 |
|---|---|
| 427 """in the repository.</p>""" | 427 """in the repository.</p>""" |
| 428 )) | 428 )) |
| 429 self.hgBranchAct.triggered[()].connect(self.__hgBranch) | 429 self.hgBranchAct.triggered[()].connect(self.__hgBranch) |
| 430 self.actions.append(self.hgBranchAct) | 430 self.actions.append(self.hgBranchAct) |
| 431 | 431 |
| 432 self.hgPushBranchAct = E5Action(self.trUtf8('Push new branch'), | |
| 433 self.trUtf8('Push new branch'), | |
| 434 0, 0, self, 'mercurial_push_branch') | |
| 435 self.hgPushBranchAct.setStatusTip(self.trUtf8( | |
| 436 'Push the current branch of the local project as a new named branch' | |
| 437 )) | |
| 438 self.hgPushBranchAct.setWhatsThis(self.trUtf8( | |
| 439 """<b>Push new branch</b>""" | |
| 440 """<p>This pushes the current branch of the local project""" | |
| 441 """ as a new named branch.</p>""" | |
| 442 )) | |
| 443 self.hgPushBranchAct.triggered[()].connect(self.__hgPushNewBranch) | |
| 444 self.actions.append(self.hgPushBranchAct) | |
| 445 | |
| 432 self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), | 446 self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), |
| 433 self.trUtf8('Close branch'), | 447 self.trUtf8('Close branch'), |
| 434 0, 0, self, 'mercurial_close_branch') | 448 0, 0, self, 'mercurial_close_branch') |
| 435 self.hgCloseBranchAct.setStatusTip(self.trUtf8( | 449 self.hgCloseBranchAct.setStatusTip(self.trUtf8( |
| 436 'Close the current branch of the local project' | 450 'Close the current branch of the local project' |
| 815 menu.addAction(self.vcsRemoveAct) | 829 menu.addAction(self.vcsRemoveAct) |
| 816 menu.addSeparator() | 830 menu.addSeparator() |
| 817 menu.addAction(self.vcsTagAct) | 831 menu.addAction(self.vcsTagAct) |
| 818 menu.addAction(self.hgTagListAct) | 832 menu.addAction(self.hgTagListAct) |
| 819 menu.addAction(self.hgBranchAct) | 833 menu.addAction(self.hgBranchAct) |
| 834 if self.vcs.versionStr >= '1.6.0': | |
| 835 menu.addAction(self.hgPushBranchAct) | |
| 820 menu.addAction(self.hgCloseBranchAct) | 836 menu.addAction(self.hgCloseBranchAct) |
| 821 menu.addAction(self.hgBranchListAct) | 837 menu.addAction(self.hgBranchListAct) |
| 822 menu.addSeparator() | 838 menu.addSeparator() |
| 823 menu.addAction(self.vcsLogAct) | 839 menu.addAction(self.vcsLogAct) |
| 824 menu.addAction(self.hgLogLimitedAct) | 840 menu.addAction(self.hgLogLimitedAct) |
| 958 """ | 974 """ |
| 959 e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage") | 975 e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage") |
| 960 | 976 |
| 961 def __hgCloseBranch(self): | 977 def __hgCloseBranch(self): |
| 962 """ | 978 """ |
| 963 Protected slot used to close the current branch of the local project. | 979 Private slot used to close the current branch of the local project. |
| 964 """ | 980 """ |
| 965 if Preferences.getVCS("AutoSaveProject"): | 981 if Preferences.getVCS("AutoSaveProject"): |
| 966 self.project.saveProject() | 982 self.project.saveProject() |
| 967 if Preferences.getVCS("AutoSaveFiles"): | 983 if Preferences.getVCS("AutoSaveFiles"): |
| 968 self.project.saveAllScripts() | 984 self.project.saveAllScripts() |
| 969 self.vcs.vcsCommit(self.project.ppath, '', closeBranch=True) | 985 self.vcs.vcsCommit(self.project.ppath, '', closeBranch=True) |
| 970 | 986 |
| 987 def __hgPushNewBranch(self): | |
| 988 """ | |
| 989 Private slot to push a new named branch. | |
| 990 """ | |
| 991 self.vcs.hgPush(self.project.ppath, newBranch = True) | |
| 992 | |
| 971 def __hgEditRepoConfig(self): | 993 def __hgEditRepoConfig(self): |
| 972 """ | 994 """ |
| 973 Protected slot used to edit the repository config file. | 995 Private slot used to edit the repository config file. |
| 974 """ | 996 """ |
| 975 self.vcs.hgEditConfig(self.project.ppath) | 997 self.vcs.hgEditConfig(self.project.ppath) |
| 976 | 998 |
| 977 def __hgShowConfig(self): | 999 def __hgShowConfig(self): |
| 978 """ | 1000 """ |
| 979 Protected slot used to show the combined config. | 1001 Private slot used to show the combined config. |
| 980 """ | 1002 """ |
| 981 self.vcs.hgShowConfig(self.project.ppath) | 1003 self.vcs.hgShowConfig(self.project.ppath) |
| 982 | 1004 |
| 983 def __hgVerify(self): | 1005 def __hgVerify(self): |
| 984 """ | 1006 """ |
| 985 Protected slot used to verify the integrity of the repository. | 1007 Private slot used to verify the integrity of the repository. |
| 986 """ | 1008 """ |
| 987 self.vcs.hgVerify(self.project.ppath) | 1009 self.vcs.hgVerify(self.project.ppath) |
| 988 | 1010 |
| 989 def __hgShowPaths(self): | 1011 def __hgShowPaths(self): |
| 990 """ | 1012 """ |
| 991 Protected slot used to show the aliases for remote repositories. | 1013 Private slot used to show the aliases for remote repositories. |
| 992 """ | 1014 """ |
| 993 self.vcs.hgShowPaths(self.project.ppath) | 1015 self.vcs.hgShowPaths(self.project.ppath) |
| 994 | 1016 |
| 995 def __hgRecover(self): | 1017 def __hgRecover(self): |
| 996 """ | 1018 """ |
| 997 Protected slot used to recover from an interrupted transaction. | 1019 Private slot used to recover from an interrupted transaction. |
| 998 """ | 1020 """ |
| 999 self.vcs.hgRecover(self.project.ppath) | 1021 self.vcs.hgRecover(self.project.ppath) |
| 1000 | 1022 |
| 1001 def __hgIdentify(self): | 1023 def __hgIdentify(self): |
| 1002 """ | 1024 """ |
| 1003 Protected slot used to identify the project directory. | 1025 Private slot used to identify the project directory. |
| 1004 """ | 1026 """ |
| 1005 self.vcs.hgIdentify(self.project.ppath) | 1027 self.vcs.hgIdentify(self.project.ppath) |
| 1006 | 1028 |
| 1007 def __hgCreateIgnore(self): | 1029 def __hgCreateIgnore(self): |
| 1008 """ | 1030 """ |
| 1009 Protected slot used to create a .hgignore file for the project. | 1031 Private slot used to create a .hgignore file for the project. |
| 1010 """ | 1032 """ |
| 1011 self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd=True) | 1033 self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd=True) |
| 1012 | 1034 |
| 1013 def __hgBundle(self): | 1035 def __hgBundle(self): |
| 1014 """ | 1036 """ |
| 1015 Protected slot used to create a changegroup file. | 1037 Private slot used to create a changegroup file. |
| 1016 """ | 1038 """ |
| 1017 self.vcs.hgBundle(self.project.ppath) | 1039 self.vcs.hgBundle(self.project.ppath) |
| 1018 | 1040 |
| 1019 def __hgPreviewBundle(self): | 1041 def __hgPreviewBundle(self): |
| 1020 """ | 1042 """ |
| 1021 Protected slot used to preview a changegroup file. | 1043 Private slot used to preview a changegroup file. |
| 1022 """ | 1044 """ |
| 1023 self.vcs.hgPreviewBundle(self.project.ppath) | 1045 self.vcs.hgPreviewBundle(self.project.ppath) |
| 1024 | 1046 |
| 1025 def __hgIdentifyBundle(self): | 1047 def __hgIdentifyBundle(self): |
| 1026 """ | 1048 """ |
| 1027 Protected slot used to identify a changegroup file. | 1049 Private slot used to identify a changegroup file. |
| 1028 """ | 1050 """ |
| 1029 self.vcs.hgIdentifyBundle(self.project.ppath) | 1051 self.vcs.hgIdentifyBundle(self.project.ppath) |
| 1030 | 1052 |
| 1031 def __hgUnbundle(self): | 1053 def __hgUnbundle(self): |
| 1032 """ | 1054 """ |
| 1033 Protected slot used to apply changegroup files. | 1055 Private slot used to apply changegroup files. |
| 1034 """ | 1056 """ |
| 1035 self.vcs.hgUnbundle(self.project.ppath) | 1057 self.vcs.hgUnbundle(self.project.ppath) |
| 1036 | 1058 |
| 1037 def __hgBisectGood(self): | 1059 def __hgBisectGood(self): |
| 1038 """ | 1060 """ |
| 1039 Protected slot used to execute the bisect --good command. | 1061 Private slot used to execute the bisect --good command. |
| 1040 """ | 1062 """ |
| 1041 self.vcs.hgBisect(self.project.ppath, "good") | 1063 self.vcs.hgBisect(self.project.ppath, "good") |
| 1042 | 1064 |
| 1043 def __hgBisectBad(self): | 1065 def __hgBisectBad(self): |
| 1044 """ | 1066 """ |
| 1045 Protected slot used to execute the bisect --bad command. | 1067 Private slot used to execute the bisect --bad command. |
| 1046 """ | 1068 """ |
| 1047 self.vcs.hgBisect(self.project.ppath, "bad") | 1069 self.vcs.hgBisect(self.project.ppath, "bad") |
| 1048 | 1070 |
| 1049 def __hgBisectSkip(self): | 1071 def __hgBisectSkip(self): |
| 1050 """ | 1072 """ |
| 1051 Protected slot used to execute the bisect --skip command. | 1073 Private slot used to execute the bisect --skip command. |
| 1052 """ | 1074 """ |
| 1053 self.vcs.hgBisect(self.project.ppath, "skip") | 1075 self.vcs.hgBisect(self.project.ppath, "skip") |
| 1054 | 1076 |
| 1055 def __hgBisectReset(self): | 1077 def __hgBisectReset(self): |
| 1056 """ | 1078 """ |
| 1057 Protected slot used to execute the bisect --reset command. | 1079 Private slot used to execute the bisect --reset command. |
| 1058 """ | 1080 """ |
| 1059 self.vcs.hgBisect(self.project.ppath, "reset") | 1081 self.vcs.hgBisect(self.project.ppath, "reset") |
| 1060 | 1082 |
| 1061 def __hgBackout(self): | 1083 def __hgBackout(self): |
| 1062 """ | 1084 """ |
| 1063 Protected slot used to back out changes of a changeset. | 1085 Private slot used to back out changes of a changeset. |
| 1064 """ | 1086 """ |
| 1065 self.vcs.hgBackout(self.project.ppath) | 1087 self.vcs.hgBackout(self.project.ppath) |
| 1066 | 1088 |
| 1067 def __hgServe(self): | 1089 def __hgServe(self): |
| 1068 """ | 1090 """ |
| 1069 Protected slot used to serve the project. | 1091 Private slot used to serve the project. |
| 1070 """ | 1092 """ |
| 1071 self.vcs.hgServe(self.project.ppath) | 1093 self.vcs.hgServe(self.project.ppath) |
