Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9653
- e67609152c5e
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 20 def __init__(self, bundleHeads, branches, parent=None): | 20 def __init__(self, bundleHeads, branches, parent=None): |
| 21 """ | 21 """ |
| 22 Constructor | 22 Constructor |
| 23 | 23 |
| 24 @param bundleHeads list of heads contained in a bundle | 24 @param bundleHeads list of heads contained in a bundle |
| 25 (list of strings) | 25 @type list of str |
| 26 @param branches list of available branch names (list of strings) | 26 @param branches list of available branch names |
| 27 @param parent reference to the parent widget (QWidget) | 27 @type list of str |
| 28 @param parent reference to the parent widget | |
| 29 @type QWidget | |
| 28 """ | 30 """ |
| 29 super().__init__(parent) | 31 super().__init__(parent) |
| 30 self.setupUi(self) | 32 self.setupUi(self) |
| 31 | 33 |
| 32 self.headCombo.addItems(sorted(bundleHeads)) | 34 self.headCombo.addItems(sorted(bundleHeads)) |
| 34 | 36 |
| 35 def getData(self): | 37 def getData(self): |
| 36 """ | 38 """ |
| 37 Public method to get the entered data. | 39 Public method to get the entered data. |
| 38 | 40 |
| 39 @return tuple with the bundle head (string) and the local branch | 41 @return tuple with the bundle head (string) and the local branch name |
| 40 name (string) | 42 @rtype str |
| 41 """ | 43 """ |
| 42 return self.headCombo.currentText(), self.branchCombo.currentText() | 44 return self.headCombo.currentText(), self.branchCombo.currentText() |
