Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 945
- 8cd4d08fa9f6
- parent 791
- 9ec2ac20e54e
- child 1112
- 8a7d1b9d18db
equal
deleted
inserted
replaced
| 944:1b59c4ba121e | 945:8cd4d08fa9f6 |
|---|---|
| 10 from PyQt4.QtCore import * | 10 from PyQt4.QtCore import * |
| 11 from PyQt4.QtGui import * | 11 from PyQt4.QtGui import * |
| 12 | 12 |
| 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 14 | 14 |
| 15 | |
| 15 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 16 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
| 16 """ | 17 """ |
| 17 Class implementing a dialog to enter the data for a merge operation. | 18 Class implementing a dialog to enter the data for a merge operation. |
| 18 """ | 19 """ |
| 19 def __init__(self, mergelist1, mergelist2, targetlist, force = False, parent = None): | 20 def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): |
| 20 """ | 21 """ |
| 21 Constructor | 22 Constructor |
| 22 | 23 |
| 23 @param mergelist1 list of previously entered URLs/revisions (list of strings) | 24 @param mergelist1 list of previously entered URLs/revisions (list of strings) |
| 24 @param mergelist2 list of previously entered URLs/revisions (list of strings) | 25 @param mergelist2 list of previously entered URLs/revisions (list of strings) |
| 77 Public method to retrieve the merge data. | 78 Public method to retrieve the merge data. |
| 78 | 79 |
| 79 @return tuple naming two tag names or two revisions, a target and | 80 @return tuple naming two tag names or two revisions, a target and |
| 80 a flag indicating a forced merge (string, string, string, boolean) | 81 a flag indicating a forced merge (string, string, string, boolean) |
| 81 """ | 82 """ |
| 82 return (self.tag1Combo.currentText(), | 83 return (self.tag1Combo.currentText(), |
| 83 self.tag2Combo.currentText(), | 84 self.tag2Combo.currentText(), |
| 84 self.targetCombo.currentText(), | 85 self.targetCombo.currentText(), |
| 85 self.forceCheckBox.isChecked()) | 86 self.forceCheckBox.isChecked()) |
