Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
- branch
- eric7
- changeset 10690
- fab36645aa7d
- parent 10439
- 21c28b0f9e41
- child 11006
- a671918232f3
equal
deleted
inserted
replaced
| 10689:3ede487187f2 | 10690:fab36645aa7d |
|---|---|
| 70 args.append("--force") | 70 args.append("--force") |
| 71 else: | 71 else: |
| 72 args.append("--rev") | 72 args.append("--rev") |
| 73 args.append(rev) | 73 args.append(rev) |
| 74 | 74 |
| 75 dia = HgDialog( | 75 dia = HgDialog(self.tr("Starting histedit session"), self.vcs) |
| 76 self.tr("Starting histedit session"), self.vcs, useClient=False | |
| 77 ) | |
| 78 res = dia.startProcess(args) | 76 res = dia.startProcess(args) |
| 79 if res: | 77 if res: |
| 80 dia.exec() | 78 dia.exec() |
| 81 res = dia.hasAddOrDelete() | 79 res = dia.hasAddOrDelete() |
| 82 self.vcs.checkVCSStatus() | 80 self.vcs.checkVCSStatus() |
| 99 "--config", | 97 "--config", |
| 100 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", | 98 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", |
| 101 ] | 99 ] |
| 102 ) | 100 ) |
| 103 | 101 |
| 104 dia = HgDialog(self.tr("Continue histedit session"), self.vcs, useClient=False) | 102 dia = HgDialog(self.tr("Continue histedit session"), self.vcs) |
| 105 res = dia.startProcess(args) | 103 res = dia.startProcess(args) |
| 106 if res: | 104 if res: |
| 107 dia.exec() | 105 dia.exec() |
| 108 res = dia.hasAddOrDelete() | 106 res = dia.hasAddOrDelete() |
| 109 self.vcs.checkVCSStatus() | 107 self.vcs.checkVCSStatus() |
| 126 "--config", | 124 "--config", |
| 127 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", | 125 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", |
| 128 ] | 126 ] |
| 129 ) | 127 ) |
| 130 | 128 |
| 131 dia = HgDialog(self.tr("Abort histedit session"), self.vcs, useClient=False) | 129 dia = HgDialog(self.tr("Abort histedit session"), self.vcs) |
| 132 res = dia.startProcess(args) | 130 res = dia.startProcess(args) |
| 133 if res: | 131 if res: |
| 134 dia.exec() | 132 dia.exec() |
| 135 res = dia.hasAddOrDelete() | 133 res = dia.hasAddOrDelete() |
| 136 self.vcs.checkVCSStatus() | 134 self.vcs.checkVCSStatus() |
| 154 "--config", | 152 "--config", |
| 155 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", | 153 f"ui.editor={PythonUtilities.getPythonExecutable()} {editor}", |
| 156 ] | 154 ] |
| 157 ) | 155 ) |
| 158 | 156 |
| 159 dia = HgDialog(self.tr("Edit Plan"), self.vcs, useClient=False) | 157 dia = HgDialog(self.tr("Edit Plan"), self.vcs) |
| 160 res = dia.startProcess(args) | 158 res = dia.startProcess(args) |
| 161 if res: | 159 if res: |
| 162 dia.exec() | 160 dia.exec() |
| 163 res = dia.hasAddOrDelete() | 161 res = dia.hasAddOrDelete() |
| 164 self.vcs.checkVCSStatus() | 162 self.vcs.checkVCSStatus() |
