109 self.hgQueueFinishAct.setStatusTip(self.trUtf8( |
140 self.hgQueueFinishAct.setStatusTip(self.trUtf8( |
110 'Finish applied patches' |
141 'Finish applied patches' |
111 )) |
142 )) |
112 self.hgQueueFinishAct.setWhatsThis(self.trUtf8( |
143 self.hgQueueFinishAct.setWhatsThis(self.trUtf8( |
113 """<b>Finish Applied Patches</b>""" |
144 """<b>Finish Applied Patches</b>""" |
114 """<p>This finishes the applied patches) by moving them out of""" |
145 """<p>This finishes the applied patches by moving them out of""" |
115 """ mq control into regular repository history.</p>""" |
146 """ mq control into regular repository history.</p>""" |
116 )) |
147 )) |
117 self.hgQueueFinishAct.triggered[()].connect(self.__hgQueueFinishAppliedPatches) |
148 self.hgQueueFinishAct.triggered[()].connect(self.__hgQueueFinishAppliedPatches) |
118 self.actions.append(self.hgQueueFinishAct) |
149 self.actions.append(self.hgQueueFinishAct) |
|
150 |
|
151 self.hgQueueRenameAct = E5Action(self.trUtf8('Rename Patch'), |
|
152 self.trUtf8('Rename Patch'), |
|
153 0, 0, self, 'mercurial_queues_rename') |
|
154 self.hgQueueRenameAct.setStatusTip(self.trUtf8( |
|
155 'Rename a patch' |
|
156 )) |
|
157 self.hgQueueRenameAct.setWhatsThis(self.trUtf8( |
|
158 """<b>Rename Patch</b>""" |
|
159 """<p>This renames the current or a named patch.</p>""" |
|
160 )) |
|
161 self.hgQueueRenameAct.triggered[()].connect(self.__hgQueueRenamePatch) |
|
162 self.actions.append(self.hgQueueRenameAct) |
|
163 |
|
164 self.hgQueueDeleteAct = E5Action(self.trUtf8('Delete Patch'), |
|
165 self.trUtf8('Delete Patch'), |
|
166 0, 0, self, 'mercurial_queues_delete') |
|
167 self.hgQueueDeleteAct.setStatusTip(self.trUtf8( |
|
168 'Delete unapplied patch' |
|
169 )) |
|
170 self.hgQueueDeleteAct.setWhatsThis(self.trUtf8( |
|
171 """<b>Delete Patch</b>""" |
|
172 """<p>This deletes an unapplied patch.</p>""" |
|
173 )) |
|
174 self.hgQueueDeleteAct.triggered[()].connect(self.__hgQueueDeletePatch) |
|
175 self.actions.append(self.hgQueueDeleteAct) |
|
176 |
|
177 self.hgQueueFoldAct = E5Action(self.trUtf8('Fold Patches'), |
|
178 self.trUtf8('Fold Patches'), |
|
179 0, 0, self, 'mercurial_queues_fold') |
|
180 self.hgQueueFoldAct.setStatusTip(self.trUtf8( |
|
181 'Fold unapplied patches into the current patch' |
|
182 )) |
|
183 self.hgQueueFoldAct.setWhatsThis(self.trUtf8( |
|
184 """<b>Fold Patches</b>""" |
|
185 """<p>This folds unapplied patches into the current patch.</p>""" |
|
186 )) |
|
187 self.hgQueueFoldAct.triggered[()].connect(self.__hgQueueFoldUnappliedPatches) |
|
188 self.actions.append(self.hgQueueFoldAct) |
119 |
189 |
120 self.__initPushPopActions() |
190 self.__initPushPopActions() |
121 self.__initPushPopForceActions() |
191 self.__initPushPopForceActions() |
122 |
192 |
123 def __initPushPopActions(self): |
193 def __initPushPopActions(self): |
306 |
405 |
307 pushPopMenu = QMenu(self.trUtf8("Push/Pop"), menu) |
406 pushPopMenu = QMenu(self.trUtf8("Push/Pop"), menu) |
308 pushPopMenu.addAction(self.hgQueuePushAct) |
407 pushPopMenu.addAction(self.hgQueuePushAct) |
309 pushPopMenu.addAction(self.hgQueuePushUntilAct) |
408 pushPopMenu.addAction(self.hgQueuePushUntilAct) |
310 pushPopMenu.addAction(self.hgQueuePushAllAct) |
409 pushPopMenu.addAction(self.hgQueuePushAllAct) |
|
410 pushPopMenu.addSeparator() |
311 pushPopMenu.addAction(self.hgQueuePopAct) |
411 pushPopMenu.addAction(self.hgQueuePopAct) |
312 pushPopMenu.addAction(self.hgQueuePopUntilAct) |
412 pushPopMenu.addAction(self.hgQueuePopUntilAct) |
313 pushPopMenu.addAction(self.hgQueuePopAllAct) |
413 pushPopMenu.addAction(self.hgQueuePopAllAct) |
|
414 pushPopMenu.addSeparator() |
|
415 pushPopMenu.addAction(self.hgQueueGotoAct) |
314 |
416 |
315 pushPopForceMenu = QMenu(self.trUtf8("Push/Pop (force)"), menu) |
417 pushPopForceMenu = QMenu(self.trUtf8("Push/Pop (force)"), menu) |
316 pushPopForceMenu.addAction(self.hgQueuePushForceAct) |
418 pushPopForceMenu.addAction(self.hgQueuePushForceAct) |
317 pushPopForceMenu.addAction(self.hgQueuePushUntilForceAct) |
419 pushPopForceMenu.addAction(self.hgQueuePushUntilForceAct) |
318 pushPopForceMenu.addAction(self.hgQueuePushAllForceAct) |
420 pushPopForceMenu.addAction(self.hgQueuePushAllForceAct) |
|
421 pushPopForceMenu.addSeparator() |
319 pushPopForceMenu.addAction(self.hgQueuePopForceAct) |
422 pushPopForceMenu.addAction(self.hgQueuePopForceAct) |
320 pushPopForceMenu.addAction(self.hgQueuePopUntilForceAct) |
423 pushPopForceMenu.addAction(self.hgQueuePopUntilForceAct) |
321 pushPopForceMenu.addAction(self.hgQueuePopAllForceAct) |
424 pushPopForceMenu.addAction(self.hgQueuePopAllForceAct) |
|
425 pushPopForceMenu.addSeparator() |
|
426 pushPopForceMenu.addAction(self.hgQueueGotoForceAct) |
322 |
427 |
323 menu.addAction(self.hgQueueNewAct) |
428 menu.addAction(self.hgQueueNewAct) |
324 menu.addAction(self.hgQueueRefreshAct) |
429 menu.addAction(self.hgQueueRefreshAct) |
|
430 menu.addAction(self.hgQueueRefreshMessageAct) |
325 menu.addAction(self.hgQueueFinishAct) |
431 menu.addAction(self.hgQueueFinishAct) |
326 menu.addSeparator() |
432 menu.addSeparator() |
327 menu.addAction(self.hgQueueDiffAct) |
433 menu.addAction(self.hgQueueDiffAct) |
|
434 menu.addAction(self.hgQueueHeaderAct) |
328 menu.addSeparator() |
435 menu.addSeparator() |
329 menu.addAction(self.hgQueueListAct) |
436 menu.addAction(self.hgQueueListAct) |
330 menu.addSeparator() |
437 menu.addSeparator() |
331 menu.addMenu(pushPopMenu) |
438 menu.addMenu(pushPopMenu) |
332 menu.addMenu(pushPopForceMenu) |
439 menu.addMenu(pushPopForceMenu) |
|
440 menu.addSeparator() |
|
441 menu.addAction(self.hgQueueRenameAct) |
|
442 menu.addAction(self.hgQueueDeleteAct) |
|
443 menu.addSeparator() |
|
444 menu.addAction(self.hgQueueFoldAct) |
333 |
445 |
334 return menu |
446 return menu |
335 |
447 |
336 def __hgQueueNewPatch(self): |
448 def __hgQueueNewPatch(self): |
337 """ |
449 """ |
345 Private slot used to refresh the current patch. |
457 Private slot used to refresh the current patch. |
346 """ |
458 """ |
347 self.vcs.getExtensionObject("mq")\ |
459 self.vcs.getExtensionObject("mq")\ |
348 .hgQueueRefreshPatch(self.project.getProjectPath()) |
460 .hgQueueRefreshPatch(self.project.getProjectPath()) |
349 |
461 |
|
462 def __hgQueueRefreshPatchMessage(self): |
|
463 """ |
|
464 Private slot used to refresh the current patch and it's commit message. |
|
465 """ |
|
466 self.vcs.getExtensionObject("mq")\ |
|
467 .hgQueueRefreshPatch(self.project.getProjectPath(), editMessage=True) |
|
468 |
350 def __hgQueueShowPatch(self): |
469 def __hgQueueShowPatch(self): |
351 """ |
470 """ |
352 Private slot used to show the contents of the current patch. |
471 Private slot used to show the contents of the current patch. |
353 """ |
472 """ |
354 self.vcs.getExtensionObject("mq")\ |
473 self.vcs.getExtensionObject("mq")\ |
355 .hgQueueShowPatch(self.project.getProjectPath()) |
474 .hgQueueShowPatch(self.project.getProjectPath()) |
356 |
475 |
|
476 def __hgQueueShowHeader(self): |
|
477 """ |
|
478 Private slot used to show the commit message of the current patch. |
|
479 """ |
|
480 self.vcs.getExtensionObject("mq")\ |
|
481 .hgQueueShowHeader(self.project.getProjectPath()) |
|
482 |
357 def __hgQueuePushPatch(self): |
483 def __hgQueuePushPatch(self): |
358 """ |
484 """ |
359 Private slot used to push the next patch onto the stack. |
485 Private slot used to push the next patch onto the stack. |
360 """ |
486 """ |
361 self.vcs.getExtensionObject("mq")\ |
487 self.vcs.getExtensionObject("mq")\ |
362 .hgQueuePushPopPatches(self.project.getProjectPath(), |
488 .hgQueuePushPopPatches(self.project.getProjectPath(), |
363 pop=False, all=False, named=False) |
489 operation=Queues.PUSH, all=False, named=False) |
364 |
490 |
365 def __hgQueuePushPatchForced(self): |
491 def __hgQueuePushPatchForced(self): |
366 """ |
492 """ |
367 Private slot used to push the next patch onto the stack on top |
493 Private slot used to push the next patch onto the stack on top |
368 of local changes. |
494 of local changes. |
369 """ |
495 """ |
370 self.vcs.getExtensionObject("mq")\ |
496 self.vcs.getExtensionObject("mq")\ |
371 .hgQueuePushPopPatches(self.project.getProjectPath(), |
497 .hgQueuePushPopPatches(self.project.getProjectPath(), |
372 pop=False, all=False, named=False, force=True) |
498 operation=Queues.PUSH, all=False, named=False, force=True) |
373 |
499 |
374 def __hgQueuePushAllPatches(self): |
500 def __hgQueuePushAllPatches(self): |
375 """ |
501 """ |
376 Private slot used to push all patches onto the stack. |
502 Private slot used to push all patches onto the stack. |
377 """ |
503 """ |
378 self.vcs.getExtensionObject("mq")\ |
504 self.vcs.getExtensionObject("mq")\ |
379 .hgQueuePushPopPatches(self.project.getProjectPath(), |
505 .hgQueuePushPopPatches(self.project.getProjectPath(), |
380 pop=False, all=True, named=False) |
506 operation=Queues.PUSH, all=True, named=False) |
381 |
507 |
382 def __hgQueuePushAllPatchesForced(self): |
508 def __hgQueuePushAllPatchesForced(self): |
383 """ |
509 """ |
384 Private slot used to push all patches onto the stack on top |
510 Private slot used to push all patches onto the stack on top |
385 of local changes. |
511 of local changes. |
386 """ |
512 """ |
387 self.vcs.getExtensionObject("mq")\ |
513 self.vcs.getExtensionObject("mq")\ |
388 .hgQueuePushPopPatches(self.project.getProjectPath(), |
514 .hgQueuePushPopPatches(self.project.getProjectPath(), |
389 pop=False, all=True, named=False, force=True) |
515 operation=Queues.PUSH, all=True, named=False, force=True) |
390 |
516 |
391 def __hgQueuePushPatches(self): |
517 def __hgQueuePushPatches(self): |
392 """ |
518 """ |
393 Private slot used to push patches onto the stack until a named |
519 Private slot used to push patches onto the stack until a named |
394 one is at the top. |
520 one is at the top. |
395 """ |
521 """ |
396 self.vcs.getExtensionObject("mq")\ |
522 self.vcs.getExtensionObject("mq")\ |
397 .hgQueuePushPopPatches(self.project.getProjectPath(), |
523 .hgQueuePushPopPatches(self.project.getProjectPath(), |
398 pop=False, all=False, named=True) |
524 operation=Queues.PUSH, all=False, named=True) |
399 |
525 |
400 def __hgQueuePushPatchesForced(self): |
526 def __hgQueuePushPatchesForced(self): |
401 """ |
527 """ |
402 Private slot used to push patches onto the stack until a named |
528 Private slot used to push patches onto the stack until a named |
403 one is at the top on top of local changes. |
529 one is at the top on top of local changes. |
404 """ |
530 """ |
405 self.vcs.getExtensionObject("mq")\ |
531 self.vcs.getExtensionObject("mq")\ |
406 .hgQueuePushPopPatches(self.project.getProjectPath(), |
532 .hgQueuePushPopPatches(self.project.getProjectPath(), |
407 pop=False, all=False, named=True, force=True) |
533 operation=Queues.PUSH, all=False, named=True, force=True) |
408 |
534 |
409 def __hgQueuePopPatch(self): |
535 def __hgQueuePopPatch(self): |
410 """ |
536 """ |
411 Private slot used to pop the current patch off the stack. |
537 Private slot used to pop the current patch off the stack. |
412 """ |
538 """ |
413 self.vcs.getExtensionObject("mq")\ |
539 self.vcs.getExtensionObject("mq")\ |
414 .hgQueuePushPopPatches(self.project.getProjectPath(), |
540 .hgQueuePushPopPatches(self.project.getProjectPath(), |
415 pop=True, all=False, named=False) |
541 operation=Queues.POP, all=False, named=False) |
416 |
542 |
417 def __hgQueuePopPatchForced(self): |
543 def __hgQueuePopPatchForced(self): |
418 """ |
544 """ |
419 Private slot used to pop the current patch off the stack forgetting |
545 Private slot used to pop the current patch off the stack forgetting |
420 any local changes to patched files. |
546 any local changes to patched files. |
421 """ |
547 """ |
422 self.vcs.getExtensionObject("mq")\ |
548 self.vcs.getExtensionObject("mq")\ |
423 .hgQueuePushPopPatches(self.project.getProjectPath(), |
549 .hgQueuePushPopPatches(self.project.getProjectPath(), |
424 pop=True, all=False, named=False) |
550 operation=Queues.POP, all=False, named=False, force=True) |
425 |
551 |
426 def __hgQueuePopAllPatches(self): |
552 def __hgQueuePopAllPatches(self): |
427 """ |
553 """ |
428 Private slot used to pop all patches off the stack. |
554 Private slot used to pop all patches off the stack. |
429 """ |
555 """ |
430 self.vcs.getExtensionObject("mq")\ |
556 self.vcs.getExtensionObject("mq")\ |
431 .hgQueuePushPopPatches(self.project.getProjectPath(), |
557 .hgQueuePushPopPatches(self.project.getProjectPath(), |
432 pop=True, all=True, named=False) |
558 operation=Queues.POP, all=True, named=False) |
433 |
559 |
434 def __hgQueuePopAllPatchesForced(self): |
560 def __hgQueuePopAllPatchesForced(self): |
435 """ |
561 """ |
436 Private slot used to pop all patches off the stack forgetting |
562 Private slot used to pop all patches off the stack forgetting |
437 any local changes to patched files. |
563 any local changes to patched files. |
438 """ |
564 """ |
439 self.vcs.getExtensionObject("mq")\ |
565 self.vcs.getExtensionObject("mq")\ |
440 .hgQueuePushPopPatches(self.project.getProjectPath(), |
566 .hgQueuePushPopPatches(self.project.getProjectPath(), |
441 pop=True, all=True, named=False, force=True) |
567 operation=Queues.POP, all=True, named=False, force=True) |
442 |
568 |
443 def __hgQueuePopPatches(self): |
569 def __hgQueuePopPatches(self): |
444 """ |
570 """ |
445 Private slot used to pop patches off the stack until a named |
571 Private slot used to pop patches off the stack until a named |
446 one is at the top. |
572 one is at the top. |
447 """ |
573 """ |
448 self.vcs.getExtensionObject("mq")\ |
574 self.vcs.getExtensionObject("mq")\ |
449 .hgQueuePushPopPatches(self.project.getProjectPath(), |
575 .hgQueuePushPopPatches(self.project.getProjectPath(), |
450 pop=True, all=False, named=True) |
576 operation=Queues.POP, all=False, named=True) |
451 |
577 |
452 def __hgQueuePopPatchesForced(self): |
578 def __hgQueuePopPatchesForced(self): |
453 """ |
579 """ |
454 Private slot used to pop patches off the stack until a named |
580 Private slot used to pop patches off the stack until a named |
455 one is at the top forgetting any local changes to patched files. |
581 one is at the top forgetting any local changes to patched files. |
456 """ |
582 """ |
457 self.vcs.getExtensionObject("mq")\ |
583 self.vcs.getExtensionObject("mq")\ |
458 .hgQueuePushPopPatches(self.project.getProjectPath(), |
584 .hgQueuePushPopPatches(self.project.getProjectPath(), |
459 pop=True, all=False, named=True) |
585 operation=Queues.POP, all=False, named=True, force=True) |
|
586 |
|
587 def __hgQueueGotoPatch(self): |
|
588 """ |
|
589 Private slot used to push or pop patches until the a named one |
|
590 is at the top of the stack. |
|
591 """ |
|
592 self.vcs.getExtensionObject("mq")\ |
|
593 .hgQueuePushPopPatches(self.project.getProjectPath(), |
|
594 operation=Queues.GOTO, all=False, named=True) |
|
595 |
|
596 def __hgQueueGotoPatchForced(self): |
|
597 """ |
|
598 Private slot used to push or pop patches until the a named one |
|
599 is at the top of the stack overwriting local changes. |
|
600 """ |
|
601 self.vcs.getExtensionObject("mq")\ |
|
602 .hgQueuePushPopPatches(self.project.getProjectPath(), |
|
603 operation=Queues.GOTO, all=False, named=True, force=True) |
460 |
604 |
461 def __hgQueueListPatches(self): |
605 def __hgQueueListPatches(self): |
462 """ |
606 """ |
463 Private slot used to show a list of applied and unapplied patches. |
607 Private slot used to show a list of applied and unapplied patches. |
464 """ |
608 """ |
465 self.vcs.getExtensionObject("mq")\ |
609 self.vcs.getExtensionObject("mq")\ |
466 .hgQueueListPatches(self.project.getProjectPath()) |
610 .hgQueueListPatches(self.project.getProjectPath()) |
467 |
611 |
468 def __hgQueueFinishAppliedPatches(self): |
612 def __hgQueueFinishAppliedPatches(self): |
469 """ |
613 """ |
470 Private slot used to finish all applied patches. |
614 Private slot used to finish all applied patches. |
471 """ |
615 """ |
472 self.vcs.getExtensionObject("mq")\ |
616 self.vcs.getExtensionObject("mq")\ |
473 .hgQueueFinishAppliedPatches(self.project.getProjectPath()) |
617 .hgQueueFinishAppliedPatches(self.project.getProjectPath()) |
|
618 |
|
619 def __hgQueueRenamePatch(self): |
|
620 """ |
|
621 Private slot used to rename a patch. |
|
622 """ |
|
623 self.vcs.getExtensionObject("mq")\ |
|
624 .hgQueueRenamePatch(self.project.getProjectPath()) |
|
625 |
|
626 def __hgQueueDeletePatch(self): |
|
627 """ |
|
628 Private slot used to delete a patch. |
|
629 """ |
|
630 self.vcs.getExtensionObject("mq")\ |
|
631 .hgQueueDeletePatch(self.project.getProjectPath()) |
|
632 |
|
633 def __hgQueueFoldUnappliedPatches(self): |
|
634 """ |
|
635 Private slot used to fold patches into the current patch. |
|
636 """ |
|
637 self.vcs.getExtensionObject("mq")\ |
|
638 .hgQueueFoldUnappliedPatches(self.project.getProjectPath()) |