Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 495
- b31b0bffa5b0
- parent 442
- f233430b5613
- child 537
- 72b32daeb8d6
equal
deleted
inserted
replaced
| 492:01f3384d535a | 495:b31b0bffa5b0 |
|---|---|
| 50 """ | 50 """ |
| 51 Class implementing the version control systems interface to Subversion. | 51 Class implementing the version control systems interface to Subversion. |
| 52 | 52 |
| 53 @signal committed() emitted after the commit action has completed | 53 @signal committed() emitted after the commit action has completed |
| 54 """ | 54 """ |
| 55 committed = pyqtSignal() | |
| 56 | |
| 55 def __init__(self, plugin, parent=None, name=None): | 57 def __init__(self, plugin, parent=None, name=None): |
| 56 """ | 58 """ |
| 57 Constructor | 59 Constructor |
| 58 | 60 |
| 59 @param plugin reference to the plugin object | 61 @param plugin reference to the plugin object |
| 423 | 425 |
| 424 if not noDialog and not msg: | 426 if not noDialog and not msg: |
| 425 # call CommitDialog and get message from there | 427 # call CommitDialog and get message from there |
| 426 if self.__commitDialog is None: | 428 if self.__commitDialog is None: |
| 427 self.__commitDialog = SvnCommitDialog(self, self.__ui) | 429 self.__commitDialog = SvnCommitDialog(self, self.__ui) |
| 428 self.connect(self.__commitDialog, SIGNAL("accepted()"), | 430 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2) |
| 429 self.__vcsCommit_Step2) | |
| 430 self.__commitDialog.show() | 431 self.__commitDialog.show() |
| 431 self.__commitDialog.raise_() | 432 self.__commitDialog.raise_() |
| 432 self.__commitDialog.activateWindow() | 433 self.__commitDialog.activateWindow() |
| 433 | 434 |
| 434 self.__commitData["name"] = name | 435 self.__commitData["name"] = name |
| 450 msg = self.__commitDialog.logMessage() | 451 msg = self.__commitDialog.logMessage() |
| 451 if self.__commitDialog.hasChangelists(): | 452 if self.__commitDialog.hasChangelists(): |
| 452 changelists, keepChangelists = self.__commitDialog.changelistsData() | 453 changelists, keepChangelists = self.__commitDialog.changelistsData() |
| 453 else: | 454 else: |
| 454 changelists, keepChangelists = [], False | 455 changelists, keepChangelists = [], False |
| 455 self.disconnect(self.__commitDialog, SIGNAL("accepted()"), | 456 self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2) |
| 456 self.__vcsCommit_Step2) | |
| 457 self.__commitDialog = None | 457 self.__commitDialog = None |
| 458 else: | 458 else: |
| 459 changelists, keepChangelists = [], False | 459 changelists, keepChangelists = [], False |
| 460 | 460 |
| 461 if not msg: | 461 if not msg: |
| 488 else: | 488 else: |
| 489 dia = SvnDialog(self.trUtf8('Commiting changes to Subversion repository')) | 489 dia = SvnDialog(self.trUtf8('Commiting changes to Subversion repository')) |
| 490 res = dia.startProcess(args, dname) | 490 res = dia.startProcess(args, dname) |
| 491 if res: | 491 if res: |
| 492 dia.exec_() | 492 dia.exec_() |
| 493 self.emit(SIGNAL("committed()")) | 493 self.committed.emit() |
| 494 self.checkVCSStatus() | 494 self.checkVCSStatus() |
| 495 | 495 |
| 496 def vcsUpdate(self, name, noDialog = False): | 496 def vcsUpdate(self, name, noDialog = False): |
| 497 """ | 497 """ |
| 498 Public method used to update a file/directory with the Subversion repository. | 498 Public method used to update a file/directory with the Subversion repository. |
