Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 945
- 8cd4d08fa9f6
- parent 791
- 9ec2ac20e54e
- child 1017
- 919147f2b518
equal
deleted
inserted
replaced
| 944:1b59c4ba121e | 945:8cd4d08fa9f6 |
|---|---|
| 9 | 9 |
| 10 from PyQt4.QtGui import QDialog | 10 from PyQt4.QtGui import QDialog |
| 11 | 11 |
| 12 from .Ui_HgMergeDialog import Ui_HgMergeDialog | 12 from .Ui_HgMergeDialog import Ui_HgMergeDialog |
| 13 | 13 |
| 14 | |
| 14 class HgMergeDialog(QDialog, Ui_HgMergeDialog): | 15 class HgMergeDialog(QDialog, Ui_HgMergeDialog): |
| 15 """ | 16 """ |
| 16 Class implementing a dialog to enter the data for a merge operation. | 17 Class implementing a dialog to enter the data for a merge operation. |
| 17 """ | 18 """ |
| 18 def __init__(self, force, tagsList, branchesList, parent = None): | 19 def __init__(self, force, tagsList, branchesList, parent=None): |
| 19 """ | 20 """ |
| 20 Constructor | 21 Constructor |
| 21 | 22 |
| 22 @param force flag indicating a forced merge (boolean) | 23 @param force flag indicating a forced merge (boolean) |
| 23 @param tagsList list of tags (list of strings) | 24 @param tagsList list of tags (list of strings) |
| 33 | 34 |
| 34 def getParameters(self): | 35 def getParameters(self): |
| 35 """ | 36 """ |
| 36 Public method to retrieve the merge data. | 37 Public method to retrieve the merge data. |
| 37 | 38 |
| 38 @return tuple naming the revision and a flag indicating a | 39 @return tuple naming the revision and a flag indicating a |
| 39 forced merge (string, boolean) | 40 forced merge (string, boolean) |
| 40 """ | 41 """ |
| 41 if self.numberButton.isChecked(): | 42 if self.numberButton.isChecked(): |
| 42 rev = str(self.numberSpinBox.value()) | 43 rev = str(self.numberSpinBox.value()) |
| 43 elif self.idButton.isChecked(): | 44 elif self.idButton.isChecked(): |
