147 """remote repository.</p>""" |
147 """remote repository.</p>""" |
148 )) |
148 )) |
149 self.connect(self.hgPushAct, SIGNAL('triggered()'), self.__hgPush) |
149 self.connect(self.hgPushAct, SIGNAL('triggered()'), self.__hgPush) |
150 self.actions.append(self.hgPushAct) |
150 self.actions.append(self.hgPushAct) |
151 |
151 |
|
152 self.hgPushForcedAct = E5Action(self.trUtf8('Push changes (force)'), |
|
153 UI.PixmapCache.getIcon("vcsCommit.png"), |
|
154 self.trUtf8('Push changes (force)'), |
|
155 0, 0, self, 'mercurial_push_forced') |
|
156 self.hgPushForcedAct.setStatusTip(self.trUtf8( |
|
157 'Push changes to a remote repository with force option' |
|
158 )) |
|
159 self.hgPushForcedAct.setWhatsThis(self.trUtf8( |
|
160 """<b>Push changes (force)</b>""" |
|
161 """<p>This pushes changes from the local repository to a """ |
|
162 """remote repository using the 'force' option.</p>""" |
|
163 )) |
|
164 self.connect(self.hgPushForcedAct, SIGNAL('triggered()'), self.__hgPushForced) |
|
165 self.actions.append(self.hgPushForcedAct) |
|
166 |
152 self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), |
167 self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), |
153 UI.PixmapCache.getIcon("vcsExport.png"), |
168 UI.PixmapCache.getIcon("vcsExport.png"), |
154 self.trUtf8('&Export from repository...'), |
169 self.trUtf8('&Export from repository...'), |
155 0, 0, self, 'subversion_export') |
170 0, 0, self, 'subversion_export') |
156 self.vcsExportAct.setStatusTip(self.trUtf8( |
171 self.vcsExportAct.setStatusTip(self.trUtf8( |
743 adminMenu.addSeparator() |
758 adminMenu.addSeparator() |
744 adminMenu.addAction(self.hgBackoutAct) |
759 adminMenu.addAction(self.hgBackoutAct) |
745 adminMenu.addSeparator() |
760 adminMenu.addSeparator() |
746 adminMenu.addAction(self.hgVerifyAct) |
761 adminMenu.addAction(self.hgVerifyAct) |
747 |
762 |
|
763 specialsMenu = QMenu(self.trUtf8("Specials"), menu) |
|
764 specialsMenu.addAction(self.hgPushForcedAct) |
|
765 |
748 bundleMenu = QMenu(self.trUtf8("Changegroup Management"), menu) |
766 bundleMenu = QMenu(self.trUtf8("Changegroup Management"), menu) |
749 bundleMenu.addAction(self.hgBundleAct) |
767 bundleMenu.addAction(self.hgBundleAct) |
750 bundleMenu.addAction(self.hgIdentifyBundleAct) |
768 bundleMenu.addAction(self.hgIdentifyBundleAct) |
751 bundleMenu.addAction(self.hgPreviewBundleAct) |
769 bundleMenu.addAction(self.hgPreviewBundleAct) |
752 bundleMenu.addAction(self.hgUnbundleAct) |
770 bundleMenu.addAction(self.hgUnbundleAct) |
808 menu.addAction(self.vcsCleanupAct) |
826 menu.addAction(self.vcsCleanupAct) |
809 menu.addSeparator() |
827 menu.addSeparator() |
810 menu.addAction(self.vcsCommandAct) |
828 menu.addAction(self.vcsCommandAct) |
811 menu.addSeparator() |
829 menu.addSeparator() |
812 menu.addMenu(adminMenu) |
830 menu.addMenu(adminMenu) |
|
831 menu.addMenu(specialsMenu) |
813 menu.addSeparator() |
832 menu.addSeparator() |
814 menu.addAction(self.vcsPropsAct) |
833 menu.addAction(self.vcsPropsAct) |
815 menu.addSeparator() |
834 menu.addSeparator() |
816 menu.addAction(self.hgConfigAct) |
835 menu.addAction(self.hgConfigAct) |
817 |
836 |
854 def __hgPush(self): |
873 def __hgPush(self): |
855 """ |
874 """ |
856 Private slot used to push changes to a remote repository. |
875 Private slot used to push changes to a remote repository. |
857 """ |
876 """ |
858 self.vcs.hgPush(self.project.ppath) |
877 self.vcs.hgPush(self.project.ppath) |
|
878 |
|
879 def __hgPushForced(self): |
|
880 """ |
|
881 Private slot used to push changes to a remote repository using |
|
882 the force option. |
|
883 """ |
|
884 self.vcs.hgPush(self.project.ppath, force = True) |
859 |
885 |
860 def __hgHeads(self): |
886 def __hgHeads(self): |
861 """ |
887 """ |
862 Private slot used to show the heads of the repository. |
888 Private slot used to show the heads of the repository. |
863 """ |
889 """ |