Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 9025
- 9fe8cfa14542
- parent 9019
- a104d4e882cb
- child 9152
- 8a68afaf1ba2
equal
deleted
inserted
replaced
| 9024:640778fcd474 | 9025:9fe8cfa14542 |
|---|---|
| 1029 @param name directory name to be switched (string) | 1029 @param name directory name to be switched (string) |
| 1030 @return flag indicating, that the switch contained an add | 1030 @return flag indicating, that the switch contained an add |
| 1031 or delete (boolean) | 1031 or delete (boolean) |
| 1032 """ | 1032 """ |
| 1033 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog | 1033 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog |
| 1034 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(), | 1034 dlg = HgRevisionSelectionDialog( |
| 1035 self.hgGetBranchesList(), | 1035 self.hgGetTagsList(), |
| 1036 self.hgGetBookmarksList(), | 1036 self.hgGetBranchesList(), |
| 1037 self.tr("Current branch tip")) | 1037 bookmarksList=self.hgGetBookmarksList(), |
| 1038 noneLabel=self.tr("Current branch tip") | |
| 1039 ) | |
| 1038 if dlg.exec() == QDialog.DialogCode.Accepted: | 1040 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 1039 rev = dlg.getRevision() | 1041 rev = dlg.getRevision() |
| 1040 return self.vcsUpdate(name, revision=rev) | 1042 return self.vcsUpdate(name, revision=rev) |
| 1041 | 1043 |
| 1042 return False | 1044 return False |
| 1501 project = ericApp().getObject("Project") | 1503 project = ericApp().getObject("Project") |
| 1502 if nam == project.ppath and not project.saveAllScripts(): | 1504 if nam == project.ppath and not project.saveAllScripts(): |
| 1503 return | 1505 return |
| 1504 | 1506 |
| 1505 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog | 1507 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog |
| 1506 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(), | 1508 dlg = HgRevisionsSelectionDialog( |
| 1507 self.hgGetBranchesList(), | 1509 self.hgGetTagsList(), |
| 1508 self.hgGetBookmarksList()) | 1510 self.hgGetBranchesList(), |
| 1511 bookmarksList=self.hgGetBookmarksList() | |
| 1512 ) | |
| 1509 if dlg.exec() == QDialog.DialogCode.Accepted: | 1513 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 1510 revisions = dlg.getRevisions() | 1514 revisions = dlg.getRevisions() |
| 1511 if self.diff is None: | 1515 if self.diff is None: |
| 1512 from .HgDiffDialog import HgDiffDialog | 1516 from .HgDiffDialog import HgDiffDialog |
| 1513 self.diff = HgDiffDialog(self) | 1517 self.diff = HgDiffDialog(self) |
| 1548 if isinstance(name, list): | 1552 if isinstance(name, list): |
| 1549 raise ValueError("Wrong parameter type") | 1553 raise ValueError("Wrong parameter type") |
| 1550 | 1554 |
| 1551 if extended: | 1555 if extended: |
| 1552 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog | 1556 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog |
| 1553 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(), | 1557 dlg = HgRevisionsSelectionDialog( |
| 1554 self.hgGetBranchesList(), | 1558 self.hgGetTagsList(), |
| 1555 self.hgGetBookmarksList()) | 1559 self.hgGetBranchesList(), |
| 1560 bookmarksList=self.hgGetBookmarksList() | |
| 1561 ) | |
| 1556 if dlg.exec() == QDialog.DialogCode.Accepted: | 1562 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 1557 rev1, rev2 = dlg.getRevisions() | 1563 rev1, rev2 = dlg.getRevisions() |
| 1558 else: | 1564 else: |
| 1559 return | 1565 return |
| 1560 elif revisions: | 1566 elif revisions: |
| 2245 .format(subcommand)) | 2251 .format(subcommand)) |
| 2246 | 2252 |
| 2247 rev = "" | 2253 rev = "" |
| 2248 if subcommand in ("good", "bad", "skip"): | 2254 if subcommand in ("good", "bad", "skip"): |
| 2249 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog | 2255 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog |
| 2250 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(), | 2256 dlg = HgRevisionSelectionDialog( |
| 2251 self.hgGetBranchesList(), | 2257 self.hgGetTagsList(), |
| 2252 self.hgGetBookmarksList()) | 2258 self.hgGetBranchesList(), |
| 2259 bookmarksList=self.hgGetBookmarksList() | |
| 2260 ) | |
| 2253 if dlg.exec() == QDialog.DialogCode.Accepted: | 2261 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 2254 rev = dlg.getRevision() | 2262 rev = dlg.getRevision() |
| 2255 else: | 2263 else: |
| 2256 return | 2264 return |
| 2257 | 2265 |
