Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 5588
- 6ba512d9f46a
- parent 5389
- 9b1c800daff3
- child 5848
- 56388f41b1e6
equal
deleted
inserted
replaced
| 5587:ea526b78ee6c | 5588:6ba512d9f46a |
|---|---|
| 324 @pyqtSlot() | 324 @pyqtSlot() |
| 325 def on_sendButton_clicked(self): | 325 def on_sendButton_clicked(self): |
| 326 """ | 326 """ |
| 327 Private slot to send the input to the subversion process. | 327 Private slot to send the input to the subversion process. |
| 328 """ | 328 """ |
| 329 input = self.input.text() | 329 inputTxt = self.input.text() |
| 330 input += os.linesep | 330 inputTxt += os.linesep |
| 331 | 331 |
| 332 if self.passwordCheckBox.isChecked(): | 332 if self.passwordCheckBox.isChecked(): |
| 333 self.errors.insertPlainText(os.linesep) | 333 self.errors.insertPlainText(os.linesep) |
| 334 self.errors.ensureCursorVisible() | 334 self.errors.ensureCursorVisible() |
| 335 else: | 335 else: |
| 336 self.errors.insertPlainText(input) | 336 self.errors.insertPlainText(inputTxt) |
| 337 self.errors.ensureCursorVisible() | 337 self.errors.ensureCursorVisible() |
| 338 | 338 |
| 339 self.process.write(input) | 339 self.process.write(inputTxt) |
| 340 | 340 |
| 341 self.passwordCheckBox.setChecked(False) | 341 self.passwordCheckBox.setChecked(False) |
| 342 self.input.clear() | 342 self.input.clear() |
| 343 | 343 |
| 344 def on_input_returnPressed(self): | 344 def on_input_returnPressed(self): |
