Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 1064
- 10bdbb173c0f
- parent 1061
- 3e21869872e3
- child 1066
- a3dd41fd9ea8
equal
deleted
inserted
replaced
| 1063:a0afd409c566 | 1064:10bdbb173c0f |
|---|---|
| 556 """<p>Show the configuration dialog with the Mercurial page selected.</p>""" | 556 """<p>Show the configuration dialog with the Mercurial page selected.</p>""" |
| 557 )) | 557 )) |
| 558 self.hgConfigAct.triggered[()].connect(self.__hgConfigure) | 558 self.hgConfigAct.triggered[()].connect(self.__hgConfigure) |
| 559 self.actions.append(self.hgConfigAct) | 559 self.actions.append(self.hgConfigAct) |
| 560 | 560 |
| 561 self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository config'), | 561 self.hgEditUserConfigAct = E5Action(self.trUtf8('Edit user configuration'), |
| 562 self.trUtf8('Edit repository config...'), | 562 self.trUtf8('Edit user configuration...'), |
| 563 0, 0, self, 'mercurial_user_configure') | |
| 564 self.hgEditUserConfigAct.setStatusTip(self.trUtf8( | |
| 565 'Show an editor to edit the user configuration file' | |
| 566 )) | |
| 567 self.hgEditUserConfigAct.setWhatsThis(self.trUtf8( | |
| 568 """<b>Edit user configuration</b>""" | |
| 569 """<p>Show an editor to edit the user configuration file.</p>""" | |
| 570 )) | |
| 571 self.hgEditUserConfigAct.triggered[()].connect(self.__hgEditUserConfig) | |
| 572 self.actions.append(self.hgEditUserConfigAct) | |
| 573 | |
| 574 self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository configuration'), | |
| 575 self.trUtf8('Edit repository configuration...'), | |
| 563 0, 0, self, 'mercurial_repo_configure') | 576 0, 0, self, 'mercurial_repo_configure') |
| 564 self.hgRepoConfigAct.setStatusTip(self.trUtf8( | 577 self.hgRepoConfigAct.setStatusTip(self.trUtf8( |
| 565 'Show an editor to edit the repository config file' | 578 'Show an editor to edit the repository configuration file' |
| 566 )) | 579 )) |
| 567 self.hgRepoConfigAct.setWhatsThis(self.trUtf8( | 580 self.hgRepoConfigAct.setWhatsThis(self.trUtf8( |
| 568 """<b>Edit repository config</b>""" | 581 """<b>Edit repository configuration</b>""" |
| 569 """<p>Show an editor to edit the repository config file.</p>""" | 582 """<p>Show an editor to edit the repository configuration file.</p>""" |
| 570 )) | 583 )) |
| 571 self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig) | 584 self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig) |
| 572 self.actions.append(self.hgRepoConfigAct) | 585 self.actions.append(self.hgRepoConfigAct) |
| 573 | 586 |
| 574 self.hgShowConfigAct = E5Action(self.trUtf8('Show combined config settings'), | 587 self.hgShowConfigAct = E5Action( |
| 575 self.trUtf8('Show combined config settings...'), | 588 self.trUtf8('Show combined configuration settings'), |
| 589 self.trUtf8('Show combined configuration settings...'), | |
| 576 0, 0, self, 'mercurial_show_config') | 590 0, 0, self, 'mercurial_show_config') |
| 577 self.hgShowConfigAct.setStatusTip(self.trUtf8( | 591 self.hgShowConfigAct.setStatusTip(self.trUtf8( |
| 578 'Show the combined config settings from all config files' | 592 'Show the combined configuration settings from all configuration files' |
| 579 )) | 593 )) |
| 580 self.hgShowConfigAct.setWhatsThis(self.trUtf8( | 594 self.hgShowConfigAct.setWhatsThis(self.trUtf8( |
| 581 """<b>Show combined config settings</b>""" | 595 """<b>Show combined configuration settings</b>""" |
| 582 """<p>This shows the combined config settings from all config files.</p>""" | 596 """<p>This shows the combined configuration settings""" |
| 597 """ from all configuration files.</p>""" | |
| 583 )) | 598 )) |
| 584 self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig) | 599 self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig) |
| 585 self.actions.append(self.hgShowConfigAct) | 600 self.actions.append(self.hgShowConfigAct) |
| 586 | 601 |
| 587 self.hgShowPathsAct = E5Action(self.trUtf8('Show paths'), | 602 self.hgShowPathsAct = E5Action(self.trUtf8('Show paths'), |
| 920 menu.addMenu(adminMenu) | 935 menu.addMenu(adminMenu) |
| 921 menu.addMenu(specialsMenu) | 936 menu.addMenu(specialsMenu) |
| 922 menu.addSeparator() | 937 menu.addSeparator() |
| 923 menu.addAction(self.vcsPropsAct) | 938 menu.addAction(self.vcsPropsAct) |
| 924 menu.addSeparator() | 939 menu.addSeparator() |
| 940 menu.addAction(self.hgEditUserConfigAct) | |
| 925 menu.addAction(self.hgConfigAct) | 941 menu.addAction(self.hgConfigAct) |
| 926 | 942 |
| 927 def __showExtensionMenu(self): | 943 def __showExtensionMenu(self): |
| 928 """ | 944 """ |
| 929 Private slot showing the extensions menu. | 945 Private slot showing the extensions menu. |
| 1056 """ | 1072 """ |
| 1057 Private slot to push a new named branch. | 1073 Private slot to push a new named branch. |
| 1058 """ | 1074 """ |
| 1059 self.vcs.hgPush(self.project.ppath, newBranch=True) | 1075 self.vcs.hgPush(self.project.ppath, newBranch=True) |
| 1060 | 1076 |
| 1077 def __hgEditUserConfig(self): | |
| 1078 """ | |
| 1079 Private slot used to edit the repository configuration file. | |
| 1080 """ | |
| 1081 self.vcs.hgEditUserConfig() | |
| 1082 | |
| 1061 def __hgEditRepoConfig(self): | 1083 def __hgEditRepoConfig(self): |
| 1062 """ | 1084 """ |
| 1063 Private slot used to edit the repository config file. | 1085 Private slot used to edit the repository configuration file. |
| 1064 """ | 1086 """ |
| 1065 self.vcs.hgEditConfig(self.project.ppath) | 1087 self.vcs.hgEditConfig(self.project.ppath) |
| 1066 | 1088 |
| 1067 def __hgShowConfig(self): | 1089 def __hgShowConfig(self): |
| 1068 """ | 1090 """ |
| 1069 Private slot used to show the combined config. | 1091 Private slot used to show the combined configuration. |
| 1070 """ | 1092 """ |
| 1071 self.vcs.hgShowConfig(self.project.ppath) | 1093 self.vcs.hgShowConfig(self.project.ppath) |
| 1072 | 1094 |
| 1073 def __hgVerify(self): | 1095 def __hgVerify(self): |
| 1074 """ | 1096 """ |
