Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
- changeset 5291
- e93d14b48c34
- parent 5283
- 06423d65a2b8
- child 5389
- 9b1c800daff3
equal
deleted
inserted
replaced
| 5290:174dae2b91c3 | 5291:e93d14b48c34 |
|---|---|
| 50 return False | 50 return False |
| 51 | 51 |
| 52 from .HgHisteditConfigDialog import HgHisteditConfigDialog | 52 from .HgHisteditConfigDialog import HgHisteditConfigDialog |
| 53 res = False | 53 res = False |
| 54 dlg = HgHisteditConfigDialog(self.vcs.hgGetTagsList(repodir), | 54 dlg = HgHisteditConfigDialog(self.vcs.hgGetTagsList(repodir), |
| 55 self.vcs.hgGetBranchesList(repodir), | 55 self.vcs.hgGetBranchesList(repodir), |
| 56 self.vcs.hgGetBookmarksList(repodir), | 56 self.vcs.hgGetBookmarksList(repodir), |
| 57 rev) | 57 rev) |
| 58 if dlg.exec_() == QDialog.Accepted: | 58 if dlg.exec_() == QDialog.Accepted: |
| 59 rev, force, keep = dlg.getData() | 59 rev, force, keep = dlg.getData() |
| 60 | 60 |
| 61 args = self.vcs.initCommand("histedit") | 61 args = self.vcs.initCommand("histedit") |
| 62 args.append("-v") | 62 args.append("-v") |
| 74 os.path.dirname(__file__), "HgHisteditEditor.py") | 74 os.path.dirname(__file__), "HgHisteditEditor.py") |
| 75 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} | 75 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} |
| 76 | 76 |
| 77 dia = HgDialog( | 77 dia = HgDialog( |
| 78 self.tr("Starting histedit session"), | 78 self.tr("Starting histedit session"), |
| 79 self.vcs, | 79 self.vcs, |
| 80 useClient=False) | 80 useClient=False) |
| 81 res = dia.startProcess(args, repodir, environment=env) | 81 res = dia.startProcess(args, repodir, environment=env) |
| 82 if res: | 82 if res: |
| 83 dia.exec_() | 83 dia.exec_() |
| 84 res = dia.hasAddOrDelete() | 84 res = dia.hasAddOrDelete() |
| 109 os.path.dirname(__file__), "HgHisteditEditor.py") | 109 os.path.dirname(__file__), "HgHisteditEditor.py") |
| 110 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} | 110 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} |
| 111 | 111 |
| 112 dia = HgDialog( | 112 dia = HgDialog( |
| 113 self.tr("Continue histedit session"), | 113 self.tr("Continue histedit session"), |
| 114 self.vcs, | 114 self.vcs, |
| 115 useClient=False) | 115 useClient=False) |
| 116 res = dia.startProcess(args, repodir, environment=env) | 116 res = dia.startProcess(args, repodir, environment=env) |
| 117 if res: | 117 if res: |
| 118 dia.exec_() | 118 dia.exec_() |
| 119 res = dia.hasAddOrDelete() | 119 res = dia.hasAddOrDelete() |
| 144 os.path.dirname(__file__), "HgHisteditEditor.py") | 144 os.path.dirname(__file__), "HgHisteditEditor.py") |
| 145 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} | 145 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} |
| 146 | 146 |
| 147 dia = HgDialog( | 147 dia = HgDialog( |
| 148 self.tr("Abort histedit session"), | 148 self.tr("Abort histedit session"), |
| 149 self.vcs, | 149 self.vcs, |
| 150 useClient=False) | 150 useClient=False) |
| 151 res = dia.startProcess(args, repodir, environment=env) | 151 res = dia.startProcess(args, repodir, environment=env) |
| 152 if res: | 152 if res: |
| 153 dia.exec_() | 153 dia.exec_() |
| 154 res = dia.hasAddOrDelete() | 154 res = dia.hasAddOrDelete() |
| 180 os.path.dirname(__file__), "HgHisteditEditor.py") | 180 os.path.dirname(__file__), "HgHisteditEditor.py") |
| 181 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} | 181 env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} |
| 182 | 182 |
| 183 dia = HgDialog( | 183 dia = HgDialog( |
| 184 self.tr("Edit Plan"), | 184 self.tr("Edit Plan"), |
| 185 self.vcs, | 185 self.vcs, |
| 186 useClient=False) | 186 useClient=False) |
| 187 res = dia.startProcess(args, repodir, environment=env) | 187 res = dia.startProcess(args, repodir, environment=env) |
| 188 if res: | 188 if res: |
| 189 dia.exec_() | 189 dia.exec_() |
| 190 res = dia.hasAddOrDelete() | 190 res = dia.hasAddOrDelete() |
