Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsGit/GitBranchDialog.py
Plugins/VcsPlugins/vcsGit/GitBranchDialog.py
- changeset 6062
- 926d2ad79e6d
- parent 6048
- 82ad8ec9548c
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6060:57365172e94f | 6062:926d2ad79e6d |
|---|---|
| 42 self.setupUi(self) | 42 self.setupUi(self) |
| 43 | 43 |
| 44 self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) | 44 self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) |
| 45 self.okButton.setEnabled(False) | 45 self.okButton.setEnabled(False) |
| 46 | 46 |
| 47 self.__remoteBranches = [b for b in branchlist if "/" in b] | 47 self.__remoteBranches = [b for b in branchlist |
| 48 self.__lokalBranches = [b for b in branchlist if "/" not in b] | 48 if b.startswith("remotes/")] |
| 49 self.__lokalBranches = [b for b in branchlist | |
| 50 if not b.startswith("remotes/")] | |
| 49 | 51 |
| 50 self.branchCombo.clear() | 52 self.branchCombo.clear() |
| 51 self.branchCombo.addItem("") | 53 self.branchCombo.addItem("") |
| 52 self.branchCombo.addItems(sorted(self.__lokalBranches)) | 54 self.branchCombo.addItems(sorted(self.__lokalBranches)) |
| 53 | 55 |
