Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3302
- e92f0dd51979
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 75 args.append("--keepbranches") | 75 args.append("--keepbranches") |
| 76 if detach: | 76 if detach: |
| 77 args.append("--detach") | 77 args.append("--detach") |
| 78 args.append("--verbose") | 78 args.append("--verbose") |
| 79 | 79 |
| 80 dia = HgDialog(self.trUtf8('Rebase Changesets'), self.vcs) | 80 dia = HgDialog(self.tr('Rebase Changesets'), self.vcs) |
| 81 res = dia.startProcess(args, repodir) | 81 res = dia.startProcess(args, repodir) |
| 82 if res: | 82 if res: |
| 83 dia.exec_() | 83 dia.exec_() |
| 84 res = dia.hasAddOrDelete() | 84 res = dia.hasAddOrDelete() |
| 85 self.vcs.checkVCSStatus() | 85 self.vcs.checkVCSStatus() |
| 102 args = [] | 102 args = [] |
| 103 args.append("rebase") | 103 args.append("rebase") |
| 104 args.append("--continue") | 104 args.append("--continue") |
| 105 args.append("--verbose") | 105 args.append("--verbose") |
| 106 | 106 |
| 107 dia = HgDialog(self.trUtf8('Rebase Changesets (Continue)'), self.vcs) | 107 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) |
| 108 res = dia.startProcess(args, repodir) | 108 res = dia.startProcess(args, repodir) |
| 109 if res: | 109 if res: |
| 110 dia.exec_() | 110 dia.exec_() |
| 111 res = dia.hasAddOrDelete() | 111 res = dia.hasAddOrDelete() |
| 112 self.vcs.checkVCSStatus() | 112 self.vcs.checkVCSStatus() |
| 129 args = [] | 129 args = [] |
| 130 args.append("rebase") | 130 args.append("rebase") |
| 131 args.append("--abort") | 131 args.append("--abort") |
| 132 args.append("--verbose") | 132 args.append("--verbose") |
| 133 | 133 |
| 134 dia = HgDialog(self.trUtf8('Rebase Changesets (Abort)'), self.vcs) | 134 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) |
| 135 res = dia.startProcess(args, repodir) | 135 res = dia.startProcess(args, repodir) |
| 136 if res: | 136 if res: |
| 137 dia.exec_() | 137 dia.exec_() |
| 138 res = dia.hasAddOrDelete() | 138 res = dia.hasAddOrDelete() |
| 139 self.vcs.checkVCSStatus() | 139 self.vcs.checkVCSStatus() |
