Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of visible indentation issues.
Tue, 15 Oct 2013 19:13:32 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 15 Oct 2013 19:13:32 +0200
- changeset 3024
- 17c01303a239
- parent 3023
- 34ce20603bf7
- child 3025
- 67064c71df21
Fixed a bunch of visible indentation issues.
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue Oct 15 19:13:32 2013 +0200 @@ -206,15 +206,18 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) @@ -224,80 +227,100 @@ self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(self.trUtf8('Copy'), self.__SVNCopy) + act = menu.addAction( + self.trUtf8('Copy'), self.__SVNCopy) self.vcsMenuActions.append(act) act = menu.addAction(self.trUtf8('Move'), self.__SVNMove) self.vcsMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRepo.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRepo.png"), self.trUtf8('Show repository info'), self.__SVNInfo) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), self.trUtf8('Show difference side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) - self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), + self.blameAct = menu.addAction( + self.trUtf8('Show annotated file'), self.__SVNBlame) self.vcsMenuActions.append(self.blameAct) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLock.png"), self.trUtf8('Lock'), self.__SVNLock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Unlock'), self.__SVNUnlock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Break Lock'), self.__SVNBreakLock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Steal Lock'), self.__SVNStealLock) self.vcsMenuActions.append(act) menu.addSeparator() @@ -310,13 +333,13 @@ self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -345,68 +368,83 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) if 1 in self.browser.specialMenuEntries: - self.vcsMultiMenuAddTree = \ - menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + self.vcsMultiMenuAddTree = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLock.png"), self.trUtf8('Lock'), self.__SVNLock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Unlock'), self.__SVNUnlock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Break Lock'), self.__SVNBreakLock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Steal Lock'), self.__SVNStealLock) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -419,13 +457,13 @@ self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -451,13 +489,13 @@ menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -488,18 +526,22 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -510,43 +552,54 @@ self.vcsDirMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRepo.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRepo.png"), self.trUtf8('Show repository info'), self.__SVNInfo) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -562,13 +615,13 @@ self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -599,50 +652,62 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( @@ -658,13 +723,13 @@ self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure)
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Oct 15 19:13:32 2013 +0200 @@ -61,10 +61,11 @@ self.vcsNewAct.triggered[()].connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) - self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('&Update from repository'), 0, 0, self, - 'subversion_update') + self.vcsUpdateAct = E5Action( + self.trUtf8('Update from repository'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('&Update from repository'), 0, 0, self, + 'subversion_update') self.vcsUpdateAct.setStatusTip(self.trUtf8( 'Update the local project from the VCS repository' )) @@ -92,10 +93,11 @@ self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action(self.trUtf8('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show &log'), - 0, 0, self, 'subversion_log') + self.vcsLogAct = E5Action( + self.trUtf8('Show log'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show &log'), + 0, 0, self, 'subversion_log') self.vcsLogAct.setStatusTip(self.trUtf8( 'Show the log of the local project' )) @@ -106,10 +108,11 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show log browser'), - 0, 0, self, 'subversion_log_browser') + self.svnLogBrowserAct = E5Action( + self.trUtf8('Show log browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show log browser'), + 0, 0, self, 'subversion_log_browser') self.svnLogBrowserAct.setStatusTip(self.trUtf8( 'Show a dialog to browse the log of the local project' )) @@ -122,10 +125,11 @@ self.svnLogBrowserAct.triggered[()].connect(self.__svnLogBrowser) self.actions.append(self.svnLogBrowserAct) - self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show &difference'), - 0, 0, self, 'subversion_diff') + self.vcsDiffAct = E5Action( + self.trUtf8('Show difference'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show &difference'), + 0, 0, self, 'subversion_diff') self.vcsDiffAct.setStatusTip(self.trUtf8( 'Show the difference of the local project to the repository' )) @@ -153,10 +157,11 @@ self.svnExtDiffAct.triggered[()].connect(self.__svnExtendedDiff) self.actions.append(self.svnExtDiffAct) - self.svnUrlDiffAct = E5Action(self.trUtf8('Show difference (URLs)'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), - 0, 0, self, 'subversion_urldiff') + self.svnUrlDiffAct = E5Action( + self.trUtf8('Show difference (URLs)'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show difference (URLs)'), + 0, 0, self, 'subversion_urldiff') self.svnUrlDiffAct.setStatusTip(self.trUtf8( 'Show the difference of the project between two repository URLs' )) @@ -168,10 +173,11 @@ self.svnUrlDiffAct.triggered[()].connect(self.__svnUrlDiff) self.actions.append(self.svnUrlDiffAct) - self.vcsStatusAct = E5Action(self.trUtf8('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), - self.trUtf8('Show &status'), - 0, 0, self, 'subversion_status') + self.vcsStatusAct = E5Action( + self.trUtf8('Show status'), + UI.PixmapCache.getIcon("vcsStatus.png"), + self.trUtf8('Show &status'), + 0, 0, self, 'subversion_status') self.vcsStatusAct.setStatusTip(self.trUtf8( 'Show the status of the local project' )) @@ -182,10 +188,11 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) - self.svnChangeListsAct = E5Action(self.trUtf8('Show change lists'), - UI.PixmapCache.getIcon("vcsChangeLists.png"), - self.trUtf8('Show change lists'), - 0, 0, self, 'subversion_changelists') + self.svnChangeListsAct = E5Action( + self.trUtf8('Show change lists'), + UI.PixmapCache.getIcon("vcsChangeLists.png"), + self.trUtf8('Show change lists'), + 0, 0, self, 'subversion_changelists') self.svnChangeListsAct.setStatusTip(self.trUtf8( 'Show the change lists and associated files of the local project' )) @@ -197,10 +204,11 @@ self.svnChangeListsAct.triggered[()].connect(self.__svnChangeLists) self.actions.append(self.svnChangeListsAct) - self.svnRepoInfoAct = E5Action(self.trUtf8('Show repository info'), - UI.PixmapCache.getIcon("vcsRepo.png"), - self.trUtf8('Show repository info'), - 0, 0, self, 'subversion_repoinfo') + self.svnRepoInfoAct = E5Action( + self.trUtf8('Show repository info'), + UI.PixmapCache.getIcon("vcsRepo.png"), + self.trUtf8('Show repository info'), + 0, 0, self, 'subversion_repoinfo') self.svnRepoInfoAct.setStatusTip(self.trUtf8( 'Show some repository related information for the local project' )) @@ -212,10 +220,11 @@ self.svnRepoInfoAct.triggered[()].connect(self.__svnInfo) self.actions.append(self.svnRepoInfoAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), - self.trUtf8('&Tag in repository...'), - 0, 0, self, 'subversion_tag') + self.vcsTagAct = E5Action( + self.trUtf8('Tag in repository'), + UI.PixmapCache.getIcon("vcsTag.png"), + self.trUtf8('&Tag in repository...'), + 0, 0, self, 'subversion_tag') self.vcsTagAct.setStatusTip(self.trUtf8( 'Tag the local project in the repository' )) @@ -226,10 +235,11 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), - self.trUtf8('&Export from repository...'), - 0, 0, self, 'subversion_export') + self.vcsExportAct = E5Action( + self.trUtf8('Export from repository'), + UI.PixmapCache.getIcon("vcsExport.png"), + self.trUtf8('&Export from repository...'), + 0, 0, self, 'subversion_export') self.vcsExportAct.setStatusTip(self.trUtf8( 'Export a project from the repository' )) @@ -240,9 +250,10 @@ self.vcsExportAct.triggered[()].connect(self._vcsExport) self.actions.append(self.vcsExportAct) - self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'), 0, 0, self, - 'subversion_options') + self.vcsPropsAct = E5Action( + self.trUtf8('Command options'), + self.trUtf8('Command &options...'), 0, 0, self, + 'subversion_options') self.vcsPropsAct.setStatusTip(self.trUtf8( 'Show the VCS command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( @@ -252,10 +263,11 @@ self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) - self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Re&vert changes'), - 0, 0, self, 'subversion_revert') + self.vcsRevertAct = E5Action( + self.trUtf8('Revert changes'), + UI.PixmapCache.getIcon("vcsRevert.png"), + self.trUtf8('Re&vert changes'), + 0, 0, self, 'subversion_revert') self.vcsRevertAct.setStatusTip(self.trUtf8( 'Revert all changes made to the local project' )) @@ -266,10 +278,11 @@ self.vcsRevertAct.triggered[()].connect(self._vcsRevert) self.actions.append(self.vcsRevertAct) - self.vcsMergeAct = E5Action(self.trUtf8('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), - self.trUtf8('Mer&ge changes...'), - 0, 0, self, 'subversion_merge') + self.vcsMergeAct = E5Action( + self.trUtf8('Merge'), + UI.PixmapCache.getIcon("vcsMerge.png"), + self.trUtf8('Mer&ge changes...'), + 0, 0, self, 'subversion_merge') self.vcsMergeAct.setStatusTip(self.trUtf8( 'Merge changes of a tag/revision into the local project' )) @@ -281,10 +294,11 @@ self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) - self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), - self.trUtf8('S&witch...'), - 0, 0, self, 'subversion_switch') + self.vcsSwitchAct = E5Action( + self.trUtf8('Switch'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.trUtf8('S&witch...'), + 0, 0, self, 'subversion_switch') self.vcsSwitchAct.setStatusTip(self.trUtf8( 'Switch the local copy to another tag/branch' )) @@ -295,9 +309,10 @@ self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) - self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), - self.trUtf8('Con&flicts resolved'), - 0, 0, self, 'subversion_resolve') + self.vcsResolveAct = E5Action( + self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), + 0, 0, self, 'subversion_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( 'Mark all conflicts of the local project as resolved' )) @@ -309,9 +324,10 @@ self.vcsResolveAct.triggered[()].connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) - self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), - self.trUtf8('Cleanu&p'), - 0, 0, self, 'subversion_cleanup') + self.vcsCleanupAct = E5Action( + self.trUtf8('Cleanup'), + self.trUtf8('Cleanu&p'), + 0, 0, self, 'subversion_cleanup') self.vcsCleanupAct.setStatusTip(self.trUtf8( 'Cleanup the local project' )) @@ -322,9 +338,10 @@ self.vcsCleanupAct.triggered[()].connect(self._vcsCleanup) self.actions.append(self.vcsCleanupAct) - self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), - self.trUtf8('E&xecute command...'), - 0, 0, self, 'subversion_command') + self.vcsCommandAct = E5Action( + self.trUtf8('Execute command'), + self.trUtf8('E&xecute command...'), + 0, 0, self, 'subversion_command') self.vcsCommandAct.setStatusTip(self.trUtf8( 'Execute an arbitrary VCS command' )) @@ -335,9 +352,10 @@ self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) - self.svnTagListAct = E5Action(self.trUtf8('List tags'), - self.trUtf8('List tags...'), - 0, 0, self, 'subversion_list_tags') + self.svnTagListAct = E5Action( + self.trUtf8('List tags'), + self.trUtf8('List tags...'), + 0, 0, self, 'subversion_list_tags') self.svnTagListAct.setStatusTip(self.trUtf8( 'List tags of the project' )) @@ -348,9 +366,10 @@ self.svnTagListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnTagListAct) - self.svnBranchListAct = E5Action(self.trUtf8('List branches'), - self.trUtf8('List branches...'), - 0, 0, self, 'subversion_list_branches') + self.svnBranchListAct = E5Action( + self.trUtf8('List branches'), + self.trUtf8('List branches...'), + 0, 0, self, 'subversion_list_branches') self.svnBranchListAct.setStatusTip(self.trUtf8( 'List branches of the project' )) @@ -361,9 +380,10 @@ self.svnBranchListAct.triggered[()].connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) - self.svnListAct = E5Action(self.trUtf8('List repository contents'), - self.trUtf8('List repository contents...'), - 0, 0, self, 'subversion_contents') + self.svnListAct = E5Action( + self.trUtf8('List repository contents'), + self.trUtf8('List repository contents...'), + 0, 0, self, 'subversion_contents') self.svnListAct.setStatusTip(self.trUtf8( 'Lists the contents of the repository' )) @@ -374,9 +394,10 @@ self.svnListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnListAct) - self.svnPropSetAct = E5Action(self.trUtf8('Set Property'), - self.trUtf8('Set Property...'), - 0, 0, self, 'subversion_property_set') + self.svnPropSetAct = E5Action( + self.trUtf8('Set Property'), + self.trUtf8('Set Property...'), + 0, 0, self, 'subversion_property_set') self.svnPropSetAct.setStatusTip(self.trUtf8( 'Set a property for the project files' )) @@ -387,9 +408,10 @@ self.svnPropSetAct.triggered[()].connect(self.__svnPropSet) self.actions.append(self.svnPropSetAct) - self.svnPropListAct = E5Action(self.trUtf8('List Properties'), - self.trUtf8('List Properties...'), - 0, 0, self, 'subversion_property_list') + self.svnPropListAct = E5Action( + self.trUtf8('List Properties'), + self.trUtf8('List Properties...'), + 0, 0, self, 'subversion_property_list') self.svnPropListAct.setStatusTip(self.trUtf8( 'List properties of the project files' )) @@ -400,9 +422,10 @@ self.svnPropListAct.triggered[()].connect(self.__svnPropList) self.actions.append(self.svnPropListAct) - self.svnPropDelAct = E5Action(self.trUtf8('Delete Property'), - self.trUtf8('Delete Property...'), - 0, 0, self, 'subversion_property_delete') + self.svnPropDelAct = E5Action( + self.trUtf8('Delete Property'), + self.trUtf8('Delete Property...'), + 0, 0, self, 'subversion_property_delete') self.svnPropDelAct.setStatusTip(self.trUtf8( 'Delete a property for the project files' )) @@ -413,10 +436,11 @@ self.svnPropDelAct.triggered[()].connect(self.__svnPropDel) self.actions.append(self.svnPropDelAct) - self.svnRelocateAct = E5Action(self.trUtf8('Relocate'), - UI.PixmapCache.getIcon("vcsSwitch.png"), - self.trUtf8('Relocate...'), - 0, 0, self, 'subversion_relocate') + self.svnRelocateAct = E5Action( + self.trUtf8('Relocate'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.trUtf8('Relocate...'), + 0, 0, self, 'subversion_relocate') self.svnRelocateAct.setStatusTip(self.trUtf8( 'Relocate the working copy to a new repository URL' )) @@ -428,10 +452,11 @@ self.svnRelocateAct.triggered[()].connect(self.__svnRelocate) self.actions.append(self.svnRelocateAct) - self.svnRepoBrowserAct = E5Action(self.trUtf8('Repository Browser'), - UI.PixmapCache.getIcon("vcsRepoBrowser.png"), - self.trUtf8('Repository Browser...'), - 0, 0, self, 'subversion_repo_browser') + self.svnRepoBrowserAct = E5Action( + self.trUtf8('Repository Browser'), + UI.PixmapCache.getIcon("vcsRepoBrowser.png"), + self.trUtf8('Repository Browser...'), + 0, 0, self, 'subversion_repo_browser') self.svnRepoBrowserAct.setStatusTip(self.trUtf8( 'Show the Repository Browser dialog' )) @@ -442,9 +467,10 @@ self.svnRepoBrowserAct.triggered[()].connect(self.__svnRepoBrowser) self.actions.append(self.svnRepoBrowserAct) - self.svnConfigAct = E5Action(self.trUtf8('Configure'), - self.trUtf8('Configure...'), - 0, 0, self, 'subversion_configure') + self.svnConfigAct = E5Action( + self.trUtf8('Configure'), + self.trUtf8('Configure...'), + 0, 0, self, 'subversion_configure') self.svnConfigAct.setStatusTip(self.trUtf8( 'Show the configuration dialog with the Subversion page selected' ))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -123,7 +123,8 @@ @param lineno linenumber (string) @param text line of text from the annotated file (string) """ - itm = QTreeWidgetItem(self.blameList, + itm = QTreeWidgetItem( + self.blameList, ["{0:d}".format(revision), author, "{0:d}".format(lineno), text]) itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(2, Qt.AlignRight)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -68,11 +68,11 @@ if msg in self.recentCommitMessages: self.recentCommitMessages.remove(msg) self.recentCommitMessages.insert(0, msg) - no = int(Preferences.Prefs.settings\ - .value('Subversion/CommitMessages', 20)) + no = int(Preferences.Prefs.settings.value( + 'Subversion/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Subversion/Commits', - self.recentCommitMessages) + Preferences.Prefs.settings.setValue( + 'Subversion/Commits', self.recentCommitMessages) return msg def hasChangelists(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -219,7 +219,8 @@ diff_sum['path'])) diffText = os.linesep.join(diff_list) else: - diffText = self.client.diff(tmpdir, + diffText = self.client.diff( + tmpdir, url1, revision1=rev1, url_or_path2=url2, revision2=rev2, recurse=recurse) @@ -231,7 +232,8 @@ revision_start=rev1, revision_end=rev2, recurse=recurse) else: - diffText = self.client.diff(tmpdir, name, + diffText = self.client.diff( + tmpdir, name, revision1=rev1, revision2=rev2, recurse=recurse) counter = 0 for line in diffText.splitlines(): @@ -438,7 +440,8 @@ except IOError as why: E5MessageBox.critical( self, self.trUtf8('Save Diff'), - self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' + self.trUtf8( + '<p>The patch file <b>{0}</b> could not be saved.' '<br>Reason: {1}</p>') .format(fname, str(why)))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -110,7 +110,8 @@ """ Private method to resort the log tree. """ - self.logTree.sortItems(self.logTree.sortColumn(), + self.logTree.sortItems( + self.logTree.sortColumn(), self.logTree.header().sortIndicatorOrder()) def __resizeColumnsFiles(self): @@ -125,10 +126,10 @@ Private method to resort the changed files tree. """ sortColumn = self.filesTree.sortColumn() - self.filesTree.sortItems(1, - self.filesTree.header().sortIndicatorOrder()) - self.filesTree.sortItems(sortColumn, - self.filesTree.header().sortIndicatorOrder()) + self.filesTree.sortItems( + 1, self.filesTree.header().sortIndicatorOrder()) + self.filesTree.sortItems( + sortColumn, self.filesTree.header().sortIndicatorOrder()) def __generateLogItem(self, author, date, message, revision, changedPaths): """ @@ -198,7 +199,8 @@ @param copyRev revision the file was copied from (None, string) @return reference to the generated item (QTreeWidgetItem) """ - itm = QTreeWidgetItem(self.filesTree, + itm = QTreeWidgetItem( + self.filesTree, [self.flags[action], path, copyFrom, copyRev] ) @@ -242,11 +244,10 @@ else: revstart = pysvn.Revision( pysvn.opt_revision_kind.number, nextRev) - allLogs = self.client.log(self.fname, - revision_start=revstart, - discover_changed_paths=True, - limit=flimit + 1, - strict_node_history=self.stopCheckBox.isChecked()) + allLogs = self.client.log( + self.fname, revision_start=revstart, + discover_changed_paths=True, limit=flimit + 1, + strict_node_history=self.stopCheckBox.isChecked()) if len(allLogs) <= flimit or self._clientCancelCallback(): logs.extend(allLogs) break @@ -257,8 +258,9 @@ locker.unlock() for log in logs: - self.__generateLogItem(log["author"], log["date"], - log["message"], log["revision"], log['changed_paths']) + self.__generateLogItem( + log["author"], log["date"], log["message"], + log["revision"], log['changed_paths']) dt = dateFromTime_t(log["date"]) if not self.__maxDate.isValid() and \ not self.__minDate.isValid(): @@ -364,7 +366,8 @@ changes = current.data(0, self.__changesRole) if len(changes) > 0: for change in changes: - self.__generateFileItem(change["action"], change["path"], + self.__generateFileItem( + change["action"], change["path"], change["copyfrom_path"], change["copyfrom_revision"]) self.__resizeColumnsFiles() self.__resortFiles()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -44,5 +44,5 @@ @return tuple of three values (username, password, save) """ return (self.usernameEdit.text(), - self.passwordEdit.text(), - self.saveCheckBox.isChecked()) + self.passwordEdit.text(), + self.saveCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -56,7 +56,8 @@ """ Private method to resort the tree. """ - self.propsList.sortItems(self.propsList.sortColumn(), + self.propsList.sortItems( + self.propsList.sortColumn(), self.propsList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -73,7 +73,8 @@ """ Private method to resort the tree. """ - self.repoTree.sortItems(self.repoTree.sortColumn(), + self.repoTree.sortItems( + self.repoTree.sortColumn(), self.repoTree.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -84,7 +85,7 @@ self.repoTree.header().setStretchLastSection(True) def __generateItem(self, parent, repopath, revision, author, size, date, - nodekind, url): + nodekind, url): """ Private method to generate a tree item in the repository tree. @@ -170,8 +171,9 @@ repoUrl = dirent["path"] if repoUrl != url: self.__ignoreExpand = True - itm = self.__generateItem(parent, "/", - "", "", 0, "", pysvn.node_kind.dir, repoUrl) + itm = self.__generateItem( + parent, "/", "", "", 0, "", + pysvn.node_kind.dir, repoUrl) itm.setExpanded(True) parent = itm urlPart = repoUrl @@ -180,16 +182,16 @@ if element: urlPart = "{0}/{1}".format(urlPart, element) - itm = self.__generateItem(parent, element, - "", "", 0, "", pysvn.node_kind.dir, - urlPart) + itm = self.__generateItem( + parent, element, "", "", 0, "", + pysvn.node_kind.dir, urlPart) itm.setExpanded(True) parent = itm self.__ignoreExpand = False - itm = self.__generateItem(parent, dirent["repos_path"], - dirent["created_rev"], dirent["last_author"], - dirent["size"], dirent["time"], - dirent["kind"], dirent["path"]) + itm = self.__generateItem( + parent, dirent["repos_path"], dirent["created_rev"], + dirent["last_author"], dirent["size"], dirent["time"], + dirent["kind"], dirent["path"]) self.__resort() self.__resizeColumns() except pysvn.ClientError as e:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -103,10 +103,10 @@ self.__removeFromChangelist)) if self.vcs.version >= (1, 2, 0): self.menu.addSeparator() - self.menuactions.append(self.menu.addAction(self.trUtf8("Lock"), - self.__lock)) - self.menuactions.append(self.menu.addAction(self.trUtf8("Unlock"), - self.__unlock)) + self.menuactions.append( + self.menu.addAction(self.trUtf8("Lock"), self.__lock)) + self.menuactions.append( + self.menu.addAction(self.trUtf8("Unlock"), self.__unlock)) self.menuactions.append(self.menu.addAction( self.trUtf8("Break lock"), self.__breakLock)) @@ -179,7 +179,8 @@ """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems( + self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -92,7 +92,8 @@ E5MessageBox.critical( self, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The list operation will""" """ be aborted""")) return False @@ -196,7 +197,8 @@ """ Private method to resort the tree. """ - self.tagList.sortItems(self.tagList.sortColumn(), + self.tagList.sortItems( + self.tagList.sortColumn(), self.tagList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Tue Oct 15 19:13:32 2013 +0200 @@ -67,7 +67,8 @@ E5MessageBox.critical( self, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The operation will""" """ be aborted""")) self.reject()
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Oct 15 18:54:53 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Oct 15 19:13:32 2013 +0200 @@ -349,7 +349,8 @@ type_, ok = QInputDialog.getItem( None, self.trUtf8("Subversion Checkout"), - self.trUtf8("The tag must be a normal tag (tags) or" + self.trUtf8( + "The tag must be a normal tag (tags) or" " a branch tag (branches)." " Please select from the list."), self.tagTypeList, @@ -413,7 +414,8 @@ type_, ok = QInputDialog.getItem( None, self.trUtf8("Subversion Export"), - self.trUtf8("The tag must be a normal tag (tags) or" + self.trUtf8( + "The tag must be a normal tag (tags) or" " a branch tag (branches)." " Please select from the list."), self.tagTypeList, @@ -578,8 +580,8 @@ dlg.showError(e.args[0]) locker.unlock() if not noDialog: - rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")\ - .format(rev.number)) + rev and dlg.showMessage(self.trUtf8("Committed revision {0}.") + .format(rev.number)) dlg.finish() dlg.exec_() os.chdir(cwd) @@ -1066,7 +1068,8 @@ E5MessageBox.critical( self.__ui, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The tag operation will""" """ be aborted""")) return @@ -1133,7 +1136,8 @@ if names[0]: from UI.DeleteFilesConfirmationDialog import \ DeleteFilesConfirmationDialog - dia = DeleteFilesConfirmationDialog(self.parent(), + dia = DeleteFilesConfirmationDialog( + self.parent(), self.trUtf8("Revert changes"), self.trUtf8( "Do you really want to revert all changes to these files" @@ -1207,7 +1211,8 @@ E5MessageBox.critical( self.__ui, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The switch operation will""" """ be aborted""")) return False @@ -1227,10 +1232,9 @@ tn = url client = self.getClient() - dlg = \ - SvnDialog(self.trUtf8('Switching to {0}').format(tn), - "switch {0} {1}".format(url, name), - client) + dlg = SvnDialog(self.trUtf8('Switching to {0}').format(tn), + "switch {0} {1}".format(url, name), + client) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: @@ -1611,10 +1615,9 @@ @param name directory name to be cleaned up (string) """ client = self.getClient() - dlg = \ - SvnDialog(self.trUtf8('Cleaning up {0}').format(name), - "cleanup {0}".format(name), - client) + dlg = SvnDialog(self.trUtf8('Cleaning up {0}').format(name), + "cleanup {0}".format(name), + client) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: @@ -1700,7 +1703,8 @@ pysvn.svn_api_version[3]) else: apiVersion = QApplication.translate('subversion', "unknown") - return QApplication.translate('subversion', + return QApplication.translate( + 'subversion', """<h3>Repository information</h3>""" """<table>""" """<tr><td><b>PySvn V.</b></td><td>{0}</td></tr>""" @@ -1767,12 +1771,11 @@ opts = self.options['global'] recurse = "--non-recursive" not in opts client = self.getClient() - dlg = \ - SvnDialog(self.trUtf8('Resolving conficts'), - "resolved{0} {1}".format( - (not recurse) and " --non-recursive" or "", - " ".join(fnames)), - client) + dlg = SvnDialog(self.trUtf8('Resolving conficts'), + "resolved{0} {1}".format( + (not recurse) and " --non-recursive" or "", + " ".join(fnames)), + client) QApplication.processEvents() try: for name in fnames:
