Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- eric7
- changeset 10373
- 093dcebe5ecb
- parent 10372
- 1444b4bee64b
- child 10438
- 4cd7e5a8b3cf
equal
deleted
inserted
replaced
| 10372:1444b4bee64b | 10373:093dcebe5ecb |
|---|---|
| 1440 branchFilter = self.branchCombo.currentText() | 1440 branchFilter = self.branchCombo.currentText() |
| 1441 if not branchFilter: | 1441 if not branchFilter: |
| 1442 branchFilter = self.__allBranchesFilter | 1442 branchFilter = self.__allBranchesFilter |
| 1443 self.branchCombo.clear() | 1443 self.branchCombo.clear() |
| 1444 self.branchCombo.addItems( | 1444 self.branchCombo.addItems( |
| 1445 [self.__allBranchesFilter] + sorted(self.__branchColors.keys()) | 1445 [self.__allBranchesFilter] + sorted(self.__branchColors) |
| 1446 ) | 1446 ) |
| 1447 self.branchCombo.setCurrentIndex(self.branchCombo.findText(branchFilter)) | 1447 self.branchCombo.setCurrentIndex(self.branchCombo.findText(branchFilter)) |
| 1448 | 1448 |
| 1449 self.__filterLogsEnabled = True | 1449 self.__filterLogsEnabled = True |
| 1450 if self.__actionMode() == "filter": | 1450 if self.__actionMode() == "filter": |
| 2336 rev, changeset = itm.text(self.RevisionColumn).strip().split(":", 1) | 2336 rev, changeset = itm.text(self.RevisionColumn).strip().split(":", 1) |
| 2337 bookmarksList = self.vcs.hgGetBookmarksList() | 2337 bookmarksList = self.vcs.hgGetBookmarksList() |
| 2338 bookmark, ok = QInputDialog.getItem( | 2338 bookmark, ok = QInputDialog.getItem( |
| 2339 self, | 2339 self, |
| 2340 self.tr("Move Bookmark"), | 2340 self.tr("Move Bookmark"), |
| 2341 self.tr( | 2341 self.tr("Select the bookmark to be moved to changeset '{0}':").format( |
| 2342 "Select the bookmark to be moved to changeset '{0}':" | 2342 changeset |
| 2343 ).format(changeset), | 2343 ), |
| 2344 [""] + bookmarksList, | 2344 [""] + bookmarksList, |
| 2345 0, | 2345 0, |
| 2346 False, | 2346 False, |
| 2347 ) | 2347 ) |
| 2348 if ok and bool(bookmark): | 2348 if ok and bool(bookmark): |
