Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py
eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py
- changeset 7759
- 51aa6c6b66f7
- parent 7360
- 9190402e4505
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 47 | 47 |
| 48 message = "" | 48 message = "" |
| 49 if not revisions: | 49 if not revisions: |
| 50 from .HgCloseHeadSelectionDialog import HgCloseHeadSelectionDialog | 50 from .HgCloseHeadSelectionDialog import HgCloseHeadSelectionDialog |
| 51 dlg = HgCloseHeadSelectionDialog(self.vcs, name) | 51 dlg = HgCloseHeadSelectionDialog(self.vcs, name) |
| 52 if dlg.exec_() == QDialog.Accepted: | 52 if dlg.exec() == QDialog.Accepted: |
| 53 revisions, message = dlg.getData() | 53 revisions, message = dlg.getData() |
| 54 | 54 |
| 55 if not revisions: | 55 if not revisions: |
| 56 # still no revisions given; abort... | 56 # still no revisions given; abort... |
| 57 return | 57 return |
| 69 args += ["--rev", revision] | 69 args += ["--rev", revision] |
| 70 | 70 |
| 71 dia = HgDialog(self.tr("Closing Heads"), self.vcs) | 71 dia = HgDialog(self.tr("Closing Heads"), self.vcs) |
| 72 res = dia.startProcess(args, repodir) | 72 res = dia.startProcess(args, repodir) |
| 73 if res: | 73 if res: |
| 74 dia.exec_() | 74 dia.exec() |
