Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 9242
- e406ed611e03
- parent 9221
- bf71ee032bb4
- child 9318
- a47b5c46be3f
equal
deleted
inserted
replaced
| 9240:183220dc5492 | 9242:e406ed611e03 |
|---|---|
| 2625 dia.exec() | 2625 dia.exec() |
| 2626 res = dia.hasAddOrDelete() | 2626 res = dia.hasAddOrDelete() |
| 2627 self.checkVCSStatus() | 2627 self.checkVCSStatus() |
| 2628 return res | 2628 return res |
| 2629 | 2629 |
| 2630 def hgGraftContinue(self, path): | 2630 def hgGraftContinue(self): |
| 2631 """ | 2631 """ |
| 2632 Public method to continue copying changesets from another branch. | 2632 Public method to continue copying changesets from another branch. |
| 2633 | 2633 |
| 2634 @param path directory name of the project | |
| 2635 @type str | |
| 2636 @return flag indicating that the project should be reread | 2634 @return flag indicating that the project should be reread |
| 2637 @rtype bool | 2635 @rtype bool |
| 2638 """ | 2636 """ |
| 2639 return self.__hgGraftSubCommand( | 2637 return self.__hgGraftSubCommand( |
| 2640 "--continue", self.tr("Copy Changesets (Continue)") | 2638 "--continue", self.tr("Copy Changesets (Continue)") |
| 2641 ) | 2639 ) |
| 2642 | 2640 |
| 2643 def hgGraftStop(self, path): | 2641 def hgGraftStop(self): |
| 2644 """ | 2642 """ |
| 2645 Public method to stop an interrupted copying session. | 2643 Public method to stop an interrupted copying session. |
| 2646 | 2644 |
| 2647 @param path directory name of the project | |
| 2648 @type str | |
| 2649 @return flag indicating that the project should be reread | 2645 @return flag indicating that the project should be reread |
| 2650 @rtype bool | 2646 @rtype bool |
| 2651 """ | 2647 """ |
| 2652 return self.__hgGraftSubCommand("--stop", self.tr("Copy Changesets (Stop)")) | 2648 return self.__hgGraftSubCommand("--stop", self.tr("Copy Changesets (Stop)")) |
| 2653 | 2649 |
| 2654 def hgGraftAbort(self, path): | 2650 def hgGraftAbort(self): |
| 2655 """ | 2651 """ |
| 2656 Public method to abort an interrupted copying session and perform | 2652 Public method to abort an interrupted copying session and perform |
| 2657 a rollback. | 2653 a rollback. |
| 2658 | 2654 |
| 2659 @param path directory name of the project | |
| 2660 @type str | |
| 2661 @return flag indicating that the project should be reread | 2655 @return flag indicating that the project should be reread |
| 2662 @rtype bool | 2656 @rtype bool |
| 2663 """ | 2657 """ |
| 2664 return self.__hgGraftSubCommand("--abort", self.tr("Copy Changesets (Abort)")) | 2658 return self.__hgGraftSubCommand("--abort", self.tr("Copy Changesets (Abort)")) |
| 2665 | 2659 |
