Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py

branch
Py2 comp.
changeset 3058
0a02c433f52d
parent 3057
10516539f238
parent 3023
34ce20603bf7
child 3060
5883ce99ee12
equal deleted inserted replaced
3057:10516539f238 3058:0a02c433f52d
96 96
97 def initActions(self): 97 def initActions(self):
98 """ 98 """
99 Public method to generate the action objects. 99 Public method to generate the action objects.
100 """ 100 """
101 self.vcsNewAct = E5Action(self.trUtf8('New from repository'), 101 self.vcsNewAct = E5Action(
102 UI.PixmapCache.getIcon("vcsCheckout.png"), 102 self.trUtf8('New from repository'),
103 self.trUtf8('&New from repository...'), 0, 0, 103 UI.PixmapCache.getIcon("vcsCheckout.png"),
104 self, 'mercurial_new') 104 self.trUtf8('&New from repository...'), 0, 0,
105 self, 'mercurial_new')
105 self.vcsNewAct.setStatusTip(self.trUtf8( 106 self.vcsNewAct.setStatusTip(self.trUtf8(
106 'Create (clone) a new project from a Mercurial repository' 107 'Create (clone) a new project from a Mercurial repository'
107 )) 108 ))
108 self.vcsNewAct.setWhatsThis(self.trUtf8( 109 self.vcsNewAct.setWhatsThis(self.trUtf8(
109 """<b>New from repository</b>""" 110 """<b>New from repository</b>"""
111 """a Mercurial repository.</p>""" 112 """a Mercurial repository.</p>"""
112 )) 113 ))
113 self.vcsNewAct.triggered[()].connect(self._vcsCheckout) 114 self.vcsNewAct.triggered[()].connect(self._vcsCheckout)
114 self.actions.append(self.vcsNewAct) 115 self.actions.append(self.vcsNewAct)
115 116
116 self.hgIncomingAct = E5Action(self.trUtf8('Show incoming log'), 117 self.hgIncomingAct = E5Action(
117 UI.PixmapCache.getIcon("vcsUpdate.png"), 118 self.trUtf8('Show incoming log'),
118 self.trUtf8('Show incoming log'), 119 UI.PixmapCache.getIcon("vcsUpdate.png"),
119 0, 0, self, 'mercurial_incoming') 120 self.trUtf8('Show incoming log'),
121 0, 0, self, 'mercurial_incoming')
120 self.hgIncomingAct.setStatusTip(self.trUtf8( 122 self.hgIncomingAct.setStatusTip(self.trUtf8(
121 'Show the log of incoming changes' 123 'Show the log of incoming changes'
122 )) 124 ))
123 self.hgIncomingAct.setWhatsThis(self.trUtf8( 125 self.hgIncomingAct.setWhatsThis(self.trUtf8(
124 """<b>Show incoming log</b>""" 126 """<b>Show incoming log</b>"""
126 """ repository.</p>""" 128 """ repository.</p>"""
127 )) 129 ))
128 self.hgIncomingAct.triggered[()].connect(self.__hgIncoming) 130 self.hgIncomingAct.triggered[()].connect(self.__hgIncoming)
129 self.actions.append(self.hgIncomingAct) 131 self.actions.append(self.hgIncomingAct)
130 132
131 self.hgPullAct = E5Action(self.trUtf8('Pull changes'), 133 self.hgPullAct = E5Action(
132 UI.PixmapCache.getIcon("vcsUpdate.png"), 134 self.trUtf8('Pull changes'),
133 self.trUtf8('Pull changes'), 135 UI.PixmapCache.getIcon("vcsUpdate.png"),
134 0, 0, self, 'mercurial_pull') 136 self.trUtf8('Pull changes'),
137 0, 0, self, 'mercurial_pull')
135 self.hgPullAct.setStatusTip(self.trUtf8( 138 self.hgPullAct.setStatusTip(self.trUtf8(
136 'Pull changes from a remote repository' 139 'Pull changes from a remote repository'
137 )) 140 ))
138 self.hgPullAct.setWhatsThis(self.trUtf8( 141 self.hgPullAct.setWhatsThis(self.trUtf8(
139 """<b>Pull changes</b>""" 142 """<b>Pull changes</b>"""
141 """local repository.</p>""" 144 """local repository.</p>"""
142 )) 145 ))
143 self.hgPullAct.triggered[()].connect(self.__hgPull) 146 self.hgPullAct.triggered[()].connect(self.__hgPull)
144 self.actions.append(self.hgPullAct) 147 self.actions.append(self.hgPullAct)
145 148
146 self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), 149 self.vcsUpdateAct = E5Action(
147 UI.PixmapCache.getIcon("vcsUpdate.png"), 150 self.trUtf8('Update from repository'),
148 self.trUtf8('&Update from repository'), 0, 0, self, 151 UI.PixmapCache.getIcon("vcsUpdate.png"),
149 'mercurial_update') 152 self.trUtf8('&Update from repository'), 0, 0, self,
153 'mercurial_update')
150 self.vcsUpdateAct.setStatusTip(self.trUtf8( 154 self.vcsUpdateAct.setStatusTip(self.trUtf8(
151 'Update the local project from the Mercurial repository' 155 'Update the local project from the Mercurial repository'
152 )) 156 ))
153 self.vcsUpdateAct.setWhatsThis(self.trUtf8( 157 self.vcsUpdateAct.setWhatsThis(self.trUtf8(
154 """<b>Update from repository</b>""" 158 """<b>Update from repository</b>"""
172 """Mercurial repository.</p>""" 176 """Mercurial repository.</p>"""
173 )) 177 ))
174 self.vcsCommitAct.triggered[()].connect(self._vcsCommit) 178 self.vcsCommitAct.triggered[()].connect(self._vcsCommit)
175 self.actions.append(self.vcsCommitAct) 179 self.actions.append(self.vcsCommitAct)
176 180
177 self.hgOutgoingAct = E5Action(self.trUtf8('Show outgoing log'), 181 self.hgOutgoingAct = E5Action(
178 UI.PixmapCache.getIcon("vcsCommit.png"), 182 self.trUtf8('Show outgoing log'),
179 self.trUtf8('Show outgoing log'), 183 UI.PixmapCache.getIcon("vcsCommit.png"),
180 0, 0, self, 'mercurial_outgoing') 184 self.trUtf8('Show outgoing log'),
185 0, 0, self, 'mercurial_outgoing')
181 self.hgOutgoingAct.setStatusTip(self.trUtf8( 186 self.hgOutgoingAct.setStatusTip(self.trUtf8(
182 'Show the log of outgoing changes' 187 'Show the log of outgoing changes'
183 )) 188 ))
184 self.hgOutgoingAct.setWhatsThis(self.trUtf8( 189 self.hgOutgoingAct.setWhatsThis(self.trUtf8(
185 """<b>Show outgoing log</b>""" 190 """<b>Show outgoing log</b>"""
187 """ repository.</p>""" 192 """ repository.</p>"""
188 )) 193 ))
189 self.hgOutgoingAct.triggered[()].connect(self.__hgOutgoing) 194 self.hgOutgoingAct.triggered[()].connect(self.__hgOutgoing)
190 self.actions.append(self.hgOutgoingAct) 195 self.actions.append(self.hgOutgoingAct)
191 196
192 self.hgPushAct = E5Action(self.trUtf8('Push changes'), 197 self.hgPushAct = E5Action(
193 UI.PixmapCache.getIcon("vcsCommit.png"), 198 self.trUtf8('Push changes'),
194 self.trUtf8('Push changes'), 199 UI.PixmapCache.getIcon("vcsCommit.png"),
195 0, 0, self, 'mercurial_push') 200 self.trUtf8('Push changes'),
201 0, 0, self, 'mercurial_push')
196 self.hgPushAct.setStatusTip(self.trUtf8( 202 self.hgPushAct.setStatusTip(self.trUtf8(
197 'Push changes to a remote repository' 203 'Push changes to a remote repository'
198 )) 204 ))
199 self.hgPushAct.setWhatsThis(self.trUtf8( 205 self.hgPushAct.setWhatsThis(self.trUtf8(
200 """<b>Push changes</b>""" 206 """<b>Push changes</b>"""
202 """remote repository.</p>""" 208 """remote repository.</p>"""
203 )) 209 ))
204 self.hgPushAct.triggered[()].connect(self.__hgPush) 210 self.hgPushAct.triggered[()].connect(self.__hgPush)
205 self.actions.append(self.hgPushAct) 211 self.actions.append(self.hgPushAct)
206 212
207 self.hgPushForcedAct = E5Action(self.trUtf8('Push changes (force)'), 213 self.hgPushForcedAct = E5Action(
208 UI.PixmapCache.getIcon("vcsCommit.png"), 214 self.trUtf8('Push changes (force)'),
209 self.trUtf8('Push changes (force)'), 215 UI.PixmapCache.getIcon("vcsCommit.png"),
210 0, 0, self, 'mercurial_push_forced') 216 self.trUtf8('Push changes (force)'),
217 0, 0, self, 'mercurial_push_forced')
211 self.hgPushForcedAct.setStatusTip(self.trUtf8( 218 self.hgPushForcedAct.setStatusTip(self.trUtf8(
212 'Push changes to a remote repository with force option' 219 'Push changes to a remote repository with force option'
213 )) 220 ))
214 self.hgPushForcedAct.setWhatsThis(self.trUtf8( 221 self.hgPushForcedAct.setWhatsThis(self.trUtf8(
215 """<b>Push changes (force)</b>""" 222 """<b>Push changes (force)</b>"""
217 """remote repository using the 'force' option.</p>""" 224 """remote repository using the 'force' option.</p>"""
218 )) 225 ))
219 self.hgPushForcedAct.triggered[()].connect(self.__hgPushForced) 226 self.hgPushForcedAct.triggered[()].connect(self.__hgPushForced)
220 self.actions.append(self.hgPushForcedAct) 227 self.actions.append(self.hgPushForcedAct)
221 228
222 self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), 229 self.vcsExportAct = E5Action(
223 UI.PixmapCache.getIcon("vcsExport.png"), 230 self.trUtf8('Export from repository'),
224 self.trUtf8('&Export from repository...'), 231 UI.PixmapCache.getIcon("vcsExport.png"),
225 0, 0, self, 'mercurial_export_repo') 232 self.trUtf8('&Export from repository...'),
233 0, 0, self, 'mercurial_export_repo')
226 self.vcsExportAct.setStatusTip(self.trUtf8( 234 self.vcsExportAct.setStatusTip(self.trUtf8(
227 'Export a project from the repository' 235 'Export a project from the repository'
228 )) 236 ))
229 self.vcsExportAct.setWhatsThis(self.trUtf8( 237 self.vcsExportAct.setWhatsThis(self.trUtf8(
230 """<b>Export from repository</b>""" 238 """<b>Export from repository</b>"""
231 """<p>This exports a project from the repository.</p>""" 239 """<p>This exports a project from the repository.</p>"""
232 )) 240 ))
233 self.vcsExportAct.triggered[()].connect(self._vcsExport) 241 self.vcsExportAct.triggered[()].connect(self._vcsExport)
234 self.actions.append(self.vcsExportAct) 242 self.actions.append(self.vcsExportAct)
235 243
236 self.vcsLogAct = E5Action(self.trUtf8('Show log'), 244 self.vcsLogAct = E5Action(
237 UI.PixmapCache.getIcon("vcsLog.png"), 245 self.trUtf8('Show log'),
238 self.trUtf8('Show &log'), 246 UI.PixmapCache.getIcon("vcsLog.png"),
239 0, 0, self, 'mercurial_log') 247 self.trUtf8('Show &log'),
248 0, 0, self, 'mercurial_log')
240 self.vcsLogAct.setStatusTip(self.trUtf8( 249 self.vcsLogAct.setStatusTip(self.trUtf8(
241 'Show the log of the local project' 250 'Show the log of the local project'
242 )) 251 ))
243 self.vcsLogAct.setWhatsThis(self.trUtf8( 252 self.vcsLogAct.setWhatsThis(self.trUtf8(
244 """<b>Show log</b>""" 253 """<b>Show log</b>"""
245 """<p>This shows the log of the local project.</p>""" 254 """<p>This shows the log of the local project.</p>"""
246 )) 255 ))
247 self.vcsLogAct.triggered[()].connect(self._vcsLog) 256 self.vcsLogAct.triggered[()].connect(self._vcsLog)
248 self.actions.append(self.vcsLogAct) 257 self.actions.append(self.vcsLogAct)
249 258
250 self.hgLogBrowserAct = E5Action(self.trUtf8('Show log browser'), 259 self.hgLogBrowserAct = E5Action(
251 UI.PixmapCache.getIcon("vcsLog.png"), 260 self.trUtf8('Show log browser'),
252 self.trUtf8('Show log browser'), 261 UI.PixmapCache.getIcon("vcsLog.png"),
253 0, 0, self, 'mercurial_log_browser') 262 self.trUtf8('Show log browser'),
263 0, 0, self, 'mercurial_log_browser')
254 self.hgLogBrowserAct.setStatusTip(self.trUtf8( 264 self.hgLogBrowserAct.setStatusTip(self.trUtf8(
255 'Show a dialog to browse the log of the local project' 265 'Show a dialog to browse the log of the local project'
256 )) 266 ))
257 self.hgLogBrowserAct.setWhatsThis(self.trUtf8( 267 self.hgLogBrowserAct.setWhatsThis(self.trUtf8(
258 """<b>Show log browser</b>""" 268 """<b>Show log browser</b>"""
261 """ More can be retrieved later on.</p>""" 271 """ More can be retrieved later on.</p>"""
262 )) 272 ))
263 self.hgLogBrowserAct.triggered[()].connect(self.__hgLogBrowser) 273 self.hgLogBrowserAct.triggered[()].connect(self.__hgLogBrowser)
264 self.actions.append(self.hgLogBrowserAct) 274 self.actions.append(self.hgLogBrowserAct)
265 275
266 self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), 276 self.vcsDiffAct = E5Action(
267 UI.PixmapCache.getIcon("vcsDiff.png"), 277 self.trUtf8('Show difference'),
268 self.trUtf8('Show &difference'), 278 UI.PixmapCache.getIcon("vcsDiff.png"),
269 0, 0, self, 'mercurial_diff') 279 self.trUtf8('Show &difference'),
280 0, 0, self, 'mercurial_diff')
270 self.vcsDiffAct.setStatusTip(self.trUtf8( 281 self.vcsDiffAct.setStatusTip(self.trUtf8(
271 'Show the difference of the local project to the repository' 282 'Show the difference of the local project to the repository'
272 )) 283 ))
273 self.vcsDiffAct.setWhatsThis(self.trUtf8( 284 self.vcsDiffAct.setWhatsThis(self.trUtf8(
274 """<b>Show difference</b>""" 285 """<b>Show difference</b>"""
276 """ repository.</p>""" 287 """ repository.</p>"""
277 )) 288 ))
278 self.vcsDiffAct.triggered[()].connect(self._vcsDiff) 289 self.vcsDiffAct.triggered[()].connect(self._vcsDiff)
279 self.actions.append(self.vcsDiffAct) 290 self.actions.append(self.vcsDiffAct)
280 291
281 self.hgExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), 292 self.hgExtDiffAct = E5Action(
282 UI.PixmapCache.getIcon("vcsDiff.png"), 293 self.trUtf8('Show difference (extended)'),
283 self.trUtf8('Show difference (extended)'), 294 UI.PixmapCache.getIcon("vcsDiff.png"),
284 0, 0, self, 'mercurial_extendeddiff') 295 self.trUtf8('Show difference (extended)'),
296 0, 0, self, 'mercurial_extendeddiff')
285 self.hgExtDiffAct.setStatusTip(self.trUtf8( 297 self.hgExtDiffAct.setStatusTip(self.trUtf8(
286 'Show the difference of revisions of the project to the repository' 298 'Show the difference of revisions of the project to the repository'
287 )) 299 ))
288 self.hgExtDiffAct.setWhatsThis(self.trUtf8( 300 self.hgExtDiffAct.setWhatsThis(self.trUtf8(
289 """<b>Show difference (extended)</b>""" 301 """<b>Show difference (extended)</b>"""
291 """ project.</p>""" 303 """ project.</p>"""
292 )) 304 ))
293 self.hgExtDiffAct.triggered[()].connect(self.__hgExtendedDiff) 305 self.hgExtDiffAct.triggered[()].connect(self.__hgExtendedDiff)
294 self.actions.append(self.hgExtDiffAct) 306 self.actions.append(self.hgExtDiffAct)
295 307
296 self.vcsStatusAct = E5Action(self.trUtf8('Show status'), 308 self.vcsStatusAct = E5Action(
297 UI.PixmapCache.getIcon("vcsStatus.png"), 309 self.trUtf8('Show status'),
298 self.trUtf8('Show &status...'), 310 UI.PixmapCache.getIcon("vcsStatus.png"),
299 0, 0, self, 'mercurial_status') 311 self.trUtf8('Show &status...'),
312 0, 0, self, 'mercurial_status')
300 self.vcsStatusAct.setStatusTip(self.trUtf8( 313 self.vcsStatusAct.setStatusTip(self.trUtf8(
301 'Show the status of the local project' 314 'Show the status of the local project'
302 )) 315 ))
303 self.vcsStatusAct.setWhatsThis(self.trUtf8( 316 self.vcsStatusAct.setWhatsThis(self.trUtf8(
304 """<b>Show status</b>""" 317 """<b>Show status</b>"""
321 """ directory status.</p>""" 334 """ directory status.</p>"""
322 )) 335 ))
323 self.hgSummaryAct.triggered[()].connect(self.__hgSummary) 336 self.hgSummaryAct.triggered[()].connect(self.__hgSummary)
324 self.actions.append(self.hgSummaryAct) 337 self.actions.append(self.hgSummaryAct)
325 338
326 self.hgHeadsAct = E5Action(self.trUtf8('Show heads'), 339 self.hgHeadsAct = E5Action(
327 self.trUtf8('Show heads'), 340 self.trUtf8('Show heads'),
328 0, 0, self, 'mercurial_heads') 341 self.trUtf8('Show heads'),
342 0, 0, self, 'mercurial_heads')
329 self.hgHeadsAct.setStatusTip(self.trUtf8( 343 self.hgHeadsAct.setStatusTip(self.trUtf8(
330 'Show the heads of the repository' 344 'Show the heads of the repository'
331 )) 345 ))
332 self.hgHeadsAct.setWhatsThis(self.trUtf8( 346 self.hgHeadsAct.setWhatsThis(self.trUtf8(
333 """<b>Show heads</b>""" 347 """<b>Show heads</b>"""
334 """<p>This shows the heads of the repository.</p>""" 348 """<p>This shows the heads of the repository.</p>"""
335 )) 349 ))
336 self.hgHeadsAct.triggered[()].connect(self.__hgHeads) 350 self.hgHeadsAct.triggered[()].connect(self.__hgHeads)
337 self.actions.append(self.hgHeadsAct) 351 self.actions.append(self.hgHeadsAct)
338 352
339 self.hgParentsAct = E5Action(self.trUtf8('Show parents'), 353 self.hgParentsAct = E5Action(
340 self.trUtf8('Show parents'), 354 self.trUtf8('Show parents'),
341 0, 0, self, 'mercurial_parents') 355 self.trUtf8('Show parents'),
356 0, 0, self, 'mercurial_parents')
342 self.hgParentsAct.setStatusTip(self.trUtf8( 357 self.hgParentsAct.setStatusTip(self.trUtf8(
343 'Show the parents of the repository' 358 'Show the parents of the repository'
344 )) 359 ))
345 self.hgParentsAct.setWhatsThis(self.trUtf8( 360 self.hgParentsAct.setWhatsThis(self.trUtf8(
346 """<b>Show parents</b>""" 361 """<b>Show parents</b>"""
347 """<p>This shows the parents of the repository.</p>""" 362 """<p>This shows the parents of the repository.</p>"""
348 )) 363 ))
349 self.hgParentsAct.triggered[()].connect(self.__hgParents) 364 self.hgParentsAct.triggered[()].connect(self.__hgParents)
350 self.actions.append(self.hgParentsAct) 365 self.actions.append(self.hgParentsAct)
351 366
352 self.hgTipAct = E5Action(self.trUtf8('Show tip'), 367 self.hgTipAct = E5Action(
353 self.trUtf8('Show tip'), 368 self.trUtf8('Show tip'),
354 0, 0, self, 'mercurial_tip') 369 self.trUtf8('Show tip'),
370 0, 0, self, 'mercurial_tip')
355 self.hgTipAct.setStatusTip(self.trUtf8( 371 self.hgTipAct.setStatusTip(self.trUtf8(
356 'Show the tip of the repository' 372 'Show the tip of the repository'
357 )) 373 ))
358 self.hgTipAct.setWhatsThis(self.trUtf8( 374 self.hgTipAct.setWhatsThis(self.trUtf8(
359 """<b>Show tip</b>""" 375 """<b>Show tip</b>"""
360 """<p>This shows the tip of the repository.</p>""" 376 """<p>This shows the tip of the repository.</p>"""
361 )) 377 ))
362 self.hgTipAct.triggered[()].connect(self.__hgTip) 378 self.hgTipAct.triggered[()].connect(self.__hgTip)
363 self.actions.append(self.hgTipAct) 379 self.actions.append(self.hgTipAct)
364 380
365 self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), 381 self.vcsRevertAct = E5Action(
366 UI.PixmapCache.getIcon("vcsRevert.png"), 382 self.trUtf8('Revert changes'),
367 self.trUtf8('Re&vert changes'), 383 UI.PixmapCache.getIcon("vcsRevert.png"),
368 0, 0, self, 'mercurial_revert') 384 self.trUtf8('Re&vert changes'),
385 0, 0, self, 'mercurial_revert')
369 self.vcsRevertAct.setStatusTip(self.trUtf8( 386 self.vcsRevertAct.setStatusTip(self.trUtf8(
370 'Revert all changes made to the local project' 387 'Revert all changes made to the local project'
371 )) 388 ))
372 self.vcsRevertAct.setWhatsThis(self.trUtf8( 389 self.vcsRevertAct.setWhatsThis(self.trUtf8(
373 """<b>Revert changes</b>""" 390 """<b>Revert changes</b>"""
374 """<p>This reverts all changes made to the local project.</p>""" 391 """<p>This reverts all changes made to the local project.</p>"""
375 )) 392 ))
376 self.vcsRevertAct.triggered[()].connect(self.__hgRevert) 393 self.vcsRevertAct.triggered[()].connect(self.__hgRevert)
377 self.actions.append(self.vcsRevertAct) 394 self.actions.append(self.vcsRevertAct)
378 395
379 self.vcsMergeAct = E5Action(self.trUtf8('Merge'), 396 self.vcsMergeAct = E5Action(
380 UI.PixmapCache.getIcon("vcsMerge.png"), 397 self.trUtf8('Merge'),
381 self.trUtf8('Mer&ge changes...'), 398 UI.PixmapCache.getIcon("vcsMerge.png"),
382 0, 0, self, 'mercurial_merge') 399 self.trUtf8('Mer&ge changes...'),
400 0, 0, self, 'mercurial_merge')
383 self.vcsMergeAct.setStatusTip(self.trUtf8( 401 self.vcsMergeAct.setStatusTip(self.trUtf8(
384 'Merge changes of a revision into the local project' 402 'Merge changes of a revision into the local project'
385 )) 403 ))
386 self.vcsMergeAct.setWhatsThis(self.trUtf8( 404 self.vcsMergeAct.setWhatsThis(self.trUtf8(
387 """<b>Merge</b>""" 405 """<b>Merge</b>"""
389 """ project.</p>""" 407 """ project.</p>"""
390 )) 408 ))
391 self.vcsMergeAct.triggered[()].connect(self._vcsMerge) 409 self.vcsMergeAct.triggered[()].connect(self._vcsMerge)
392 self.actions.append(self.vcsMergeAct) 410 self.actions.append(self.vcsMergeAct)
393 411
394 self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), 412 self.vcsResolveAct = E5Action(
395 self.trUtf8('Con&flicts resolved'), 413 self.trUtf8('Conflicts resolved'),
396 0, 0, self, 'mercurial_resolve') 414 self.trUtf8('Con&flicts resolved'),
415 0, 0, self, 'mercurial_resolve')
397 self.vcsResolveAct.setStatusTip(self.trUtf8( 416 self.vcsResolveAct.setStatusTip(self.trUtf8(
398 'Mark all conflicts of the local project as resolved' 417 'Mark all conflicts of the local project as resolved'
399 )) 418 ))
400 self.vcsResolveAct.setWhatsThis(self.trUtf8( 419 self.vcsResolveAct.setWhatsThis(self.trUtf8(
401 """<b>Conflicts resolved</b>""" 420 """<b>Conflicts resolved</b>"""
403 """ resolved.</p>""" 422 """ resolved.</p>"""
404 )) 423 ))
405 self.vcsResolveAct.triggered[()].connect(self.__hgResolve) 424 self.vcsResolveAct.triggered[()].connect(self.__hgResolve)
406 self.actions.append(self.vcsResolveAct) 425 self.actions.append(self.vcsResolveAct)
407 426
408 self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), 427 self.vcsTagAct = E5Action(
409 UI.PixmapCache.getIcon("vcsTag.png"), 428 self.trUtf8('Tag in repository'),
410 self.trUtf8('&Tag in repository...'), 429 UI.PixmapCache.getIcon("vcsTag.png"),
411 0, 0, self, 'mercurial_tag') 430 self.trUtf8('&Tag in repository...'),
431 0, 0, self, 'mercurial_tag')
412 self.vcsTagAct.setStatusTip(self.trUtf8( 432 self.vcsTagAct.setStatusTip(self.trUtf8(
413 'Tag the local project in the repository' 433 'Tag the local project in the repository'
414 )) 434 ))
415 self.vcsTagAct.setWhatsThis(self.trUtf8( 435 self.vcsTagAct.setWhatsThis(self.trUtf8(
416 """<b>Tag in repository</b>""" 436 """<b>Tag in repository</b>"""
417 """<p>This tags the local project in the repository.</p>""" 437 """<p>This tags the local project in the repository.</p>"""
418 )) 438 ))
419 self.vcsTagAct.triggered[()].connect(self._vcsTag) 439 self.vcsTagAct.triggered[()].connect(self._vcsTag)
420 self.actions.append(self.vcsTagAct) 440 self.actions.append(self.vcsTagAct)
421 441
422 self.hgTagListAct = E5Action(self.trUtf8('List tags'), 442 self.hgTagListAct = E5Action(
423 self.trUtf8('List tags...'), 443 self.trUtf8('List tags'),
424 0, 0, self, 'mercurial_list_tags') 444 self.trUtf8('List tags...'),
445 0, 0, self, 'mercurial_list_tags')
425 self.hgTagListAct.setStatusTip(self.trUtf8( 446 self.hgTagListAct.setStatusTip(self.trUtf8(
426 'List tags of the project' 447 'List tags of the project'
427 )) 448 ))
428 self.hgTagListAct.setWhatsThis(self.trUtf8( 449 self.hgTagListAct.setWhatsThis(self.trUtf8(
429 """<b>List tags</b>""" 450 """<b>List tags</b>"""
430 """<p>This lists the tags of the project.</p>""" 451 """<p>This lists the tags of the project.</p>"""
431 )) 452 ))
432 self.hgTagListAct.triggered[()].connect(self.__hgTagList) 453 self.hgTagListAct.triggered[()].connect(self.__hgTagList)
433 self.actions.append(self.hgTagListAct) 454 self.actions.append(self.hgTagListAct)
434 455
435 self.hgBranchListAct = E5Action(self.trUtf8('List branches'), 456 self.hgBranchListAct = E5Action(
436 self.trUtf8('List branches...'), 457 self.trUtf8('List branches'),
437 0, 0, self, 'mercurial_list_branches') 458 self.trUtf8('List branches...'),
459 0, 0, self, 'mercurial_list_branches')
438 self.hgBranchListAct.setStatusTip(self.trUtf8( 460 self.hgBranchListAct.setStatusTip(self.trUtf8(
439 'List branches of the project' 461 'List branches of the project'
440 )) 462 ))
441 self.hgBranchListAct.setWhatsThis(self.trUtf8( 463 self.hgBranchListAct.setWhatsThis(self.trUtf8(
442 """<b>List branches</b>""" 464 """<b>List branches</b>"""
443 """<p>This lists the branches of the project.</p>""" 465 """<p>This lists the branches of the project.</p>"""
444 )) 466 ))
445 self.hgBranchListAct.triggered[()].connect(self.__hgBranchList) 467 self.hgBranchListAct.triggered[()].connect(self.__hgBranchList)
446 self.actions.append(self.hgBranchListAct) 468 self.actions.append(self.hgBranchListAct)
447 469
448 self.hgBranchAct = E5Action(self.trUtf8('Create branch'), 470 self.hgBranchAct = E5Action(
449 UI.PixmapCache.getIcon("vcsBranch.png"), 471 self.trUtf8('Create branch'),
450 self.trUtf8('Create &branch...'), 472 UI.PixmapCache.getIcon("vcsBranch.png"),
451 0, 0, self, 'mercurial_branch') 473 self.trUtf8('Create &branch...'),
474 0, 0, self, 'mercurial_branch')
452 self.hgBranchAct.setStatusTip(self.trUtf8( 475 self.hgBranchAct.setStatusTip(self.trUtf8(
453 'Create a new branch for the local project in the repository' 476 'Create a new branch for the local project in the repository'
454 )) 477 ))
455 self.hgBranchAct.setWhatsThis(self.trUtf8( 478 self.hgBranchAct.setWhatsThis(self.trUtf8(
456 """<b>Create branch</b>""" 479 """<b>Create branch</b>"""
458 """in the repository.</p>""" 481 """in the repository.</p>"""
459 )) 482 ))
460 self.hgBranchAct.triggered[()].connect(self.__hgBranch) 483 self.hgBranchAct.triggered[()].connect(self.__hgBranch)
461 self.actions.append(self.hgBranchAct) 484 self.actions.append(self.hgBranchAct)
462 485
463 self.hgPushBranchAct = E5Action(self.trUtf8('Push new branch'), 486 self.hgPushBranchAct = E5Action(
464 self.trUtf8('Push new branch'), 487 self.trUtf8('Push new branch'),
465 0, 0, self, 'mercurial_push_branch') 488 self.trUtf8('Push new branch'),
489 0, 0, self, 'mercurial_push_branch')
466 self.hgPushBranchAct.setStatusTip(self.trUtf8( 490 self.hgPushBranchAct.setStatusTip(self.trUtf8(
467 'Push the current branch of the local project as a new named' 491 'Push the current branch of the local project as a new named'
468 ' branch' 492 ' branch'
469 )) 493 ))
470 self.hgPushBranchAct.setWhatsThis(self.trUtf8( 494 self.hgPushBranchAct.setWhatsThis(self.trUtf8(
473 """ as a new named branch.</p>""" 497 """ as a new named branch.</p>"""
474 )) 498 ))
475 self.hgPushBranchAct.triggered[()].connect(self.__hgPushNewBranch) 499 self.hgPushBranchAct.triggered[()].connect(self.__hgPushNewBranch)
476 self.actions.append(self.hgPushBranchAct) 500 self.actions.append(self.hgPushBranchAct)
477 501
478 self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), 502 self.hgCloseBranchAct = E5Action(
479 self.trUtf8('Close branch'), 503 self.trUtf8('Close branch'),
480 0, 0, self, 'mercurial_close_branch') 504 self.trUtf8('Close branch'),
505 0, 0, self, 'mercurial_close_branch')
481 self.hgCloseBranchAct.setStatusTip(self.trUtf8( 506 self.hgCloseBranchAct.setStatusTip(self.trUtf8(
482 'Close the current branch of the local project' 507 'Close the current branch of the local project'
483 )) 508 ))
484 self.hgCloseBranchAct.setWhatsThis(self.trUtf8( 509 self.hgCloseBranchAct.setWhatsThis(self.trUtf8(
485 """<b>Close branch</b>""" 510 """<b>Close branch</b>"""
486 """<p>This closes the current branch of the local project.</p>""" 511 """<p>This closes the current branch of the local project.</p>"""
487 )) 512 ))
488 self.hgCloseBranchAct.triggered[()].connect(self.__hgCloseBranch) 513 self.hgCloseBranchAct.triggered[()].connect(self.__hgCloseBranch)
489 self.actions.append(self.hgCloseBranchAct) 514 self.actions.append(self.hgCloseBranchAct)
490 515
491 self.hgShowBranchAct = E5Action(self.trUtf8('Show current branch'), 516 self.hgShowBranchAct = E5Action(
492 self.trUtf8('Show current branch'), 517 self.trUtf8('Show current branch'),
493 0, 0, self, 'mercurial_show_branch') 518 self.trUtf8('Show current branch'),
519 0, 0, self, 'mercurial_show_branch')
494 self.hgShowBranchAct.setStatusTip(self.trUtf8( 520 self.hgShowBranchAct.setStatusTip(self.trUtf8(
495 'Show the current branch of the project' 521 'Show the current branch of the project'
496 )) 522 ))
497 self.hgShowBranchAct.setWhatsThis(self.trUtf8( 523 self.hgShowBranchAct.setWhatsThis(self.trUtf8(
498 """<b>Show current branch</b>""" 524 """<b>Show current branch</b>"""
499 """<p>This shows the current branch of the project.</p>""" 525 """<p>This shows the current branch of the project.</p>"""
500 )) 526 ))
501 self.hgShowBranchAct.triggered[()].connect(self.__hgShowBranch) 527 self.hgShowBranchAct.triggered[()].connect(self.__hgShowBranch)
502 self.actions.append(self.hgShowBranchAct) 528 self.actions.append(self.hgShowBranchAct)
503 529
504 self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), 530 self.vcsSwitchAct = E5Action(
505 UI.PixmapCache.getIcon("vcsSwitch.png"), 531 self.trUtf8('Switch'),
506 self.trUtf8('S&witch...'), 532 UI.PixmapCache.getIcon("vcsSwitch.png"),
507 0, 0, self, 'mercurial_switch') 533 self.trUtf8('S&witch...'),
534 0, 0, self, 'mercurial_switch')
508 self.vcsSwitchAct.setStatusTip(self.trUtf8( 535 self.vcsSwitchAct.setStatusTip(self.trUtf8(
509 'Switch the working directory to another revision' 536 'Switch the working directory to another revision'
510 )) 537 ))
511 self.vcsSwitchAct.setWhatsThis(self.trUtf8( 538 self.vcsSwitchAct.setWhatsThis(self.trUtf8(
512 """<b>Switch</b>""" 539 """<b>Switch</b>"""
514 """ revision.</p>""" 541 """ revision.</p>"""
515 )) 542 ))
516 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) 543 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch)
517 self.actions.append(self.vcsSwitchAct) 544 self.actions.append(self.vcsSwitchAct)
518 545
519 self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), 546 self.vcsCleanupAct = E5Action(
520 self.trUtf8('Cleanu&p'), 547 self.trUtf8('Cleanup'),
521 0, 0, self, 'mercurial_cleanup') 548 self.trUtf8('Cleanu&p'),
549 0, 0, self, 'mercurial_cleanup')
522 self.vcsCleanupAct.setStatusTip(self.trUtf8( 550 self.vcsCleanupAct.setStatusTip(self.trUtf8(
523 'Cleanup the local project' 551 'Cleanup the local project'
524 )) 552 ))
525 self.vcsCleanupAct.setWhatsThis(self.trUtf8( 553 self.vcsCleanupAct.setWhatsThis(self.trUtf8(
526 """<b>Cleanup</b>""" 554 """<b>Cleanup</b>"""
527 """<p>This performs a cleanup of the local project.</p>""" 555 """<p>This performs a cleanup of the local project.</p>"""
528 )) 556 ))
529 self.vcsCleanupAct.triggered[()].connect(self._vcsCleanup) 557 self.vcsCleanupAct.triggered[()].connect(self._vcsCleanup)
530 self.actions.append(self.vcsCleanupAct) 558 self.actions.append(self.vcsCleanupAct)
531 559
532 self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), 560 self.vcsCommandAct = E5Action(
533 self.trUtf8('E&xecute command...'), 561 self.trUtf8('Execute command'),
534 0, 0, self, 'mercurial_command') 562 self.trUtf8('E&xecute command...'),
563 0, 0, self, 'mercurial_command')
535 self.vcsCommandAct.setStatusTip(self.trUtf8( 564 self.vcsCommandAct.setStatusTip(self.trUtf8(
536 'Execute an arbitrary Mercurial command' 565 'Execute an arbitrary Mercurial command'
537 )) 566 ))
538 self.vcsCommandAct.setWhatsThis(self.trUtf8( 567 self.vcsCommandAct.setWhatsThis(self.trUtf8(
539 """<b>Execute command</b>""" 568 """<b>Execute command</b>"""
541 """ command.</p>""" 570 """ command.</p>"""
542 )) 571 ))
543 self.vcsCommandAct.triggered[()].connect(self._vcsCommand) 572 self.vcsCommandAct.triggered[()].connect(self._vcsCommand)
544 self.actions.append(self.vcsCommandAct) 573 self.actions.append(self.vcsCommandAct)
545 574
546 self.vcsPropsAct = E5Action(self.trUtf8('Command options'), 575 self.vcsPropsAct = E5Action(
547 self.trUtf8('Command &options...'), 0, 0, self, 576 self.trUtf8('Command options'),
548 'mercurial_options') 577 self.trUtf8('Command &options...'), 0, 0, self,
578 'mercurial_options')
549 self.vcsPropsAct.setStatusTip(self.trUtf8( 579 self.vcsPropsAct.setStatusTip(self.trUtf8(
550 'Show the Mercurial command options')) 580 'Show the Mercurial command options'))
551 self.vcsPropsAct.setWhatsThis(self.trUtf8( 581 self.vcsPropsAct.setWhatsThis(self.trUtf8(
552 """<b>Command options...</b>""" 582 """<b>Command options...</b>"""
553 """<p>This shows a dialog to edit the Mercurial command""" 583 """<p>This shows a dialog to edit the Mercurial command"""
554 """ options.</p>""" 584 """ options.</p>"""
555 )) 585 ))
556 self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions) 586 self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions)
557 self.actions.append(self.vcsPropsAct) 587 self.actions.append(self.vcsPropsAct)
558 588
559 self.hgConfigAct = E5Action(self.trUtf8('Configure'), 589 self.hgConfigAct = E5Action(
560 self.trUtf8('Configure...'), 590 self.trUtf8('Configure'),
561 0, 0, self, 'mercurial_configure') 591 self.trUtf8('Configure...'),
592 0, 0, self, 'mercurial_configure')
562 self.hgConfigAct.setStatusTip(self.trUtf8( 593 self.hgConfigAct.setStatusTip(self.trUtf8(
563 'Show the configuration dialog with the Mercurial page selected' 594 'Show the configuration dialog with the Mercurial page selected'
564 )) 595 ))
565 self.hgConfigAct.setWhatsThis(self.trUtf8( 596 self.hgConfigAct.setWhatsThis(self.trUtf8(
566 """<b>Configure</b>""" 597 """<b>Configure</b>"""
598 )) 629 ))
599 self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig) 630 self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig)
600 self.actions.append(self.hgRepoConfigAct) 631 self.actions.append(self.hgRepoConfigAct)
601 632
602 self.hgShowConfigAct = E5Action( 633 self.hgShowConfigAct = E5Action(
603 self.trUtf8('Show combined configuration settings'), 634 self.trUtf8('Show combined configuration settings'),
604 self.trUtf8('Show combined configuration settings...'), 635 self.trUtf8('Show combined configuration settings...'),
605 0, 0, self, 'mercurial_show_config') 636 0, 0, self, 'mercurial_show_config')
606 self.hgShowConfigAct.setStatusTip(self.trUtf8( 637 self.hgShowConfigAct.setStatusTip(self.trUtf8(
607 'Show the combined configuration settings from all configuration' 638 'Show the combined configuration settings from all configuration'
608 ' files' 639 ' files'
609 )) 640 ))
610 self.hgShowConfigAct.setWhatsThis(self.trUtf8( 641 self.hgShowConfigAct.setWhatsThis(self.trUtf8(
613 """ from all configuration files.</p>""" 644 """ from all configuration files.</p>"""
614 )) 645 ))
615 self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig) 646 self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig)
616 self.actions.append(self.hgShowConfigAct) 647 self.actions.append(self.hgShowConfigAct)
617 648
618 self.hgShowPathsAct = E5Action(self.trUtf8('Show paths'), 649 self.hgShowPathsAct = E5Action(
619 self.trUtf8('Show paths...'), 650 self.trUtf8('Show paths'),
620 0, 0, self, 'mercurial_show_paths') 651 self.trUtf8('Show paths...'),
652 0, 0, self, 'mercurial_show_paths')
621 self.hgShowPathsAct.setStatusTip(self.trUtf8( 653 self.hgShowPathsAct.setStatusTip(self.trUtf8(
622 'Show the aliases for remote repositories' 654 'Show the aliases for remote repositories'
623 )) 655 ))
624 self.hgShowPathsAct.setWhatsThis(self.trUtf8( 656 self.hgShowPathsAct.setWhatsThis(self.trUtf8(
625 """<b>Show paths</b>""" 657 """<b>Show paths</b>"""
626 """<p>This shows the aliases for remote repositories.</p>""" 658 """<p>This shows the aliases for remote repositories.</p>"""
627 )) 659 ))
628 self.hgShowPathsAct.triggered[()].connect(self.__hgShowPaths) 660 self.hgShowPathsAct.triggered[()].connect(self.__hgShowPaths)
629 self.actions.append(self.hgShowPathsAct) 661 self.actions.append(self.hgShowPathsAct)
630 662
631 self.hgVerifyAct = E5Action(self.trUtf8('Verify repository'), 663 self.hgVerifyAct = E5Action(
632 self.trUtf8('Verify repository...'), 664 self.trUtf8('Verify repository'),
633 0, 0, self, 'mercurial_verify') 665 self.trUtf8('Verify repository...'),
666 0, 0, self, 'mercurial_verify')
634 self.hgVerifyAct.setStatusTip(self.trUtf8( 667 self.hgVerifyAct.setStatusTip(self.trUtf8(
635 'Verify the integrity of the repository' 668 'Verify the integrity of the repository'
636 )) 669 ))
637 self.hgVerifyAct.setWhatsThis(self.trUtf8( 670 self.hgVerifyAct.setWhatsThis(self.trUtf8(
638 """<b>Verify repository</b>""" 671 """<b>Verify repository</b>"""
639 """<p>This verifies the integrity of the repository.</p>""" 672 """<p>This verifies the integrity of the repository.</p>"""
640 )) 673 ))
641 self.hgVerifyAct.triggered[()].connect(self.__hgVerify) 674 self.hgVerifyAct.triggered[()].connect(self.__hgVerify)
642 self.actions.append(self.hgVerifyAct) 675 self.actions.append(self.hgVerifyAct)
643 676
644 self.hgRecoverAct = E5Action(self.trUtf8('Recover'), 677 self.hgRecoverAct = E5Action(
645 self.trUtf8('Recover...'), 678 self.trUtf8('Recover'),
646 0, 0, self, 'mercurial_recover') 679 self.trUtf8('Recover...'),
680 0, 0, self, 'mercurial_recover')
647 self.hgRecoverAct.setStatusTip(self.trUtf8( 681 self.hgRecoverAct.setStatusTip(self.trUtf8(
648 'Recover from an interrupted transaction' 682 'Recover from an interrupted transaction'
649 )) 683 ))
650 self.hgRecoverAct.setWhatsThis(self.trUtf8( 684 self.hgRecoverAct.setWhatsThis(self.trUtf8(
651 """<b>Recover</b>""" 685 """<b>Recover</b>"""
652 """<p>This recovers from an interrupted transaction.</p>""" 686 """<p>This recovers from an interrupted transaction.</p>"""
653 )) 687 ))
654 self.hgRecoverAct.triggered[()].connect(self.__hgRecover) 688 self.hgRecoverAct.triggered[()].connect(self.__hgRecover)
655 self.actions.append(self.hgRecoverAct) 689 self.actions.append(self.hgRecoverAct)
656 690
657 self.hgIdentifyAct = E5Action(self.trUtf8('Identify'), 691 self.hgIdentifyAct = E5Action(
658 self.trUtf8('Identify...'), 692 self.trUtf8('Identify'),
659 0, 0, self, 'mercurial_identify') 693 self.trUtf8('Identify...'),
694 0, 0, self, 'mercurial_identify')
660 self.hgIdentifyAct.setStatusTip(self.trUtf8( 695 self.hgIdentifyAct.setStatusTip(self.trUtf8(
661 'Identify the project directory' 696 'Identify the project directory'
662 )) 697 ))
663 self.hgIdentifyAct.setWhatsThis(self.trUtf8( 698 self.hgIdentifyAct.setWhatsThis(self.trUtf8(
664 """<b>Identify</b>""" 699 """<b>Identify</b>"""
665 """<p>This identifies the project directory.</p>""" 700 """<p>This identifies the project directory.</p>"""
666 )) 701 ))
667 self.hgIdentifyAct.triggered[()].connect(self.__hgIdentify) 702 self.hgIdentifyAct.triggered[()].connect(self.__hgIdentify)
668 self.actions.append(self.hgIdentifyAct) 703 self.actions.append(self.hgIdentifyAct)
669 704
670 self.hgCreateIgnoreAct = E5Action(self.trUtf8('Create .hgignore'), 705 self.hgCreateIgnoreAct = E5Action(
671 self.trUtf8('Create .hgignore'), 706 self.trUtf8('Create .hgignore'),
672 0, 0, self, 'mercurial_create ignore') 707 self.trUtf8('Create .hgignore'),
708 0, 0, self, 'mercurial_create ignore')
673 self.hgCreateIgnoreAct.setStatusTip(self.trUtf8( 709 self.hgCreateIgnoreAct.setStatusTip(self.trUtf8(
674 'Create a .hgignore file with default values' 710 'Create a .hgignore file with default values'
675 )) 711 ))
676 self.hgCreateIgnoreAct.setWhatsThis(self.trUtf8( 712 self.hgCreateIgnoreAct.setWhatsThis(self.trUtf8(
677 """<b>Create .hgignore</b>""" 713 """<b>Create .hgignore</b>"""
678 """<p>This creates a .hgignore file with default values.</p>""" 714 """<p>This creates a .hgignore file with default values.</p>"""
679 )) 715 ))
680 self.hgCreateIgnoreAct.triggered[()].connect(self.__hgCreateIgnore) 716 self.hgCreateIgnoreAct.triggered[()].connect(self.__hgCreateIgnore)
681 self.actions.append(self.hgCreateIgnoreAct) 717 self.actions.append(self.hgCreateIgnoreAct)
682 718
683 self.hgBundleAct = E5Action(self.trUtf8('Create changegroup'), 719 self.hgBundleAct = E5Action(
684 self.trUtf8('Create changegroup...'), 720 self.trUtf8('Create changegroup'),
685 0, 0, self, 'mercurial_bundle') 721 self.trUtf8('Create changegroup...'),
722 0, 0, self, 'mercurial_bundle')
686 self.hgBundleAct.setStatusTip(self.trUtf8( 723 self.hgBundleAct.setStatusTip(self.trUtf8(
687 'Create changegroup file collecting changesets' 724 'Create changegroup file collecting changesets'
688 )) 725 ))
689 self.hgBundleAct.setWhatsThis(self.trUtf8( 726 self.hgBundleAct.setWhatsThis(self.trUtf8(
690 """<b>Create changegroup</b>""" 727 """<b>Create changegroup</b>"""
692 """ changesets (hg bundle).</p>""" 729 """ changesets (hg bundle).</p>"""
693 )) 730 ))
694 self.hgBundleAct.triggered[()].connect(self.__hgBundle) 731 self.hgBundleAct.triggered[()].connect(self.__hgBundle)
695 self.actions.append(self.hgBundleAct) 732 self.actions.append(self.hgBundleAct)
696 733
697 self.hgPreviewBundleAct = E5Action(self.trUtf8('Preview changegroup'), 734 self.hgPreviewBundleAct = E5Action(
698 self.trUtf8('Preview changegroup...'), 735 self.trUtf8('Preview changegroup'),
699 0, 0, self, 'mercurial_preview_bundle') 736 self.trUtf8('Preview changegroup...'),
737 0, 0, self, 'mercurial_preview_bundle')
700 self.hgPreviewBundleAct.setStatusTip(self.trUtf8( 738 self.hgPreviewBundleAct.setStatusTip(self.trUtf8(
701 'Preview a changegroup file containing a collection of changesets' 739 'Preview a changegroup file containing a collection of changesets'
702 )) 740 ))
703 self.hgPreviewBundleAct.setWhatsThis(self.trUtf8( 741 self.hgPreviewBundleAct.setWhatsThis(self.trUtf8(
704 """<b>Preview changegroup</b>""" 742 """<b>Preview changegroup</b>"""
721 """ collection of changesets.</p>""" 759 """ collection of changesets.</p>"""
722 )) 760 ))
723 self.hgIdentifyBundleAct.triggered[()].connect(self.__hgIdentifyBundle) 761 self.hgIdentifyBundleAct.triggered[()].connect(self.__hgIdentifyBundle)
724 self.actions.append(self.hgIdentifyBundleAct) 762 self.actions.append(self.hgIdentifyBundleAct)
725 763
726 self.hgUnbundleAct = E5Action(self.trUtf8('Apply changegroups'), 764 self.hgUnbundleAct = E5Action(
727 self.trUtf8('Apply changegroups...'), 765 self.trUtf8('Apply changegroups'),
728 0, 0, self, 'mercurial_unbundle') 766 self.trUtf8('Apply changegroups...'),
767 0, 0, self, 'mercurial_unbundle')
729 self.hgUnbundleAct.setStatusTip(self.trUtf8( 768 self.hgUnbundleAct.setStatusTip(self.trUtf8(
730 'Apply one or several changegroup files' 769 'Apply one or several changegroup files'
731 )) 770 ))
732 self.hgUnbundleAct.setWhatsThis(self.trUtf8( 771 self.hgUnbundleAct.setWhatsThis(self.trUtf8(
733 """<b>Apply changegroups</b>""" 772 """<b>Apply changegroups</b>"""
735 """ the 'Create changegroup' action (hg unbundle).</p>""" 774 """ the 'Create changegroup' action (hg unbundle).</p>"""
736 )) 775 ))
737 self.hgUnbundleAct.triggered[()].connect(self.__hgUnbundle) 776 self.hgUnbundleAct.triggered[()].connect(self.__hgUnbundle)
738 self.actions.append(self.hgUnbundleAct) 777 self.actions.append(self.hgUnbundleAct)
739 778
740 self.hgBisectGoodAct = E5Action(self.trUtf8('Mark as "good"'), 779 self.hgBisectGoodAct = E5Action(
741 self.trUtf8('Mark as "good"...'), 780 self.trUtf8('Mark as "good"'),
742 0, 0, self, 'mercurial_bisect_good') 781 self.trUtf8('Mark as "good"...'),
782 0, 0, self, 'mercurial_bisect_good')
743 self.hgBisectGoodAct.setStatusTip(self.trUtf8( 783 self.hgBisectGoodAct.setStatusTip(self.trUtf8(
744 'Mark a selectable changeset as good' 784 'Mark a selectable changeset as good'
745 )) 785 ))
746 self.hgBisectGoodAct.setWhatsThis(self.trUtf8( 786 self.hgBisectGoodAct.setWhatsThis(self.trUtf8(
747 """<b>Mark as good</b>""" 787 """<b>Mark as good</b>"""
748 """<p>This marks a selectable changeset as good.</p>""" 788 """<p>This marks a selectable changeset as good.</p>"""
749 )) 789 ))
750 self.hgBisectGoodAct.triggered[()].connect(self.__hgBisectGood) 790 self.hgBisectGoodAct.triggered[()].connect(self.__hgBisectGood)
751 self.actions.append(self.hgBisectGoodAct) 791 self.actions.append(self.hgBisectGoodAct)
752 792
753 self.hgBisectBadAct = E5Action(self.trUtf8('Mark as "bad"'), 793 self.hgBisectBadAct = E5Action(
754 self.trUtf8('Mark as "bad"...'), 794 self.trUtf8('Mark as "bad"'),
755 0, 0, self, 'mercurial_bisect_bad') 795 self.trUtf8('Mark as "bad"...'),
796 0, 0, self, 'mercurial_bisect_bad')
756 self.hgBisectBadAct.setStatusTip(self.trUtf8( 797 self.hgBisectBadAct.setStatusTip(self.trUtf8(
757 'Mark a selectable changeset as bad' 798 'Mark a selectable changeset as bad'
758 )) 799 ))
759 self.hgBisectBadAct.setWhatsThis(self.trUtf8( 800 self.hgBisectBadAct.setWhatsThis(self.trUtf8(
760 """<b>Mark as bad</b>""" 801 """<b>Mark as bad</b>"""
761 """<p>This marks a selectable changeset as bad.</p>""" 802 """<p>This marks a selectable changeset as bad.</p>"""
762 )) 803 ))
763 self.hgBisectBadAct.triggered[()].connect(self.__hgBisectBad) 804 self.hgBisectBadAct.triggered[()].connect(self.__hgBisectBad)
764 self.actions.append(self.hgBisectBadAct) 805 self.actions.append(self.hgBisectBadAct)
765 806
766 self.hgBisectSkipAct = E5Action(self.trUtf8('Skip'), 807 self.hgBisectSkipAct = E5Action(
767 self.trUtf8('Skip...'), 808 self.trUtf8('Skip'),
768 0, 0, self, 'mercurial_bisect_skip') 809 self.trUtf8('Skip...'),
810 0, 0, self, 'mercurial_bisect_skip')
769 self.hgBisectSkipAct.setStatusTip(self.trUtf8( 811 self.hgBisectSkipAct.setStatusTip(self.trUtf8(
770 'Skip a selectable changeset' 812 'Skip a selectable changeset'
771 )) 813 ))
772 self.hgBisectSkipAct.setWhatsThis(self.trUtf8( 814 self.hgBisectSkipAct.setWhatsThis(self.trUtf8(
773 """<b>Skip</b>""" 815 """<b>Skip</b>"""
774 """<p>This skips a selectable changeset.</p>""" 816 """<p>This skips a selectable changeset.</p>"""
775 )) 817 ))
776 self.hgBisectSkipAct.triggered[()].connect(self.__hgBisectSkip) 818 self.hgBisectSkipAct.triggered[()].connect(self.__hgBisectSkip)
777 self.actions.append(self.hgBisectSkipAct) 819 self.actions.append(self.hgBisectSkipAct)
778 820
779 self.hgBisectResetAct = E5Action(self.trUtf8('Reset'), 821 self.hgBisectResetAct = E5Action(
780 self.trUtf8('Reset'), 822 self.trUtf8('Reset'),
781 0, 0, self, 'mercurial_bisect_reset') 823 self.trUtf8('Reset'),
824 0, 0, self, 'mercurial_bisect_reset')
782 self.hgBisectResetAct.setStatusTip(self.trUtf8( 825 self.hgBisectResetAct.setStatusTip(self.trUtf8(
783 'Reset the bisect search data' 826 'Reset the bisect search data'
784 )) 827 ))
785 self.hgBisectResetAct.setWhatsThis(self.trUtf8( 828 self.hgBisectResetAct.setWhatsThis(self.trUtf8(
786 """<b>Reset</b>""" 829 """<b>Reset</b>"""
787 """<p>This resets the bisect search data.</p>""" 830 """<p>This resets the bisect search data.</p>"""
788 )) 831 ))
789 self.hgBisectResetAct.triggered[()].connect(self.__hgBisectReset) 832 self.hgBisectResetAct.triggered[()].connect(self.__hgBisectReset)
790 self.actions.append(self.hgBisectResetAct) 833 self.actions.append(self.hgBisectResetAct)
791 834
792 self.hgBackoutAct = E5Action(self.trUtf8('Back out changeset'), 835 self.hgBackoutAct = E5Action(
793 self.trUtf8('Back out changeset'), 836 self.trUtf8('Back out changeset'),
794 0, 0, self, 'mercurial_backout') 837 self.trUtf8('Back out changeset'),
838 0, 0, self, 'mercurial_backout')
795 self.hgBackoutAct.setStatusTip(self.trUtf8( 839 self.hgBackoutAct.setStatusTip(self.trUtf8(
796 'Back out changes of an earlier changeset' 840 'Back out changes of an earlier changeset'
797 )) 841 ))
798 self.hgBackoutAct.setWhatsThis(self.trUtf8( 842 self.hgBackoutAct.setWhatsThis(self.trUtf8(
799 """<b>Back out changeset</b>""" 843 """<b>Back out changeset</b>"""
800 """<p>This backs out changes of an earlier changeset.</p>""" 844 """<p>This backs out changes of an earlier changeset.</p>"""
801 )) 845 ))
802 self.hgBackoutAct.triggered[()].connect(self.__hgBackout) 846 self.hgBackoutAct.triggered[()].connect(self.__hgBackout)
803 self.actions.append(self.hgBackoutAct) 847 self.actions.append(self.hgBackoutAct)
804 848
805 self.hgRollbackAct = E5Action(self.trUtf8('Rollback last transaction'), 849 self.hgRollbackAct = E5Action(
806 self.trUtf8('Rollback last transaction'), 850 self.trUtf8('Rollback last transaction'),
807 0, 0, self, 'mercurial_rollback') 851 self.trUtf8('Rollback last transaction'),
852 0, 0, self, 'mercurial_rollback')
808 self.hgRollbackAct.setStatusTip(self.trUtf8( 853 self.hgRollbackAct.setStatusTip(self.trUtf8(
809 'Rollback the last transaction' 854 'Rollback the last transaction'
810 )) 855 ))
811 self.hgRollbackAct.setWhatsThis(self.trUtf8( 856 self.hgRollbackAct.setWhatsThis(self.trUtf8(
812 """<b>Rollback last transaction</b>""" 857 """<b>Rollback last transaction</b>"""
826 """ care. </strong></p>""" 871 """ care. </strong></p>"""
827 )) 872 ))
828 self.hgRollbackAct.triggered[()].connect(self.__hgRollback) 873 self.hgRollbackAct.triggered[()].connect(self.__hgRollback)
829 self.actions.append(self.hgRollbackAct) 874 self.actions.append(self.hgRollbackAct)
830 875
831 self.hgServeAct = E5Action(self.trUtf8('Serve project repository'), 876 self.hgServeAct = E5Action(
832 self.trUtf8('Serve project repository...'), 877 self.trUtf8('Serve project repository'),
833 0, 0, self, 'mercurial_serve') 878 self.trUtf8('Serve project repository...'),
879 0, 0, self, 'mercurial_serve')
834 self.hgServeAct.setStatusTip(self.trUtf8( 880 self.hgServeAct.setStatusTip(self.trUtf8(
835 'Serve the project repository' 881 'Serve the project repository'
836 )) 882 ))
837 self.hgServeAct.setWhatsThis(self.trUtf8( 883 self.hgServeAct.setWhatsThis(self.trUtf8(
838 """<b>Serve project repository</b>""" 884 """<b>Serve project repository</b>"""
839 """<p>This serves the project repository.</p>""" 885 """<p>This serves the project repository.</p>"""
840 )) 886 ))
841 self.hgServeAct.triggered[()].connect(self.__hgServe) 887 self.hgServeAct.triggered[()].connect(self.__hgServe)
842 self.actions.append(self.hgServeAct) 888 self.actions.append(self.hgServeAct)
843 889
844 self.hgImportAct = E5Action(self.trUtf8('Import Patch'), 890 self.hgImportAct = E5Action(
845 self.trUtf8('Import Patch...'), 891 self.trUtf8('Import Patch'),
846 0, 0, self, 'mercurial_import') 892 self.trUtf8('Import Patch...'),
893 0, 0, self, 'mercurial_import')
847 self.hgImportAct.setStatusTip(self.trUtf8( 894 self.hgImportAct.setStatusTip(self.trUtf8(
848 'Import a patch from a patch file' 895 'Import a patch from a patch file'
849 )) 896 ))
850 self.hgImportAct.setWhatsThis(self.trUtf8( 897 self.hgImportAct.setWhatsThis(self.trUtf8(
851 """<b>Import Patch</b>""" 898 """<b>Import Patch</b>"""
853 """ project.</p>""" 900 """ project.</p>"""
854 )) 901 ))
855 self.hgImportAct.triggered[()].connect(self.__hgImport) 902 self.hgImportAct.triggered[()].connect(self.__hgImport)
856 self.actions.append(self.hgImportAct) 903 self.actions.append(self.hgImportAct)
857 904
858 self.hgExportAct = E5Action(self.trUtf8('Export Patches'), 905 self.hgExportAct = E5Action(
859 self.trUtf8('Export Patches...'), 906 self.trUtf8('Export Patches'),
860 0, 0, self, 'mercurial_export') 907 self.trUtf8('Export Patches...'),
908 0, 0, self, 'mercurial_export')
861 self.hgExportAct.setStatusTip(self.trUtf8( 909 self.hgExportAct.setStatusTip(self.trUtf8(
862 'Export revisions to patch files' 910 'Export revisions to patch files'
863 )) 911 ))
864 self.hgExportAct.setWhatsThis(self.trUtf8( 912 self.hgExportAct.setWhatsThis(self.trUtf8(
865 """<b>Export Patches</b>""" 913 """<b>Export Patches</b>"""
866 """<p>This exports revisions of the project to patch files.</p>""" 914 """<p>This exports revisions of the project to patch files.</p>"""
867 )) 915 ))
868 self.hgExportAct.triggered[()].connect(self.__hgExport) 916 self.hgExportAct.triggered[()].connect(self.__hgExport)
869 self.actions.append(self.hgExportAct) 917 self.actions.append(self.hgExportAct)
870 918
871 self.hgPhaseAct = E5Action(self.trUtf8('Change Phase'), 919 self.hgPhaseAct = E5Action(
872 self.trUtf8('Change Phase...'), 920 self.trUtf8('Change Phase'),
873 0, 0, self, 'mercurial_change_phase') 921 self.trUtf8('Change Phase...'),
922 0, 0, self, 'mercurial_change_phase')
874 self.hgPhaseAct.setStatusTip(self.trUtf8( 923 self.hgPhaseAct.setStatusTip(self.trUtf8(
875 'Change the phase of revisions' 924 'Change the phase of revisions'
876 )) 925 ))
877 self.hgPhaseAct.setWhatsThis(self.trUtf8( 926 self.hgPhaseAct.setWhatsThis(self.trUtf8(
878 """<b>Change Phase</b>""" 927 """<b>Change Phase</b>"""
879 """<p>This changes the phase of revisions.</p>""" 928 """<p>This changes the phase of revisions.</p>"""
880 )) 929 ))
881 self.hgPhaseAct.triggered[()].connect(self.__hgPhase) 930 self.hgPhaseAct.triggered[()].connect(self.__hgPhase)
882 self.actions.append(self.hgPhaseAct) 931 self.actions.append(self.hgPhaseAct)
883 932
884 self.hgGraftAct = E5Action(self.trUtf8('Copy Changesets'), 933 self.hgGraftAct = E5Action(
885 UI.PixmapCache.getIcon("vcsGraft.png"), 934 self.trUtf8('Copy Changesets'),
886 self.trUtf8('Copy Changesets'), 935 UI.PixmapCache.getIcon("vcsGraft.png"),
887 0, 0, self, 'mercurial_graft') 936 self.trUtf8('Copy Changesets'),
937 0, 0, self, 'mercurial_graft')
888 self.hgGraftAct.setStatusTip(self.trUtf8( 938 self.hgGraftAct.setStatusTip(self.trUtf8(
889 'Copies changesets from another branch' 939 'Copies changesets from another branch'
890 )) 940 ))
891 self.hgGraftAct.setWhatsThis(self.trUtf8( 941 self.hgGraftAct.setWhatsThis(self.trUtf8(
892 """<b>Copy Changesets</b>""" 942 """<b>Copy Changesets</b>"""
896 )) 946 ))
897 self.hgGraftAct.triggered[()].connect(self.__hgGraft) 947 self.hgGraftAct.triggered[()].connect(self.__hgGraft)
898 self.actions.append(self.hgGraftAct) 948 self.actions.append(self.hgGraftAct)
899 949
900 self.hgGraftContinueAct = E5Action( 950 self.hgGraftContinueAct = E5Action(
901 self.trUtf8('Continue Copying Session'), 951 self.trUtf8('Continue Copying Session'),
902 self.trUtf8('Continue Copying Session'), 952 self.trUtf8('Continue Copying Session'),
903 0, 0, self, 'mercurial_graft_continue') 953 0, 0, self, 'mercurial_graft_continue')
904 self.hgGraftContinueAct.setStatusTip(self.trUtf8( 954 self.hgGraftContinueAct.setStatusTip(self.trUtf8(
905 'Continue the last copying session after conflicts were resolved' 955 'Continue the last copying session after conflicts were resolved'
906 )) 956 ))
907 self.hgGraftContinueAct.setWhatsThis(self.trUtf8( 957 self.hgGraftContinueAct.setWhatsThis(self.trUtf8(
908 """<b>Continue Copying Session</b>""" 958 """<b>Continue Copying Session</b>"""
911 )) 961 ))
912 self.hgGraftContinueAct.triggered[()].connect(self.__hgGraftContinue) 962 self.hgGraftContinueAct.triggered[()].connect(self.__hgGraftContinue)
913 self.actions.append(self.hgGraftContinueAct) 963 self.actions.append(self.hgGraftContinueAct)
914 964
915 self.hgAddSubrepoAct = E5Action( 965 self.hgAddSubrepoAct = E5Action(
916 self.trUtf8('Add'), 966 self.trUtf8('Add'),
917 UI.PixmapCache.getIcon("vcsAdd.png"), 967 UI.PixmapCache.getIcon("vcsAdd.png"),
918 self.trUtf8('Add...'), 968 self.trUtf8('Add...'),
919 0, 0, self, 'mercurial_add_subrepo') 969 0, 0, self, 'mercurial_add_subrepo')
920 self.hgAddSubrepoAct.setStatusTip(self.trUtf8( 970 self.hgAddSubrepoAct.setStatusTip(self.trUtf8(
921 'Add a sub-repository' 971 'Add a sub-repository'
922 )) 972 ))
923 self.hgAddSubrepoAct.setWhatsThis(self.trUtf8( 973 self.hgAddSubrepoAct.setWhatsThis(self.trUtf8(
924 """<b>Add...</b>""" 974 """<b>Add...</b>"""
926 )) 976 ))
927 self.hgAddSubrepoAct.triggered[()].connect(self.__hgAddSubrepository) 977 self.hgAddSubrepoAct.triggered[()].connect(self.__hgAddSubrepository)
928 self.actions.append(self.hgAddSubrepoAct) 978 self.actions.append(self.hgAddSubrepoAct)
929 979
930 self.hgRemoveSubreposAct = E5Action( 980 self.hgRemoveSubreposAct = E5Action(
931 self.trUtf8('Remove'), 981 self.trUtf8('Remove'),
932 UI.PixmapCache.getIcon("vcsRemove.png"), 982 UI.PixmapCache.getIcon("vcsRemove.png"),
933 self.trUtf8('Remove...'), 983 self.trUtf8('Remove...'),
934 0, 0, self, 'mercurial_remove_subrepos') 984 0, 0, self, 'mercurial_remove_subrepos')
935 self.hgRemoveSubreposAct.setStatusTip(self.trUtf8( 985 self.hgRemoveSubreposAct.setStatusTip(self.trUtf8(
936 'Remove sub-repositories' 986 'Remove sub-repositories'
937 )) 987 ))
938 self.hgRemoveSubreposAct.setWhatsThis(self.trUtf8( 988 self.hgRemoveSubreposAct.setWhatsThis(self.trUtf8(
939 """<b>Remove...</b>""" 989 """<b>Remove...</b>"""
941 )) 991 ))
942 self.hgRemoveSubreposAct.triggered[()].connect( 992 self.hgRemoveSubreposAct.triggered[()].connect(
943 self.__hgRemoveSubrepositories) 993 self.__hgRemoveSubrepositories)
944 self.actions.append(self.hgRemoveSubreposAct) 994 self.actions.append(self.hgRemoveSubreposAct)
945 995
946 self.hgArchiveAct = E5Action(self.trUtf8('Create unversioned archive'), 996 self.hgArchiveAct = E5Action(
947 UI.PixmapCache.getIcon("vcsExport.png"), 997 self.trUtf8('Create unversioned archive'),
948 self.trUtf8('Create unversioned archive...'), 998 UI.PixmapCache.getIcon("vcsExport.png"),
949 0, 0, self, 'mercurial_archive') 999 self.trUtf8('Create unversioned archive...'),
1000 0, 0, self, 'mercurial_archive')
950 self.hgArchiveAct.setStatusTip(self.trUtf8( 1001 self.hgArchiveAct.setStatusTip(self.trUtf8(
951 'Create an unversioned archive from the repository' 1002 'Create an unversioned archive from the repository'
952 )) 1003 ))
953 self.hgArchiveAct.setWhatsThis(self.trUtf8( 1004 self.hgArchiveAct.setWhatsThis(self.trUtf8(
954 """<b>Create unversioned archive...</b>""" 1005 """<b>Create unversioned archive...</b>"""
1184 """ 1235 """
1185 Private slot used to pull changes from a remote repository. 1236 Private slot used to pull changes from a remote repository.
1186 """ 1237 """
1187 shouldReopen = self.vcs.hgPull(self.project.ppath) 1238 shouldReopen = self.vcs.hgPull(self.project.ppath)
1188 if shouldReopen: 1239 if shouldReopen:
1189 res = E5MessageBox.yesNo(self.parent(), 1240 res = E5MessageBox.yesNo(
1241 self.parent(),
1190 self.trUtf8("Pull"), 1242 self.trUtf8("Pull"),
1191 self.trUtf8("""The project should be reread. Do this now?"""), 1243 self.trUtf8("""The project should be reread. Do this now?"""),
1192 yesDefault=True) 1244 yesDefault=True)
1193 if res: 1245 if res:
1194 self.project.reopenProject() 1246 self.project.reopenProject()
1346 """ 1398 """
1347 Private slot used to apply changegroup files. 1399 Private slot used to apply changegroup files.
1348 """ 1400 """
1349 shouldReopen = self.vcs.hgUnbundle(self.project.ppath) 1401 shouldReopen = self.vcs.hgUnbundle(self.project.ppath)
1350 if shouldReopen: 1402 if shouldReopen:
1351 res = E5MessageBox.yesNo(self.parent(), 1403 res = E5MessageBox.yesNo(
1404 self.parent(),
1352 self.trUtf8("Apply changegroups"), 1405 self.trUtf8("Apply changegroups"),
1353 self.trUtf8("""The project should be reread. Do this now?"""), 1406 self.trUtf8("""The project should be reread. Do this now?"""),
1354 yesDefault=True) 1407 yesDefault=True)
1355 if res: 1408 if res:
1356 self.project.reopenProject() 1409 self.project.reopenProject()
1401 """ 1454 """
1402 Private slot used to import a patch file. 1455 Private slot used to import a patch file.
1403 """ 1456 """
1404 shouldReopen = self.vcs.hgImport(self.project.ppath) 1457 shouldReopen = self.vcs.hgImport(self.project.ppath)
1405 if shouldReopen: 1458 if shouldReopen:
1406 res = E5MessageBox.yesNo(self.parent(), 1459 res = E5MessageBox.yesNo(
1460 self.parent(),
1407 self.trUtf8("Import Patch"), 1461 self.trUtf8("Import Patch"),
1408 self.trUtf8("""The project should be reread. Do this now?"""), 1462 self.trUtf8("""The project should be reread. Do this now?"""),
1409 yesDefault=True) 1463 yesDefault=True)
1410 if res: 1464 if res:
1411 self.project.reopenProject() 1465 self.project.reopenProject()
1420 """ 1474 """
1421 Private slot used to revert changes made to the local project. 1475 Private slot used to revert changes made to the local project.
1422 """ 1476 """
1423 shouldReopen = self.vcs.hgRevert(self.project.ppath) 1477 shouldReopen = self.vcs.hgRevert(self.project.ppath)
1424 if shouldReopen: 1478 if shouldReopen:
1425 res = E5MessageBox.yesNo(self.parent(), 1479 res = E5MessageBox.yesNo(
1480 self.parent(),
1426 self.trUtf8("Revert Changes"), 1481 self.trUtf8("Revert Changes"),
1427 self.trUtf8("""The project should be reread. Do this now?"""), 1482 self.trUtf8("""The project should be reread. Do this now?"""),
1428 yesDefault=True) 1483 yesDefault=True)
1429 if res: 1484 if res:
1430 self.project.reopenProject() 1485 self.project.reopenProject()
1439 """ 1494 """
1440 Private slot used to copy changesets from another branch. 1495 Private slot used to copy changesets from another branch.
1441 """ 1496 """
1442 shouldReopen = self.vcs.hgGraft(self.project.getProjectPath()) 1497 shouldReopen = self.vcs.hgGraft(self.project.getProjectPath())
1443 if shouldReopen: 1498 if shouldReopen:
1444 res = E5MessageBox.yesNo(None, 1499 res = E5MessageBox.yesNo(
1500 None,
1445 self.trUtf8("Copy Changesets"), 1501 self.trUtf8("Copy Changesets"),
1446 self.trUtf8("""The project should be reread. Do this now?"""), 1502 self.trUtf8("""The project should be reread. Do this now?"""),
1447 yesDefault=True) 1503 yesDefault=True)
1448 if res: 1504 if res:
1449 self.project.reopenProject() 1505 self.project.reopenProject()
1453 Private slot used to continue the last copying session after conflicts 1509 Private slot used to continue the last copying session after conflicts
1454 were resolved. 1510 were resolved.
1455 """ 1511 """
1456 shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath()) 1512 shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath())
1457 if shouldReopen: 1513 if shouldReopen:
1458 res = E5MessageBox.yesNo(None, 1514 res = E5MessageBox.yesNo(
1515 None,
1459 self.trUtf8("Copy Changesets (Continue)"), 1516 self.trUtf8("Copy Changesets (Continue)"),
1460 self.trUtf8("""The project should be reread. Do this now?"""), 1517 self.trUtf8("""The project should be reread. Do this now?"""),
1461 yesDefault=True) 1518 yesDefault=True)
1462 if res: 1519 if res:
1463 self.project.reopenProject() 1520 self.project.reopenProject()

eric ide

mercurial