Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 495
- b31b0bffa5b0
- parent 442
- f233430b5613
- child 537
- 72b32daeb8d6
equal
deleted
inserted
replaced
| 492:01f3384d535a | 495:b31b0bffa5b0 |
|---|---|
| 56 """ | 56 """ |
| 57 Class implementing the version control systems interface to Subversion. | 57 Class implementing the version control systems interface to Subversion. |
| 58 | 58 |
| 59 @signal committed() emitted after the commit action has completed | 59 @signal committed() emitted after the commit action has completed |
| 60 """ | 60 """ |
| 61 committed = pyqtSignal() | |
| 62 | |
| 61 def __init__(self, plugin, parent = None, name = None): | 63 def __init__(self, plugin, parent = None, name = None): |
| 62 """ | 64 """ |
| 63 Constructor | 65 Constructor |
| 64 | 66 |
| 65 @param plugin reference to the plugin object | 67 @param plugin reference to the plugin object |
| 462 """ | 464 """ |
| 463 if not noDialog and not message: | 465 if not noDialog and not message: |
| 464 # call CommitDialog and get message from there | 466 # call CommitDialog and get message from there |
| 465 if self.__commitDialog is None: | 467 if self.__commitDialog is None: |
| 466 self.__commitDialog = SvnCommitDialog(self.__ui) | 468 self.__commitDialog = SvnCommitDialog(self.__ui) |
| 467 self.connect(self.__commitDialog, SIGNAL("accepted()"), | 469 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) |
| 468 self.__vcsCommit_Step2) | |
| 469 self.__commitDialog.show() | 470 self.__commitDialog.show() |
| 470 self.__commitDialog.raise_() | 471 self.__commitDialog.raise_() |
| 471 self.__commitDialog.activateWindow() | 472 self.__commitDialog.activateWindow() |
| 472 | 473 |
| 473 self.__commitData["name"] = name | 474 self.__commitData["name"] = name |
| 489 msg = self.__commitDialog.logMessage() | 490 msg = self.__commitDialog.logMessage() |
| 490 if self.__commitDialog.hasChangelists(): | 491 if self.__commitDialog.hasChangelists(): |
| 491 changelists, keepChangelists = self.__commitDialog.changelistsData() | 492 changelists, keepChangelists = self.__commitDialog.changelistsData() |
| 492 else: | 493 else: |
| 493 changelists, keepChangelists = [], False | 494 changelists, keepChangelists = [], False |
| 494 self.disconnect(self.__commitDialog, SIGNAL("accepted()"), | 495 self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2) |
| 495 self.__vcsCommit_Step2) | |
| 496 self.__commitDialog = None | 496 self.__commitDialog = None |
| 497 else: | 497 else: |
| 498 changelists, keepChangelists = [], False | 498 changelists, keepChangelists = [], False |
| 499 | 499 |
| 500 if not msg: | 500 if not msg: |
| 547 rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")\ | 547 rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")\ |
| 548 .format(rev.number)) | 548 .format(rev.number)) |
| 549 dlg.finish() | 549 dlg.finish() |
| 550 dlg.exec_() | 550 dlg.exec_() |
| 551 os.chdir(cwd) | 551 os.chdir(cwd) |
| 552 self.emit(SIGNAL("committed()")) | 552 self.committed.emit() |
| 553 self.checkVCSStatus() | 553 self.checkVCSStatus() |
| 554 | 554 |
| 555 def vcsUpdate(self, name, noDialog = False): | 555 def vcsUpdate(self, name, noDialog = False): |
| 556 """ | 556 """ |
| 557 Public method used to update a file/directory with the Subversion repository. | 557 Public method used to update a file/directory with the Subversion repository. |
