Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
- changeset 7759
- 51aa6c6b66f7
- parent 7360
- 9190402e4505
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 52 res = False | 52 res = False |
| 53 dlg = HgHisteditConfigDialog(self.vcs.hgGetTagsList(repodir), | 53 dlg = HgHisteditConfigDialog(self.vcs.hgGetTagsList(repodir), |
| 54 self.vcs.hgGetBranchesList(repodir), | 54 self.vcs.hgGetBranchesList(repodir), |
| 55 self.vcs.hgGetBookmarksList(repodir), | 55 self.vcs.hgGetBookmarksList(repodir), |
| 56 rev) | 56 rev) |
| 57 if dlg.exec_() == QDialog.Accepted: | 57 if dlg.exec() == QDialog.Accepted: |
| 58 rev, force, keep = dlg.getData() | 58 rev, force, keep = dlg.getData() |
| 59 | 59 |
| 60 args = self.vcs.initCommand("histedit") | 60 args = self.vcs.initCommand("histedit") |
| 61 args.append("-v") | 61 args.append("-v") |
| 62 if keep: | 62 if keep: |
| 77 self.tr("Starting histedit session"), | 77 self.tr("Starting histedit session"), |
| 78 self.vcs, | 78 self.vcs, |
| 79 useClient=False) | 79 useClient=False) |
| 80 res = dia.startProcess(args, repodir, environment=env) | 80 res = dia.startProcess(args, repodir, environment=env) |
| 81 if res: | 81 if res: |
| 82 dia.exec_() | 82 dia.exec() |
| 83 res = dia.hasAddOrDelete() | 83 res = dia.hasAddOrDelete() |
| 84 self.vcs.checkVCSStatus() | 84 self.vcs.checkVCSStatus() |
| 85 return res | 85 return res |
| 86 | 86 |
| 87 def hgHisteditContinue(self, name): | 87 def hgHisteditContinue(self, name): |
| 112 self.tr("Continue histedit session"), | 112 self.tr("Continue histedit session"), |
| 113 self.vcs, | 113 self.vcs, |
| 114 useClient=False) | 114 useClient=False) |
| 115 res = dia.startProcess(args, repodir, environment=env) | 115 res = dia.startProcess(args, repodir, environment=env) |
| 116 if res: | 116 if res: |
| 117 dia.exec_() | 117 dia.exec() |
| 118 res = dia.hasAddOrDelete() | 118 res = dia.hasAddOrDelete() |
| 119 self.vcs.checkVCSStatus() | 119 self.vcs.checkVCSStatus() |
| 120 return res | 120 return res |
| 121 | 121 |
| 122 def hgHisteditAbort(self, name): | 122 def hgHisteditAbort(self, name): |
| 147 self.tr("Abort histedit session"), | 147 self.tr("Abort histedit session"), |
| 148 self.vcs, | 148 self.vcs, |
| 149 useClient=False) | 149 useClient=False) |
| 150 res = dia.startProcess(args, repodir, environment=env) | 150 res = dia.startProcess(args, repodir, environment=env) |
| 151 if res: | 151 if res: |
| 152 dia.exec_() | 152 dia.exec() |
| 153 res = dia.hasAddOrDelete() | 153 res = dia.hasAddOrDelete() |
| 154 self.vcs.checkVCSStatus() | 154 self.vcs.checkVCSStatus() |
| 155 return res | 155 return res |
| 156 | 156 |
| 157 def hgHisteditEditPlan(self, name): | 157 def hgHisteditEditPlan(self, name): |
| 183 self.tr("Edit Plan"), | 183 self.tr("Edit Plan"), |
| 184 self.vcs, | 184 self.vcs, |
| 185 useClient=False) | 185 useClient=False) |
| 186 res = dia.startProcess(args, repodir, environment=env) | 186 res = dia.startProcess(args, repodir, environment=env) |
| 187 if res: | 187 if res: |
| 188 dia.exec_() | 188 dia.exec() |
| 189 res = dia.hasAddOrDelete() | 189 res = dia.hasAddOrDelete() |
| 190 self.vcs.checkVCSStatus() | 190 self.vcs.checkVCSStatus() |
| 191 return res | 191 return res |
