Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of visible indentation issues.
Tue, 15 Oct 2013 18:54:53 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 15 Oct 2013 18:54:53 +0200
- changeset 3023
- 34ce20603bf7
- parent 3022
- 57179e4cdadd
- child 3024
- 17c01303a239
Fixed a bunch of visible indentation issues.
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -203,7 +203,8 @@ """ Private method to resort the tree. """ - self.bookmarksList.sortItems(self.bookmarksList.sortColumn(), + self.bookmarksList.sortItems( + self.bookmarksList.sortColumn(), self.bookmarksList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -186,7 +186,8 @@ """ Private method to resort the tree. """ - self.bookmarksList.sortItems(self.bookmarksList.sortColumn(), + self.bookmarksList.sortItems( + self.bookmarksList.sortColumn(), self.bookmarksList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -30,10 +30,11 @@ """ Public method to generate the action objects. """ - self.hgBookmarksListAct = E5Action(self.trUtf8('List bookmarks'), - UI.PixmapCache.getIcon("listBookmarks.png"), - self.trUtf8('List bookmarks...'), - 0, 0, self, 'mercurial_list_bookmarks') + self.hgBookmarksListAct = E5Action( + self.trUtf8('List bookmarks'), + UI.PixmapCache.getIcon("listBookmarks.png"), + self.trUtf8('List bookmarks...'), + 0, 0, self, 'mercurial_list_bookmarks') self.hgBookmarksListAct.setStatusTip(self.trUtf8( 'List bookmarks of the project' )) @@ -44,10 +45,11 @@ self.hgBookmarksListAct.triggered[()].connect(self.__hgBookmarksList) self.actions.append(self.hgBookmarksListAct) - self.hgBookmarkDefineAct = E5Action(self.trUtf8('Define bookmark'), - UI.PixmapCache.getIcon("addBookmark.png"), - self.trUtf8('Define bookmark...'), - 0, 0, self, 'mercurial_define_bookmark') + self.hgBookmarkDefineAct = E5Action( + self.trUtf8('Define bookmark'), + UI.PixmapCache.getIcon("addBookmark.png"), + self.trUtf8('Define bookmark...'), + 0, 0, self, 'mercurial_define_bookmark') self.hgBookmarkDefineAct.setStatusTip(self.trUtf8( 'Define a bookmark for the project' )) @@ -58,10 +60,11 @@ self.hgBookmarkDefineAct.triggered[()].connect(self.__hgBookmarkDefine) self.actions.append(self.hgBookmarkDefineAct) - self.hgBookmarkDeleteAct = E5Action(self.trUtf8('Delete bookmark'), - UI.PixmapCache.getIcon("deleteBookmark.png"), - self.trUtf8('Delete bookmark...'), - 0, 0, self, 'mercurial_delete_bookmark') + self.hgBookmarkDeleteAct = E5Action( + self.trUtf8('Delete bookmark'), + UI.PixmapCache.getIcon("deleteBookmark.png"), + self.trUtf8('Delete bookmark...'), + 0, 0, self, 'mercurial_delete_bookmark') self.hgBookmarkDeleteAct.setStatusTip(self.trUtf8( 'Delete a bookmark of the project' )) @@ -72,10 +75,11 @@ self.hgBookmarkDeleteAct.triggered[()].connect(self.__hgBookmarkDelete) self.actions.append(self.hgBookmarkDeleteAct) - self.hgBookmarkRenameAct = E5Action(self.trUtf8('Rename bookmark'), - UI.PixmapCache.getIcon("renameBookmark.png"), - self.trUtf8('Rename bookmark...'), - 0, 0, self, 'mercurial_rename_bookmark') + self.hgBookmarkRenameAct = E5Action( + self.trUtf8('Rename bookmark'), + UI.PixmapCache.getIcon("renameBookmark.png"), + self.trUtf8('Rename bookmark...'), + 0, 0, self, 'mercurial_rename_bookmark') self.hgBookmarkRenameAct.setStatusTip(self.trUtf8( 'Rename a bookmark of the project' )) @@ -86,10 +90,11 @@ self.hgBookmarkRenameAct.triggered[()].connect(self.__hgBookmarkRename) self.actions.append(self.hgBookmarkRenameAct) - self.hgBookmarkMoveAct = E5Action(self.trUtf8('Move bookmark'), - UI.PixmapCache.getIcon("moveBookmark.png"), - self.trUtf8('Move bookmark...'), - 0, 0, self, 'mercurial_move_bookmark') + self.hgBookmarkMoveAct = E5Action( + self.trUtf8('Move bookmark'), + UI.PixmapCache.getIcon("moveBookmark.png"), + self.trUtf8('Move bookmark...'), + 0, 0, self, 'mercurial_move_bookmark') self.hgBookmarkMoveAct.setStatusTip(self.trUtf8( 'Move a bookmark of the project' )) @@ -118,10 +123,11 @@ self.__hgBookmarkIncoming) self.actions.append(self.hgBookmarkIncomingAct) - self.hgBookmarkPullAct = E5Action(self.trUtf8('Pull bookmark'), - UI.PixmapCache.getIcon("pullBookmark.png"), - self.trUtf8('Pull bookmark'), - 0, 0, self, 'mercurial_pull_bookmark') + self.hgBookmarkPullAct = E5Action( + self.trUtf8('Pull bookmark'), + UI.PixmapCache.getIcon("pullBookmark.png"), + self.trUtf8('Pull bookmark'), + 0, 0, self, 'mercurial_pull_bookmark') self.hgBookmarkPullAct.setStatusTip(self.trUtf8( 'Pull a bookmark from a remote repository' )) @@ -150,10 +156,11 @@ self.__hgBookmarkOutgoing) self.actions.append(self.hgBookmarkOutgoingAct) - self.hgBookmarkPushAct = E5Action(self.trUtf8('Push bookmark'), - UI.PixmapCache.getIcon("pushBookmark.png"), - self.trUtf8('Push bookmark'), - 0, 0, self, 'mercurial_push_bookmark') + self.hgBookmarkPushAct = E5Action( + self.trUtf8('Push bookmark'), + UI.PixmapCache.getIcon("pushBookmark.png"), + self.trUtf8('Push bookmark'), + 0, 0, self, 'mercurial_push_bookmark') self.hgBookmarkPushAct.setStatusTip(self.trUtf8( 'Push a bookmark to a remote repository' ))
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -56,10 +56,11 @@ if msg in self.recentCommitMessages: self.recentCommitMessages.remove(msg) self.recentCommitMessages.insert(0, msg) - no = int(Preferences.Prefs.settings\ - .value('Mercurial/CommitMessages', 20)) + no = int(Preferences.Prefs.settings.value( + 'Mercurial/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Mercurial/Commits', + Preferences.Prefs.settings.setValue( + 'Mercurial/Commits', self.recentCommitMessages) return msg, self.switchCheckBox.isChecked()
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -31,10 +31,11 @@ """ Public method to generate the action objects. """ - self.hgFetchAct = E5Action(self.trUtf8('Fetch changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('Fetch changes'), - 0, 0, self, 'mercurial_fetch') + self.hgFetchAct = E5Action( + self.trUtf8('Fetch changes'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('Fetch changes'), + 0, 0, self, 'mercurial_fetch') self.hgFetchAct.setStatusTip(self.trUtf8( 'Fetch changes from a remote repository' ))
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -179,7 +179,8 @@ """ Private method to resort the tree. """ - self.signaturesList.sortItems(self.signaturesList.sortColumn(), + self.signaturesList.sortItems( + self.signaturesList.sortColumn(), self.signaturesList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -30,10 +30,11 @@ """ Public method to generate the action objects. """ - self.hgGpgListAct = E5Action(self.trUtf8('List Signed Changesets'), - UI.PixmapCache.getIcon("changesetSignList.png"), - self.trUtf8('List Signed Changesets...'), - 0, 0, self, 'mercurial_gpg_list') + self.hgGpgListAct = E5Action( + self.trUtf8('List Signed Changesets'), + UI.PixmapCache.getIcon("changesetSignList.png"), + self.trUtf8('List Signed Changesets...'), + 0, 0, self, 'mercurial_gpg_list') self.hgGpgListAct.setStatusTip(self.trUtf8( 'List signed changesets' )) @@ -44,10 +45,11 @@ self.hgGpgListAct.triggered[()].connect(self.__hgGpgSignatures) self.actions.append(self.hgGpgListAct) - self.hgGpgVerifyAct = E5Action(self.trUtf8('Verify Signatures'), - UI.PixmapCache.getIcon("changesetSignVerify.png"), - self.trUtf8('Verify Signatures'), - 0, 0, self, 'mercurial_gpg_verify') + self.hgGpgVerifyAct = E5Action( + self.trUtf8('Verify Signatures'), + UI.PixmapCache.getIcon("changesetSignVerify.png"), + self.trUtf8('Verify Signatures'), + 0, 0, self, 'mercurial_gpg_verify') self.hgGpgVerifyAct.setStatusTip(self.trUtf8( 'Verify all signatures there may be for a particular revision' )) @@ -59,10 +61,11 @@ self.hgGpgVerifyAct.triggered[()].connect(self.__hgGpgVerifySignatures) self.actions.append(self.hgGpgVerifyAct) - self.hgGpgSignAct = E5Action(self.trUtf8('Sign Revision'), - UI.PixmapCache.getIcon("changesetSign.png"), - self.trUtf8('Sign Revision'), - 0, 0, self, 'mercurial_gpg_sign') + self.hgGpgSignAct = E5Action( + self.trUtf8('Sign Revision'), + UI.PixmapCache.getIcon("changesetSign.png"), + self.trUtf8('Sign Revision'), + 0, 0, self, 'mercurial_gpg_sign') self.hgGpgSignAct.setStatusTip(self.trUtf8( 'Add a signature for a selected revision' ))
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -149,4 +149,4 @@ baseRevs = self.baseRevisionsEdit.toPlainText().strip().splitlines() return (revs, baseRevs, self.compressionCombo.currentText(), - self.allCheckBox.isChecked()) + self.allCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Tue Oct 15 18:54:53 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('Mercurial/CommitMessages', 20)) + no = int(Preferences.Prefs.settings.value( + 'Mercurial/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Mercurial/Commits', - self.recentCommitMessages) + Preferences.Prefs.settings.setValue( + 'Mercurial/Commits', self.recentCommitMessages) return msg def amend(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -158,8 +158,8 @@ self.inputGroup.setEnabled(False) self.inputGroup.hide() - out, err = self.__hgClient.runcommand(args, - output=self.__showOutput, error=self.__showError) + out, err = self.__hgClient.runcommand( + args, output=self.__showOutput, error=self.__showError) if err: self.__showError(err)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -438,7 +438,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/vcsMercurial/HgGraftDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -107,6 +107,6 @@ self.currentDateCheckBox.isChecked(), self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) return (self.revisionsEdit.toPlainText().strip().splitlines(), - userData, dateData, - self.logCheckBox.isChecked(), - self.dryRunCheckBox.isChecked()) + userData, dateData, + self.logCheckBox.isChecked(), + self.dryRunCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -130,8 +130,8 @@ self.logTree.setIconSize( QSize(100 * self.__rowHeight, self.__rowHeight)) if self.vcs.version >= (1, 8): - self.logTree.headerItem().setText(self.logTree.columnCount(), - self.trUtf8("Bookmarks")) + self.logTree.headerItem().setText( + self.logTree.columnCount(), self.trUtf8("Bookmarks")) if self.vcs.version < (2, 1): self.logTree.setColumnHidden(self.PhaseColumn, True) self.phaseLine.hide() @@ -204,10 +204,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 __getColor(self, n): """ @@ -862,7 +862,8 @@ log["message"].append(value.strip()) else: if len(log) > 1: - self.__generateLogItem(log["author"], log["date"], + self.__generateLogItem( + log["author"], log["date"], log["message"], log["revision"], changedPaths, log["parents"], log["branches"], log["tags"], log["phase"], log["bookmarks"])
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -132,7 +132,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): @@ -358,9 +359,10 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') + line = str( + self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') self.__processOutputLine(line) def __processOutputLine(self, line):
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -157,9 +157,10 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') + line = str( + self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') self.__buffer.append(line) def __readStderr(self): @@ -421,7 +422,7 @@ l.append(self.trUtf8("1 or more incoming")) if infoDict["remote"][1]: l.append(self.trUtf8("{0} outgoing")\ - .format(infoDict["remote"][1])) + .format(infoDict["remote"][1])) if infoDict["remote"][2]: l.append(self.trUtf8("%n incoming bookmark(s)", "", infoDict["remote"][2]))
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -195,7 +195,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/vcsMercurial/ProjectBrowserHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -194,20 +194,24 @@ act.setFont(font) menu.addSeparator() - 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) - 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) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository only'), self.__HgForget) self.vcsMenuActions.append(act) @@ -217,36 +221,45 @@ act = menu.addAction(self.trUtf8('Move'), self.__HgMove) 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.__HgLogBrowser) 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) 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.__HgSbsDiff) 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.__HgExtendedDiff) 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.__HgSbsExtendedDiff) self.vcsMenuActions.append(act) - self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), + self.annotateAct = menu.addAction( + self.trUtf8('Show annotated file'), self.__HgAnnotate) self.vcsMenuActions.append(self.annotateAct) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) act = menu.addAction( @@ -289,36 +302,44 @@ act.setFont(font) menu.addSeparator() - 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) - 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) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository only'), self.__HgForget) self.vcsMultiMenuActions.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.__HgExtendedDiff) 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.__HgRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( @@ -395,15 +416,18 @@ act.setFont(font) menu.addSeparator() - 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) @@ -413,26 +437,32 @@ act = menu.addAction(self.trUtf8('Move'), self.__HgMove) self.vcsDirMenuActions.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.__HgLogBrowser) 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) 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.__HgExtendedDiff) 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.__HgRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -477,32 +507,39 @@ act.setFont(font) menu.addSeparator() - 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) 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.__HgExtendedDiff) 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.__HgRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( @@ -650,20 +687,24 @@ items = self.browser.getSelectedItems([ProjectBrowserFileItem]) names = [itm.fileName() for itm in items] - dlg = DeleteFilesConfirmationDialog(self.parent(), + dlg = DeleteFilesConfirmationDialog( + self.parent(), self.trUtf8("Remove from repository only"), - self.trUtf8("Do you really want to remove these files" + self.trUtf8( + "Do you really want to remove these files" " from the repository?"), names) else: items = self.browser.getSelectedItems() names = [itm.fileName() for itm in items] files = [self.browser.project.getRelativePath(name) \ - for name in names] + for name in names] - dlg = DeleteFilesConfirmationDialog(self.parent(), + dlg = DeleteFilesConfirmationDialog( + self.parent(), self.trUtf8("Remove from repository only"), - self.trUtf8("Do you really want to remove these files" + self.trUtf8( + "Do you really want to remove these files" " from the repository?"), files)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -96,10 +96,11 @@ """ Public method to generate the action objects. """ - self.vcsNewAct = E5Action(self.trUtf8('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), - self.trUtf8('&New from repository...'), 0, 0, - self, 'mercurial_new') + self.vcsNewAct = E5Action( + self.trUtf8('New from repository'), + UI.PixmapCache.getIcon("vcsCheckout.png"), + self.trUtf8('&New from repository...'), 0, 0, + self, 'mercurial_new') self.vcsNewAct.setStatusTip(self.trUtf8( 'Create (clone) a new project from a Mercurial repository' )) @@ -111,10 +112,11 @@ self.vcsNewAct.triggered[()].connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) - self.hgIncomingAct = E5Action(self.trUtf8('Show incoming log'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('Show incoming log'), - 0, 0, self, 'mercurial_incoming') + self.hgIncomingAct = E5Action( + self.trUtf8('Show incoming log'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('Show incoming log'), + 0, 0, self, 'mercurial_incoming') self.hgIncomingAct.setStatusTip(self.trUtf8( 'Show the log of incoming changes' )) @@ -126,10 +128,11 @@ self.hgIncomingAct.triggered[()].connect(self.__hgIncoming) self.actions.append(self.hgIncomingAct) - self.hgPullAct = E5Action(self.trUtf8('Pull changes'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('Pull changes'), - 0, 0, self, 'mercurial_pull') + self.hgPullAct = E5Action( + self.trUtf8('Pull changes'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('Pull changes'), + 0, 0, self, 'mercurial_pull') self.hgPullAct.setStatusTip(self.trUtf8( 'Pull changes from a remote repository' )) @@ -141,10 +144,11 @@ self.hgPullAct.triggered[()].connect(self.__hgPull) self.actions.append(self.hgPullAct) - self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('&Update from repository'), 0, 0, self, - 'mercurial_update') + self.vcsUpdateAct = E5Action( + self.trUtf8('Update from repository'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('&Update from repository'), 0, 0, self, + 'mercurial_update') self.vcsUpdateAct.setStatusTip(self.trUtf8( 'Update the local project from the Mercurial repository' )) @@ -172,10 +176,11 @@ self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.hgOutgoingAct = E5Action(self.trUtf8('Show outgoing log'), - UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Show outgoing log'), - 0, 0, self, 'mercurial_outgoing') + self.hgOutgoingAct = E5Action( + self.trUtf8('Show outgoing log'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.trUtf8('Show outgoing log'), + 0, 0, self, 'mercurial_outgoing') self.hgOutgoingAct.setStatusTip(self.trUtf8( 'Show the log of outgoing changes' )) @@ -187,10 +192,11 @@ self.hgOutgoingAct.triggered[()].connect(self.__hgOutgoing) self.actions.append(self.hgOutgoingAct) - self.hgPushAct = E5Action(self.trUtf8('Push changes'), - UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Push changes'), - 0, 0, self, 'mercurial_push') + self.hgPushAct = E5Action( + self.trUtf8('Push changes'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.trUtf8('Push changes'), + 0, 0, self, 'mercurial_push') self.hgPushAct.setStatusTip(self.trUtf8( 'Push changes to a remote repository' )) @@ -202,10 +208,11 @@ self.hgPushAct.triggered[()].connect(self.__hgPush) self.actions.append(self.hgPushAct) - self.hgPushForcedAct = E5Action(self.trUtf8('Push changes (force)'), - UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Push changes (force)'), - 0, 0, self, 'mercurial_push_forced') + self.hgPushForcedAct = E5Action( + self.trUtf8('Push changes (force)'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.trUtf8('Push changes (force)'), + 0, 0, self, 'mercurial_push_forced') self.hgPushForcedAct.setStatusTip(self.trUtf8( 'Push changes to a remote repository with force option' )) @@ -217,10 +224,11 @@ self.hgPushForcedAct.triggered[()].connect(self.__hgPushForced) self.actions.append(self.hgPushForcedAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), - self.trUtf8('&Export from repository...'), - 0, 0, self, 'mercurial_export_repo') + self.vcsExportAct = E5Action( + self.trUtf8('Export from repository'), + UI.PixmapCache.getIcon("vcsExport.png"), + self.trUtf8('&Export from repository...'), + 0, 0, self, 'mercurial_export_repo') self.vcsExportAct.setStatusTip(self.trUtf8( 'Export a project from the repository' )) @@ -231,10 +239,11 @@ self.vcsExportAct.triggered[()].connect(self._vcsExport) self.actions.append(self.vcsExportAct) - self.vcsLogAct = E5Action(self.trUtf8('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show &log'), - 0, 0, self, 'mercurial_log') + self.vcsLogAct = E5Action( + self.trUtf8('Show log'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show &log'), + 0, 0, self, 'mercurial_log') self.vcsLogAct.setStatusTip(self.trUtf8( 'Show the log of the local project' )) @@ -245,10 +254,11 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.hgLogBrowserAct = E5Action(self.trUtf8('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show log browser'), - 0, 0, self, 'mercurial_log_browser') + self.hgLogBrowserAct = E5Action( + self.trUtf8('Show log browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show log browser'), + 0, 0, self, 'mercurial_log_browser') self.hgLogBrowserAct.setStatusTip(self.trUtf8( 'Show a dialog to browse the log of the local project' )) @@ -261,10 +271,11 @@ self.hgLogBrowserAct.triggered[()].connect(self.__hgLogBrowser) self.actions.append(self.hgLogBrowserAct) - self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show &difference'), - 0, 0, self, 'mercurial_diff') + self.vcsDiffAct = E5Action( + self.trUtf8('Show difference'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show &difference'), + 0, 0, self, 'mercurial_diff') self.vcsDiffAct.setStatusTip(self.trUtf8( 'Show the difference of the local project to the repository' )) @@ -276,10 +287,11 @@ self.vcsDiffAct.triggered[()].connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) - self.hgExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), - 0, 0, self, 'mercurial_extendeddiff') + self.hgExtDiffAct = E5Action( + self.trUtf8('Show difference (extended)'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show difference (extended)'), + 0, 0, self, 'mercurial_extendeddiff') self.hgExtDiffAct.setStatusTip(self.trUtf8( 'Show the difference of revisions of the project to the repository' )) @@ -291,10 +303,11 @@ self.hgExtDiffAct.triggered[()].connect(self.__hgExtendedDiff) self.actions.append(self.hgExtDiffAct) - self.vcsStatusAct = E5Action(self.trUtf8('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), - self.trUtf8('Show &status...'), - 0, 0, self, 'mercurial_status') + self.vcsStatusAct = E5Action( + self.trUtf8('Show status'), + UI.PixmapCache.getIcon("vcsStatus.png"), + self.trUtf8('Show &status...'), + 0, 0, self, 'mercurial_status') self.vcsStatusAct.setStatusTip(self.trUtf8( 'Show the status of the local project' )) @@ -321,9 +334,10 @@ self.hgSummaryAct.triggered[()].connect(self.__hgSummary) self.actions.append(self.hgSummaryAct) - self.hgHeadsAct = E5Action(self.trUtf8('Show heads'), - self.trUtf8('Show heads'), - 0, 0, self, 'mercurial_heads') + self.hgHeadsAct = E5Action( + self.trUtf8('Show heads'), + self.trUtf8('Show heads'), + 0, 0, self, 'mercurial_heads') self.hgHeadsAct.setStatusTip(self.trUtf8( 'Show the heads of the repository' )) @@ -334,9 +348,10 @@ self.hgHeadsAct.triggered[()].connect(self.__hgHeads) self.actions.append(self.hgHeadsAct) - self.hgParentsAct = E5Action(self.trUtf8('Show parents'), - self.trUtf8('Show parents'), - 0, 0, self, 'mercurial_parents') + self.hgParentsAct = E5Action( + self.trUtf8('Show parents'), + self.trUtf8('Show parents'), + 0, 0, self, 'mercurial_parents') self.hgParentsAct.setStatusTip(self.trUtf8( 'Show the parents of the repository' )) @@ -347,9 +362,10 @@ self.hgParentsAct.triggered[()].connect(self.__hgParents) self.actions.append(self.hgParentsAct) - self.hgTipAct = E5Action(self.trUtf8('Show tip'), - self.trUtf8('Show tip'), - 0, 0, self, 'mercurial_tip') + self.hgTipAct = E5Action( + self.trUtf8('Show tip'), + self.trUtf8('Show tip'), + 0, 0, self, 'mercurial_tip') self.hgTipAct.setStatusTip(self.trUtf8( 'Show the tip of the repository' )) @@ -360,10 +376,11 @@ self.hgTipAct.triggered[()].connect(self.__hgTip) self.actions.append(self.hgTipAct) - self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Re&vert changes'), - 0, 0, self, 'mercurial_revert') + self.vcsRevertAct = E5Action( + self.trUtf8('Revert changes'), + UI.PixmapCache.getIcon("vcsRevert.png"), + self.trUtf8('Re&vert changes'), + 0, 0, self, 'mercurial_revert') self.vcsRevertAct.setStatusTip(self.trUtf8( 'Revert all changes made to the local project' )) @@ -374,10 +391,11 @@ self.vcsRevertAct.triggered[()].connect(self.__hgRevert) self.actions.append(self.vcsRevertAct) - self.vcsMergeAct = E5Action(self.trUtf8('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), - self.trUtf8('Mer&ge changes...'), - 0, 0, self, 'mercurial_merge') + self.vcsMergeAct = E5Action( + self.trUtf8('Merge'), + UI.PixmapCache.getIcon("vcsMerge.png"), + self.trUtf8('Mer&ge changes...'), + 0, 0, self, 'mercurial_merge') self.vcsMergeAct.setStatusTip(self.trUtf8( 'Merge changes of a revision into the local project' )) @@ -389,9 +407,10 @@ self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) - self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), - self.trUtf8('Con&flicts resolved'), - 0, 0, self, 'mercurial_resolve') + self.vcsResolveAct = E5Action( + self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), + 0, 0, self, 'mercurial_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( 'Mark all conflicts of the local project as resolved' )) @@ -403,10 +422,11 @@ self.vcsResolveAct.triggered[()].connect(self.__hgResolve) self.actions.append(self.vcsResolveAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), - self.trUtf8('&Tag in repository...'), - 0, 0, self, 'mercurial_tag') + self.vcsTagAct = E5Action( + self.trUtf8('Tag in repository'), + UI.PixmapCache.getIcon("vcsTag.png"), + self.trUtf8('&Tag in repository...'), + 0, 0, self, 'mercurial_tag') self.vcsTagAct.setStatusTip(self.trUtf8( 'Tag the local project in the repository' )) @@ -417,9 +437,10 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.hgTagListAct = E5Action(self.trUtf8('List tags'), - self.trUtf8('List tags...'), - 0, 0, self, 'mercurial_list_tags') + self.hgTagListAct = E5Action( + self.trUtf8('List tags'), + self.trUtf8('List tags...'), + 0, 0, self, 'mercurial_list_tags') self.hgTagListAct.setStatusTip(self.trUtf8( 'List tags of the project' )) @@ -430,9 +451,10 @@ self.hgTagListAct.triggered[()].connect(self.__hgTagList) self.actions.append(self.hgTagListAct) - self.hgBranchListAct = E5Action(self.trUtf8('List branches'), - self.trUtf8('List branches...'), - 0, 0, self, 'mercurial_list_branches') + self.hgBranchListAct = E5Action( + self.trUtf8('List branches'), + self.trUtf8('List branches...'), + 0, 0, self, 'mercurial_list_branches') self.hgBranchListAct.setStatusTip(self.trUtf8( 'List branches of the project' )) @@ -443,10 +465,11 @@ self.hgBranchListAct.triggered[()].connect(self.__hgBranchList) self.actions.append(self.hgBranchListAct) - self.hgBranchAct = E5Action(self.trUtf8('Create branch'), - UI.PixmapCache.getIcon("vcsBranch.png"), - self.trUtf8('Create &branch...'), - 0, 0, self, 'mercurial_branch') + self.hgBranchAct = E5Action( + self.trUtf8('Create branch'), + UI.PixmapCache.getIcon("vcsBranch.png"), + self.trUtf8('Create &branch...'), + 0, 0, self, 'mercurial_branch') self.hgBranchAct.setStatusTip(self.trUtf8( 'Create a new branch for the local project in the repository' )) @@ -458,9 +481,10 @@ self.hgBranchAct.triggered[()].connect(self.__hgBranch) self.actions.append(self.hgBranchAct) - self.hgPushBranchAct = E5Action(self.trUtf8('Push new branch'), - self.trUtf8('Push new branch'), - 0, 0, self, 'mercurial_push_branch') + self.hgPushBranchAct = E5Action( + self.trUtf8('Push new branch'), + self.trUtf8('Push new branch'), + 0, 0, self, 'mercurial_push_branch') self.hgPushBranchAct.setStatusTip(self.trUtf8( 'Push the current branch of the local project as a new named' ' branch' @@ -473,9 +497,10 @@ self.hgPushBranchAct.triggered[()].connect(self.__hgPushNewBranch) self.actions.append(self.hgPushBranchAct) - self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), - self.trUtf8('Close branch'), - 0, 0, self, 'mercurial_close_branch') + self.hgCloseBranchAct = E5Action( + self.trUtf8('Close branch'), + self.trUtf8('Close branch'), + 0, 0, self, 'mercurial_close_branch') self.hgCloseBranchAct.setStatusTip(self.trUtf8( 'Close the current branch of the local project' )) @@ -486,9 +511,10 @@ self.hgCloseBranchAct.triggered[()].connect(self.__hgCloseBranch) self.actions.append(self.hgCloseBranchAct) - self.hgShowBranchAct = E5Action(self.trUtf8('Show current branch'), - self.trUtf8('Show current branch'), - 0, 0, self, 'mercurial_show_branch') + self.hgShowBranchAct = E5Action( + self.trUtf8('Show current branch'), + self.trUtf8('Show current branch'), + 0, 0, self, 'mercurial_show_branch') self.hgShowBranchAct.setStatusTip(self.trUtf8( 'Show the current branch of the project' )) @@ -499,10 +525,11 @@ self.hgShowBranchAct.triggered[()].connect(self.__hgShowBranch) self.actions.append(self.hgShowBranchAct) - self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), - self.trUtf8('S&witch...'), - 0, 0, self, 'mercurial_switch') + self.vcsSwitchAct = E5Action( + self.trUtf8('Switch'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.trUtf8('S&witch...'), + 0, 0, self, 'mercurial_switch') self.vcsSwitchAct.setStatusTip(self.trUtf8( 'Switch the working directory to another revision' )) @@ -514,9 +541,10 @@ self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) - self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), - self.trUtf8('Cleanu&p'), - 0, 0, self, 'mercurial_cleanup') + self.vcsCleanupAct = E5Action( + self.trUtf8('Cleanup'), + self.trUtf8('Cleanu&p'), + 0, 0, self, 'mercurial_cleanup') self.vcsCleanupAct.setStatusTip(self.trUtf8( 'Cleanup the local project' )) @@ -527,9 +555,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, 'mercurial_command') + self.vcsCommandAct = E5Action( + self.trUtf8('Execute command'), + self.trUtf8('E&xecute command...'), + 0, 0, self, 'mercurial_command') self.vcsCommandAct.setStatusTip(self.trUtf8( 'Execute an arbitrary Mercurial command' )) @@ -541,9 +570,10 @@ self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) - self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'), 0, 0, self, - 'mercurial_options') + self.vcsPropsAct = E5Action( + self.trUtf8('Command options'), + self.trUtf8('Command &options...'), 0, 0, self, + 'mercurial_options') self.vcsPropsAct.setStatusTip(self.trUtf8( 'Show the Mercurial command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( @@ -554,9 +584,10 @@ self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) - self.hgConfigAct = E5Action(self.trUtf8('Configure'), - self.trUtf8('Configure...'), - 0, 0, self, 'mercurial_configure') + self.hgConfigAct = E5Action( + self.trUtf8('Configure'), + self.trUtf8('Configure...'), + 0, 0, self, 'mercurial_configure') self.hgConfigAct.setStatusTip(self.trUtf8( 'Show the configuration dialog with the Mercurial page selected' )) @@ -598,9 +629,9 @@ self.actions.append(self.hgRepoConfigAct) self.hgShowConfigAct = E5Action( - self.trUtf8('Show combined configuration settings'), - self.trUtf8('Show combined configuration settings...'), - 0, 0, self, 'mercurial_show_config') + self.trUtf8('Show combined configuration settings'), + self.trUtf8('Show combined configuration settings...'), + 0, 0, self, 'mercurial_show_config') self.hgShowConfigAct.setStatusTip(self.trUtf8( 'Show the combined configuration settings from all configuration' ' files' @@ -613,9 +644,10 @@ self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig) self.actions.append(self.hgShowConfigAct) - self.hgShowPathsAct = E5Action(self.trUtf8('Show paths'), - self.trUtf8('Show paths...'), - 0, 0, self, 'mercurial_show_paths') + self.hgShowPathsAct = E5Action( + self.trUtf8('Show paths'), + self.trUtf8('Show paths...'), + 0, 0, self, 'mercurial_show_paths') self.hgShowPathsAct.setStatusTip(self.trUtf8( 'Show the aliases for remote repositories' )) @@ -626,9 +658,10 @@ self.hgShowPathsAct.triggered[()].connect(self.__hgShowPaths) self.actions.append(self.hgShowPathsAct) - self.hgVerifyAct = E5Action(self.trUtf8('Verify repository'), - self.trUtf8('Verify repository...'), - 0, 0, self, 'mercurial_verify') + self.hgVerifyAct = E5Action( + self.trUtf8('Verify repository'), + self.trUtf8('Verify repository...'), + 0, 0, self, 'mercurial_verify') self.hgVerifyAct.setStatusTip(self.trUtf8( 'Verify the integrity of the repository' )) @@ -639,9 +672,10 @@ self.hgVerifyAct.triggered[()].connect(self.__hgVerify) self.actions.append(self.hgVerifyAct) - self.hgRecoverAct = E5Action(self.trUtf8('Recover'), - self.trUtf8('Recover...'), - 0, 0, self, 'mercurial_recover') + self.hgRecoverAct = E5Action( + self.trUtf8('Recover'), + self.trUtf8('Recover...'), + 0, 0, self, 'mercurial_recover') self.hgRecoverAct.setStatusTip(self.trUtf8( 'Recover from an interrupted transaction' )) @@ -652,9 +686,10 @@ self.hgRecoverAct.triggered[()].connect(self.__hgRecover) self.actions.append(self.hgRecoverAct) - self.hgIdentifyAct = E5Action(self.trUtf8('Identify'), - self.trUtf8('Identify...'), - 0, 0, self, 'mercurial_identify') + self.hgIdentifyAct = E5Action( + self.trUtf8('Identify'), + self.trUtf8('Identify...'), + 0, 0, self, 'mercurial_identify') self.hgIdentifyAct.setStatusTip(self.trUtf8( 'Identify the project directory' )) @@ -665,9 +700,10 @@ self.hgIdentifyAct.triggered[()].connect(self.__hgIdentify) self.actions.append(self.hgIdentifyAct) - self.hgCreateIgnoreAct = E5Action(self.trUtf8('Create .hgignore'), - self.trUtf8('Create .hgignore'), - 0, 0, self, 'mercurial_create ignore') + self.hgCreateIgnoreAct = E5Action( + self.trUtf8('Create .hgignore'), + self.trUtf8('Create .hgignore'), + 0, 0, self, 'mercurial_create ignore') self.hgCreateIgnoreAct.setStatusTip(self.trUtf8( 'Create a .hgignore file with default values' )) @@ -678,9 +714,10 @@ self.hgCreateIgnoreAct.triggered[()].connect(self.__hgCreateIgnore) self.actions.append(self.hgCreateIgnoreAct) - self.hgBundleAct = E5Action(self.trUtf8('Create changegroup'), - self.trUtf8('Create changegroup...'), - 0, 0, self, 'mercurial_bundle') + self.hgBundleAct = E5Action( + self.trUtf8('Create changegroup'), + self.trUtf8('Create changegroup...'), + 0, 0, self, 'mercurial_bundle') self.hgBundleAct.setStatusTip(self.trUtf8( 'Create changegroup file collecting changesets' )) @@ -692,9 +729,10 @@ self.hgBundleAct.triggered[()].connect(self.__hgBundle) self.actions.append(self.hgBundleAct) - self.hgPreviewBundleAct = E5Action(self.trUtf8('Preview changegroup'), - self.trUtf8('Preview changegroup...'), - 0, 0, self, 'mercurial_preview_bundle') + self.hgPreviewBundleAct = E5Action( + self.trUtf8('Preview changegroup'), + self.trUtf8('Preview changegroup...'), + 0, 0, self, 'mercurial_preview_bundle') self.hgPreviewBundleAct.setStatusTip(self.trUtf8( 'Preview a changegroup file containing a collection of changesets' )) @@ -721,9 +759,10 @@ self.hgIdentifyBundleAct.triggered[()].connect(self.__hgIdentifyBundle) self.actions.append(self.hgIdentifyBundleAct) - self.hgUnbundleAct = E5Action(self.trUtf8('Apply changegroups'), - self.trUtf8('Apply changegroups...'), - 0, 0, self, 'mercurial_unbundle') + self.hgUnbundleAct = E5Action( + self.trUtf8('Apply changegroups'), + self.trUtf8('Apply changegroups...'), + 0, 0, self, 'mercurial_unbundle') self.hgUnbundleAct.setStatusTip(self.trUtf8( 'Apply one or several changegroup files' )) @@ -735,9 +774,10 @@ self.hgUnbundleAct.triggered[()].connect(self.__hgUnbundle) self.actions.append(self.hgUnbundleAct) - self.hgBisectGoodAct = E5Action(self.trUtf8('Mark as "good"'), - self.trUtf8('Mark as "good"...'), - 0, 0, self, 'mercurial_bisect_good') + self.hgBisectGoodAct = E5Action( + self.trUtf8('Mark as "good"'), + self.trUtf8('Mark as "good"...'), + 0, 0, self, 'mercurial_bisect_good') self.hgBisectGoodAct.setStatusTip(self.trUtf8( 'Mark a selectable changeset as good' )) @@ -748,9 +788,10 @@ self.hgBisectGoodAct.triggered[()].connect(self.__hgBisectGood) self.actions.append(self.hgBisectGoodAct) - self.hgBisectBadAct = E5Action(self.trUtf8('Mark as "bad"'), - self.trUtf8('Mark as "bad"...'), - 0, 0, self, 'mercurial_bisect_bad') + self.hgBisectBadAct = E5Action( + self.trUtf8('Mark as "bad"'), + self.trUtf8('Mark as "bad"...'), + 0, 0, self, 'mercurial_bisect_bad') self.hgBisectBadAct.setStatusTip(self.trUtf8( 'Mark a selectable changeset as bad' )) @@ -761,9 +802,10 @@ self.hgBisectBadAct.triggered[()].connect(self.__hgBisectBad) self.actions.append(self.hgBisectBadAct) - self.hgBisectSkipAct = E5Action(self.trUtf8('Skip'), - self.trUtf8('Skip...'), - 0, 0, self, 'mercurial_bisect_skip') + self.hgBisectSkipAct = E5Action( + self.trUtf8('Skip'), + self.trUtf8('Skip...'), + 0, 0, self, 'mercurial_bisect_skip') self.hgBisectSkipAct.setStatusTip(self.trUtf8( 'Skip a selectable changeset' )) @@ -774,9 +816,10 @@ self.hgBisectSkipAct.triggered[()].connect(self.__hgBisectSkip) self.actions.append(self.hgBisectSkipAct) - self.hgBisectResetAct = E5Action(self.trUtf8('Reset'), - self.trUtf8('Reset'), - 0, 0, self, 'mercurial_bisect_reset') + self.hgBisectResetAct = E5Action( + self.trUtf8('Reset'), + self.trUtf8('Reset'), + 0, 0, self, 'mercurial_bisect_reset') self.hgBisectResetAct.setStatusTip(self.trUtf8( 'Reset the bisect search data' )) @@ -787,9 +830,10 @@ self.hgBisectResetAct.triggered[()].connect(self.__hgBisectReset) self.actions.append(self.hgBisectResetAct) - self.hgBackoutAct = E5Action(self.trUtf8('Back out changeset'), - self.trUtf8('Back out changeset'), - 0, 0, self, 'mercurial_backout') + self.hgBackoutAct = E5Action( + self.trUtf8('Back out changeset'), + self.trUtf8('Back out changeset'), + 0, 0, self, 'mercurial_backout') self.hgBackoutAct.setStatusTip(self.trUtf8( 'Back out changes of an earlier changeset' )) @@ -800,9 +844,10 @@ self.hgBackoutAct.triggered[()].connect(self.__hgBackout) self.actions.append(self.hgBackoutAct) - self.hgRollbackAct = E5Action(self.trUtf8('Rollback last transaction'), - self.trUtf8('Rollback last transaction'), - 0, 0, self, 'mercurial_rollback') + self.hgRollbackAct = E5Action( + self.trUtf8('Rollback last transaction'), + self.trUtf8('Rollback last transaction'), + 0, 0, self, 'mercurial_rollback') self.hgRollbackAct.setStatusTip(self.trUtf8( 'Rollback the last transaction' )) @@ -826,9 +871,10 @@ self.hgRollbackAct.triggered[()].connect(self.__hgRollback) self.actions.append(self.hgRollbackAct) - self.hgServeAct = E5Action(self.trUtf8('Serve project repository'), - self.trUtf8('Serve project repository...'), - 0, 0, self, 'mercurial_serve') + self.hgServeAct = E5Action( + self.trUtf8('Serve project repository'), + self.trUtf8('Serve project repository...'), + 0, 0, self, 'mercurial_serve') self.hgServeAct.setStatusTip(self.trUtf8( 'Serve the project repository' )) @@ -839,9 +885,10 @@ self.hgServeAct.triggered[()].connect(self.__hgServe) self.actions.append(self.hgServeAct) - self.hgImportAct = E5Action(self.trUtf8('Import Patch'), - self.trUtf8('Import Patch...'), - 0, 0, self, 'mercurial_import') + self.hgImportAct = E5Action( + self.trUtf8('Import Patch'), + self.trUtf8('Import Patch...'), + 0, 0, self, 'mercurial_import') self.hgImportAct.setStatusTip(self.trUtf8( 'Import a patch from a patch file' )) @@ -853,9 +900,10 @@ self.hgImportAct.triggered[()].connect(self.__hgImport) self.actions.append(self.hgImportAct) - self.hgExportAct = E5Action(self.trUtf8('Export Patches'), - self.trUtf8('Export Patches...'), - 0, 0, self, 'mercurial_export') + self.hgExportAct = E5Action( + self.trUtf8('Export Patches'), + self.trUtf8('Export Patches...'), + 0, 0, self, 'mercurial_export') self.hgExportAct.setStatusTip(self.trUtf8( 'Export revisions to patch files' )) @@ -866,9 +914,10 @@ self.hgExportAct.triggered[()].connect(self.__hgExport) self.actions.append(self.hgExportAct) - self.hgPhaseAct = E5Action(self.trUtf8('Change Phase'), - self.trUtf8('Change Phase...'), - 0, 0, self, 'mercurial_change_phase') + self.hgPhaseAct = E5Action( + self.trUtf8('Change Phase'), + self.trUtf8('Change Phase...'), + 0, 0, self, 'mercurial_change_phase') self.hgPhaseAct.setStatusTip(self.trUtf8( 'Change the phase of revisions' )) @@ -879,10 +928,11 @@ self.hgPhaseAct.triggered[()].connect(self.__hgPhase) self.actions.append(self.hgPhaseAct) - self.hgGraftAct = E5Action(self.trUtf8('Copy Changesets'), - UI.PixmapCache.getIcon("vcsGraft.png"), - self.trUtf8('Copy Changesets'), - 0, 0, self, 'mercurial_graft') + self.hgGraftAct = E5Action( + self.trUtf8('Copy Changesets'), + UI.PixmapCache.getIcon("vcsGraft.png"), + self.trUtf8('Copy Changesets'), + 0, 0, self, 'mercurial_graft') self.hgGraftAct.setStatusTip(self.trUtf8( 'Copies changesets from another branch' )) @@ -896,9 +946,9 @@ self.actions.append(self.hgGraftAct) self.hgGraftContinueAct = E5Action( - self.trUtf8('Continue Copying Session'), - self.trUtf8('Continue Copying Session'), - 0, 0, self, 'mercurial_graft_continue') + self.trUtf8('Continue Copying Session'), + self.trUtf8('Continue Copying Session'), + 0, 0, self, 'mercurial_graft_continue') self.hgGraftContinueAct.setStatusTip(self.trUtf8( 'Continue the last copying session after conflicts were resolved' )) @@ -911,10 +961,10 @@ self.actions.append(self.hgGraftContinueAct) self.hgAddSubrepoAct = E5Action( - self.trUtf8('Add'), - UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add...'), - 0, 0, self, 'mercurial_add_subrepo') + self.trUtf8('Add'), + UI.PixmapCache.getIcon("vcsAdd.png"), + self.trUtf8('Add...'), + 0, 0, self, 'mercurial_add_subrepo') self.hgAddSubrepoAct.setStatusTip(self.trUtf8( 'Add a sub-repository' )) @@ -926,10 +976,10 @@ self.actions.append(self.hgAddSubrepoAct) self.hgRemoveSubreposAct = E5Action( - self.trUtf8('Remove'), - UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove...'), - 0, 0, self, 'mercurial_remove_subrepos') + self.trUtf8('Remove'), + UI.PixmapCache.getIcon("vcsRemove.png"), + self.trUtf8('Remove...'), + 0, 0, self, 'mercurial_remove_subrepos') self.hgRemoveSubreposAct.setStatusTip(self.trUtf8( 'Remove sub-repositories' )) @@ -941,10 +991,11 @@ self.__hgRemoveSubrepositories) self.actions.append(self.hgRemoveSubreposAct) - self.hgArchiveAct = E5Action(self.trUtf8('Create unversioned archive'), - UI.PixmapCache.getIcon("vcsExport.png"), - self.trUtf8('Create unversioned archive...'), - 0, 0, self, 'mercurial_archive') + self.hgArchiveAct = E5Action( + self.trUtf8('Create unversioned archive'), + UI.PixmapCache.getIcon("vcsExport.png"), + self.trUtf8('Create unversioned archive...'), + 0, 0, self, 'mercurial_archive') self.hgArchiveAct.setStatusTip(self.trUtf8( 'Create an unversioned archive from the repository' ))
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -30,10 +30,11 @@ """ Public method to generate the action objects. """ - self.hgPurgeAct = E5Action(self.trUtf8('Purge Files'), - UI.PixmapCache.getIcon("fileDelete.png"), - self.trUtf8('Purge Files'), - 0, 0, self, 'mercurial_purge') + self.hgPurgeAct = E5Action( + self.trUtf8('Purge Files'), + UI.PixmapCache.getIcon("fileDelete.png"), + self.trUtf8('Purge Files'), + 0, 0, self, 'mercurial_purge') self.hgPurgeAct.setStatusTip(self.trUtf8( 'Delete files and directories not known to Mercurial' )) @@ -49,9 +50,10 @@ self.hgPurgeAct.triggered[()].connect(self.__hgPurge) self.actions.append(self.hgPurgeAct) - self.hgPurgeAllAct = E5Action(self.trUtf8('Purge All Files'), - self.trUtf8('Purge All Files'), - 0, 0, self, 'mercurial_purge_all') + self.hgPurgeAllAct = E5Action( + self.trUtf8('Purge All Files'), + self.trUtf8('Purge All Files'), + 0, 0, self, 'mercurial_purge_all') self.hgPurgeAllAct.setStatusTip(self.trUtf8( 'Delete files and directories not known to Mercurial including' ' ignored ones' @@ -69,10 +71,11 @@ self.hgPurgeAllAct.triggered[()].connect(self.__hgPurgeAll) self.actions.append(self.hgPurgeAllAct) - self.hgPurgeListAct = E5Action(self.trUtf8('List Files to be Purged'), - UI.PixmapCache.getIcon("fileDeleteList.png"), - self.trUtf8('List Files to be Purged...'), - 0, 0, self, 'mercurial_purge_list') + self.hgPurgeListAct = E5Action( + self.trUtf8('List Files to be Purged'), + UI.PixmapCache.getIcon("fileDeleteList.png"), + self.trUtf8('List Files to be Purged...'), + 0, 0, self, 'mercurial_purge_list') self.hgPurgeListAct.setStatusTip(self.trUtf8( 'List files and directories not known to Mercurial' ))
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -90,8 +90,8 @@ self.inputGroup.setEnabled(False) self.inputGroup.hide() - out, err = self.__hgClient.runcommand(args, - output=self.__showOutput, error=self.__showError) + out, err = self.__hgClient.runcommand( + args, output=self.__showOutput, error=self.__showError) if err: self.__showError(err) if out:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -262,7 +262,8 @@ """ Private method to resort the tree. """ - self.patchesList.sortItems(self.patchesList.sortColumn(), + self.patchesList.sortItems( + self.patchesList.sortColumn(), self.patchesList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Tue Oct 15 18:54:53 2013 +0200 @@ -127,4 +127,4 @@ self.currentDateCheckBox.isChecked(), self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) return (self.nameEdit.text(), self.messageEdit.toPlainText(), - userData, dateData) + userData, dateData)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -31,9 +31,10 @@ """ Public method to generate the action objects. """ - self.hgQueueInitAct = E5Action(self.trUtf8('Init Queue Repository'), - self.trUtf8('Init Queue Repository'), - 0, 0, self, 'mercurial_queues_init') + self.hgQueueInitAct = E5Action( + self.trUtf8('Init Queue Repository'), + self.trUtf8('Init Queue Repository'), + 0, 0, self, 'mercurial_queues_init') self.hgQueueInitAct.setStatusTip(self.trUtf8( 'Initialize a new versioned queue repository' )) @@ -46,9 +47,9 @@ self.actions.append(self.hgQueueInitAct) self.hgQueueCommitAct = E5Action( - self.trUtf8('Commit changes'), - self.trUtf8('Commit changes...'), - 0, 0, self, 'mercurial_queues_commit') + self.trUtf8('Commit changes'), + self.trUtf8('Commit changes...'), + 0, 0, self, 'mercurial_queues_commit') self.hgQueueCommitAct.setStatusTip(self.trUtf8( 'Commit changes in the queue repository' )) @@ -59,9 +60,10 @@ self.hgQueueCommitAct.triggered[()].connect(self.__hgQueueCommit) self.actions.append(self.hgQueueCommitAct) - self.hgQueueNewAct = E5Action(self.trUtf8('New Patch'), - self.trUtf8('New Patch...'), - 0, 0, self, 'mercurial_queues_new') + self.hgQueueNewAct = E5Action( + self.trUtf8('New Patch'), + self.trUtf8('New Patch...'), + 0, 0, self, 'mercurial_queues_new') self.hgQueueNewAct.setStatusTip(self.trUtf8( 'Create a new patch' )) @@ -72,9 +74,10 @@ self.hgQueueNewAct.triggered[()].connect(self.__hgQueueNewPatch) self.actions.append(self.hgQueueNewAct) - self.hgQueueRefreshAct = E5Action(self.trUtf8('Update Current Patch'), - self.trUtf8('Update Current Patch'), - 0, 0, self, 'mercurial_queues_refresh') + self.hgQueueRefreshAct = E5Action( + self.trUtf8('Update Current Patch'), + self.trUtf8('Update Current Patch'), + 0, 0, self, 'mercurial_queues_refresh') self.hgQueueRefreshAct.setStatusTip(self.trUtf8( 'Update the current patch' )) @@ -87,9 +90,9 @@ self.actions.append(self.hgQueueRefreshAct) self.hgQueueRefreshMessageAct = E5Action( - self.trUtf8('Update Current Patch (with Message)'), - self.trUtf8('Update Current Patch (with Message)'), - 0, 0, self, 'mercurial_queues_refresh_message') + self.trUtf8('Update Current Patch (with Message)'), + self.trUtf8('Update Current Patch (with Message)'), + 0, 0, self, 'mercurial_queues_refresh_message') self.hgQueueRefreshMessageAct.setStatusTip(self.trUtf8( 'Update the current patch and edit commit message' )) @@ -102,9 +105,10 @@ self.__hgQueueRefreshPatchMessage) self.actions.append(self.hgQueueRefreshMessageAct) - self.hgQueueDiffAct = E5Action(self.trUtf8('Show Current Patch'), - self.trUtf8('Show Current Patch...'), - 0, 0, self, 'mercurial_queues_show') + self.hgQueueDiffAct = E5Action( + self.trUtf8('Show Current Patch'), + self.trUtf8('Show Current Patch...'), + 0, 0, self, 'mercurial_queues_show') self.hgQueueDiffAct.setStatusTip(self.trUtf8( 'Show the contents the current patch' )) @@ -117,9 +121,10 @@ self.hgQueueDiffAct.triggered[()].connect(self.__hgQueueShowPatch) self.actions.append(self.hgQueueDiffAct) - self.hgQueueHeaderAct = E5Action(self.trUtf8('Show Current Message'), - self.trUtf8('Show Current Message...'), - 0, 0, self, 'mercurial_queues_show_message') + self.hgQueueHeaderAct = E5Action( + self.trUtf8('Show Current Message'), + self.trUtf8('Show Current Message...'), + 0, 0, self, 'mercurial_queues_show_message') self.hgQueueHeaderAct.setStatusTip(self.trUtf8( 'Show the commit message of the current patch' )) @@ -130,9 +135,10 @@ self.hgQueueHeaderAct.triggered[()].connect(self.__hgQueueShowHeader) self.actions.append(self.hgQueueHeaderAct) - self.hgQueueListAct = E5Action(self.trUtf8('List Patches'), - self.trUtf8('List Patches...'), - 0, 0, self, 'mercurial_queues_list') + self.hgQueueListAct = E5Action( + self.trUtf8('List Patches'), + self.trUtf8('List Patches...'), + 0, 0, self, 'mercurial_queues_list') self.hgQueueListAct.setStatusTip(self.trUtf8( 'List applied and unapplied patches' )) @@ -143,9 +149,10 @@ self.hgQueueListAct.triggered[()].connect(self.__hgQueueListPatches) self.actions.append(self.hgQueueListAct) - self.hgQueueFinishAct = E5Action(self.trUtf8('Finish Applied Patches'), - self.trUtf8('Finish Applied Patches'), - 0, 0, self, 'mercurial_queues_finish_applied') + self.hgQueueFinishAct = E5Action( + self.trUtf8('Finish Applied Patches'), + self.trUtf8('Finish Applied Patches'), + 0, 0, self, 'mercurial_queues_finish_applied') self.hgQueueFinishAct.setStatusTip(self.trUtf8( 'Finish applied patches' )) @@ -158,9 +165,10 @@ self.__hgQueueFinishAppliedPatches) self.actions.append(self.hgQueueFinishAct) - self.hgQueueRenameAct = E5Action(self.trUtf8('Rename Patch'), - self.trUtf8('Rename Patch'), - 0, 0, self, 'mercurial_queues_rename') + self.hgQueueRenameAct = E5Action( + self.trUtf8('Rename Patch'), + self.trUtf8('Rename Patch'), + 0, 0, self, 'mercurial_queues_rename') self.hgQueueRenameAct.setStatusTip(self.trUtf8( 'Rename a patch' )) @@ -171,9 +179,10 @@ self.hgQueueRenameAct.triggered[()].connect(self.__hgQueueRenamePatch) self.actions.append(self.hgQueueRenameAct) - self.hgQueueDeleteAct = E5Action(self.trUtf8('Delete Patch'), - self.trUtf8('Delete Patch'), - 0, 0, self, 'mercurial_queues_delete') + self.hgQueueDeleteAct = E5Action( + self.trUtf8('Delete Patch'), + self.trUtf8('Delete Patch'), + 0, 0, self, 'mercurial_queues_delete') self.hgQueueDeleteAct.setStatusTip(self.trUtf8( 'Delete unapplied patch' )) @@ -184,9 +193,10 @@ self.hgQueueDeleteAct.triggered[()].connect(self.__hgQueueDeletePatch) self.actions.append(self.hgQueueDeleteAct) - self.hgQueueFoldAct = E5Action(self.trUtf8('Fold Patches'), - self.trUtf8('Fold Patches'), - 0, 0, self, 'mercurial_queues_fold') + self.hgQueueFoldAct = E5Action( + self.trUtf8('Fold Patches'), + self.trUtf8('Fold Patches'), + 0, 0, self, 'mercurial_queues_fold') self.hgQueueFoldAct.setStatusTip(self.trUtf8( 'Fold unapplied patches into the current patch' )) @@ -198,9 +208,10 @@ self.__hgQueueFoldUnappliedPatches) self.actions.append(self.hgQueueFoldAct) - self.hgQueueStatusAct = E5Action(self.trUtf8('Show Status'), - self.trUtf8('Show &Status...'), - 0, 0, self, 'mercurial_queues_status') + self.hgQueueStatusAct = E5Action( + self.trUtf8('Show Status'), + self.trUtf8('Show &Status...'), + 0, 0, self, 'mercurial_queues_status') self.hgQueueStatusAct.setStatusTip(self.trUtf8( 'Show the status of the queue repository' )) @@ -220,9 +231,10 @@ """ Public method to generate the push and pop action objects. """ - self.hgQueuePushAct = E5Action(self.trUtf8('Push Next Patch'), - self.trUtf8('Push Next Patch'), - 0, 0, self, 'mercurial_queues_push_next') + self.hgQueuePushAct = E5Action( + self.trUtf8('Push Next Patch'), + self.trUtf8('Push Next Patch'), + 0, 0, self, 'mercurial_queues_push_next') self.hgQueuePushAct.setStatusTip(self.trUtf8( 'Push the next patch onto the stack' )) @@ -234,9 +246,10 @@ self.hgQueuePushAct.triggered[()].connect(self.__hgQueuePushPatch) self.actions.append(self.hgQueuePushAct) - self.hgQueuePushAllAct = E5Action(self.trUtf8('Push All Patches'), - self.trUtf8('Push All Patches'), - 0, 0, self, 'mercurial_queues_push_all') + self.hgQueuePushAllAct = E5Action( + self.trUtf8('Push All Patches'), + self.trUtf8('Push All Patches'), + 0, 0, self, 'mercurial_queues_push_all') self.hgQueuePushAllAct.setStatusTip(self.trUtf8( 'Push all patches onto the stack' )) @@ -249,9 +262,10 @@ self.__hgQueuePushAllPatches) self.actions.append(self.hgQueuePushAllAct) - self.hgQueuePushUntilAct = E5Action(self.trUtf8('Push Patches'), - self.trUtf8('Push Patches'), - 0, 0, self, 'mercurial_queues_push_until') + self.hgQueuePushUntilAct = E5Action( + self.trUtf8('Push Patches'), + self.trUtf8('Push Patches'), + 0, 0, self, 'mercurial_queues_push_until') self.hgQueuePushUntilAct.setStatusTip(self.trUtf8( 'Push patches onto the stack' )) @@ -264,9 +278,10 @@ self.__hgQueuePushPatches) self.actions.append(self.hgQueuePushUntilAct) - self.hgQueuePopAct = E5Action(self.trUtf8('Pop Current Patch'), - self.trUtf8('Pop Current Patch'), - 0, 0, self, 'mercurial_queues_pop_current') + self.hgQueuePopAct = E5Action( + self.trUtf8('Pop Current Patch'), + self.trUtf8('Pop Current Patch'), + 0, 0, self, 'mercurial_queues_pop_current') self.hgQueuePopAct.setStatusTip(self.trUtf8( 'Pop the current patch off the stack' )) @@ -278,9 +293,10 @@ self.hgQueuePopAct.triggered[()].connect(self.__hgQueuePopPatch) self.actions.append(self.hgQueuePopAct) - self.hgQueuePopAllAct = E5Action(self.trUtf8('Pop All Patches'), - self.trUtf8('Pop All Patches'), - 0, 0, self, 'mercurial_queues_pop_all') + self.hgQueuePopAllAct = E5Action( + self.trUtf8('Pop All Patches'), + self.trUtf8('Pop All Patches'), + 0, 0, self, 'mercurial_queues_pop_all') self.hgQueuePopAllAct.setStatusTip(self.trUtf8( 'Pop all patches off the stack' )) @@ -293,9 +309,10 @@ self.__hgQueuePopAllPatches) self.actions.append(self.hgQueuePopAllAct) - self.hgQueuePopUntilAct = E5Action(self.trUtf8('Pop Patches'), - self.trUtf8('Pop Patches'), - 0, 0, self, 'mercurial_queues_pop_until') + self.hgQueuePopUntilAct = E5Action( + self.trUtf8('Pop Patches'), + self.trUtf8('Pop Patches'), + 0, 0, self, 'mercurial_queues_pop_until') self.hgQueuePopUntilAct.setStatusTip(self.trUtf8( 'Pop patches off the stack' )) @@ -307,9 +324,10 @@ self.hgQueuePopUntilAct.triggered[()].connect(self.__hgQueuePopPatches) self.actions.append(self.hgQueuePopUntilAct) - self.hgQueueGotoAct = E5Action(self.trUtf8('Go to Patch'), - self.trUtf8('Go to Patch'), - 0, 0, self, 'mercurial_queues_goto') + self.hgQueueGotoAct = E5Action( + self.trUtf8('Go to Patch'), + self.trUtf8('Go to Patch'), + 0, 0, self, 'mercurial_queues_goto') self.hgQueueGotoAct.setStatusTip(self.trUtf8( 'Push or pop patches until named patch is at top of stack' )) @@ -325,9 +343,10 @@ """ Public method to generate the push and pop (force) action objects. """ - self.hgQueuePushForceAct = E5Action(self.trUtf8('Push Next Patch'), - self.trUtf8('Push Next Patch'), - 0, 0, self, 'mercurial_queues_push_next_force') + self.hgQueuePushForceAct = E5Action( + self.trUtf8('Push Next Patch'), + self.trUtf8('Push Next Patch'), + 0, 0, self, 'mercurial_queues_push_next_force') self.hgQueuePushForceAct.setStatusTip(self.trUtf8( 'Push the next patch onto the stack on top of local changes' )) @@ -340,9 +359,10 @@ self.__hgQueuePushPatchForced) self.actions.append(self.hgQueuePushForceAct) - self.hgQueuePushAllForceAct = E5Action(self.trUtf8('Push All Patches'), - self.trUtf8('Push All Patches'), - 0, 0, self, 'mercurial_queues_push_all_force') + self.hgQueuePushAllForceAct = E5Action( + self.trUtf8('Push All Patches'), + self.trUtf8('Push All Patches'), + 0, 0, self, 'mercurial_queues_push_all_force') self.hgQueuePushAllForceAct.setStatusTip(self.trUtf8( 'Push all patches onto the stack on top of local changes' )) @@ -355,9 +375,10 @@ self.__hgQueuePushAllPatchesForced) self.actions.append(self.hgQueuePushAllForceAct) - self.hgQueuePushUntilForceAct = E5Action(self.trUtf8('Push Patches'), - self.trUtf8('Push Patches'), - 0, 0, self, 'mercurial_queues_push_until_force') + self.hgQueuePushUntilForceAct = E5Action( + self.trUtf8('Push Patches'), + self.trUtf8('Push Patches'), + 0, 0, self, 'mercurial_queues_push_until_force') self.hgQueuePushUntilForceAct.setStatusTip(self.trUtf8( 'Push patches onto the stack on top of local changes' )) @@ -371,9 +392,10 @@ self.__hgQueuePushPatchesForced) self.actions.append(self.hgQueuePushUntilForceAct) - self.hgQueuePopForceAct = E5Action(self.trUtf8('Pop Current Patch'), - self.trUtf8('Pop Current Patch'), - 0, 0, self, 'mercurial_queues_pop_current_force') + self.hgQueuePopForceAct = E5Action( + self.trUtf8('Pop Current Patch'), + self.trUtf8('Pop Current Patch'), + 0, 0, self, 'mercurial_queues_pop_current_force') self.hgQueuePopForceAct.setStatusTip(self.trUtf8( 'Pop the current patch off the stack forgetting local changes' )) @@ -387,9 +409,10 @@ self.__hgQueuePopPatchForced) self.actions.append(self.hgQueuePopForceAct) - self.hgQueuePopAllForceAct = E5Action(self.trUtf8('Pop All Patches'), - self.trUtf8('Pop All Patches'), - 0, 0, self, 'mercurial_queues_pop_all_force') + self.hgQueuePopAllForceAct = E5Action( + self.trUtf8('Pop All Patches'), + self.trUtf8('Pop All Patches'), + 0, 0, self, 'mercurial_queues_pop_all_force') self.hgQueuePopAllForceAct.setStatusTip(self.trUtf8( 'Pop all patches off the stack forgetting local changes' )) @@ -402,9 +425,10 @@ self.__hgQueuePopAllPatchesForced) self.actions.append(self.hgQueuePopAllForceAct) - self.hgQueuePopUntilForceAct = E5Action(self.trUtf8('Pop Patches'), - self.trUtf8('Pop Patches'), - 0, 0, self, 'mercurial_queues_pop_until_force') + self.hgQueuePopUntilForceAct = E5Action( + self.trUtf8('Pop Patches'), + self.trUtf8('Pop Patches'), + 0, 0, self, 'mercurial_queues_pop_until_force') self.hgQueuePopUntilForceAct.setStatusTip(self.trUtf8( 'Pop patches off the stack forgetting local changes' )) @@ -418,9 +442,10 @@ self.__hgQueuePopPatchesForced) self.actions.append(self.hgQueuePopUntilForceAct) - self.hgQueueGotoForceAct = E5Action(self.trUtf8('Go to Patch'), - self.trUtf8('Go to Patch'), - 0, 0, self, 'mercurial_queues_goto_force') + self.hgQueueGotoForceAct = E5Action( + self.trUtf8('Go to Patch'), + self.trUtf8('Go to Patch'), + 0, 0, self, 'mercurial_queues_goto_force') self.hgQueueGotoForceAct.setStatusTip(self.trUtf8( 'Push or pop patches until named patch is at top of stack' ' overwriting any local changes' @@ -438,9 +463,10 @@ """ Public method to generate the guards action objects. """ - self.hgQueueDefineGuardsAct = E5Action(self.trUtf8('Define Guards'), - self.trUtf8('Define Guards...'), - 0, 0, self, 'mercurial_queues_guards_define') + self.hgQueueDefineGuardsAct = E5Action( + self.trUtf8('Define Guards'), + self.trUtf8('Define Guards...'), + 0, 0, self, 'mercurial_queues_guards_define') self.hgQueueDefineGuardsAct.setStatusTip(self.trUtf8( 'Define guards for the current or a named patch' )) @@ -453,9 +479,10 @@ self.__hgQueueGuardsDefine) self.actions.append(self.hgQueueDefineGuardsAct) - self.hgQueueDropAllGuardsAct = E5Action(self.trUtf8('Drop All Guards'), - self.trUtf8('Drop All Guards...'), - 0, 0, self, 'mercurial_queues_guards_drop_all') + self.hgQueueDropAllGuardsAct = E5Action( + self.trUtf8('Drop All Guards'), + self.trUtf8('Drop All Guards...'), + 0, 0, self, 'mercurial_queues_guards_drop_all') self.hgQueueDropAllGuardsAct.setStatusTip(self.trUtf8( 'Drop all guards of the current or a named patch' )) @@ -467,9 +494,10 @@ self.__hgQueueGuardsDropAll) self.actions.append(self.hgQueueDropAllGuardsAct) - self.hgQueueListGuardsAct = E5Action(self.trUtf8('List Guards'), - self.trUtf8('List Guards...'), - 0, 0, self, 'mercurial_queues_guards_list') + self.hgQueueListGuardsAct = E5Action( + self.trUtf8('List Guards'), + self.trUtf8('List Guards...'), + 0, 0, self, 'mercurial_queues_guards_list') self.hgQueueListGuardsAct.setStatusTip(self.trUtf8( 'List guards of the current or a named patch' )) @@ -481,9 +509,10 @@ self.__hgQueueGuardsList) self.actions.append(self.hgQueueListGuardsAct) - self.hgQueueListAllGuardsAct = E5Action(self.trUtf8('List All Guards'), - self.trUtf8('List All Guards...'), - 0, 0, self, 'mercurial_queues_guards_list_all') + self.hgQueueListAllGuardsAct = E5Action( + self.trUtf8('List All Guards'), + self.trUtf8('List All Guards...'), + 0, 0, self, 'mercurial_queues_guards_list_all') self.hgQueueListAllGuardsAct.setStatusTip(self.trUtf8( 'List all guards of all patches' )) @@ -526,9 +555,9 @@ self.actions.append(self.hgQueueDeactivateGuardsAct) self.hgQueueIdentifyActiveGuardsAct = E5Action( - self.trUtf8('Identify Active Guards'), - self.trUtf8('Identify Active Guards...'), - 0, 0, self, 'mercurial_queues_guards_identify_active') + self.trUtf8('Identify Active Guards'), + self.trUtf8('Identify Active Guards...'), + 0, 0, self, 'mercurial_queues_guards_identify_active') self.hgQueueIdentifyActiveGuardsAct.setStatusTip(self.trUtf8( 'Show a list of active guards' )) @@ -544,9 +573,10 @@ """ Public method to generate the queues management action objects. """ - self.hgQueueCreateQueueAct = E5Action(self.trUtf8('Create Queue'), - self.trUtf8('Create Queue'), - 0, 0, self, 'mercurial_queues_create_queue') + self.hgQueueCreateQueueAct = E5Action( + self.trUtf8('Create Queue'), + self.trUtf8('Create Queue'), + 0, 0, self, 'mercurial_queues_create_queue') self.hgQueueCreateQueueAct.setStatusTip(self.trUtf8( 'Create a new patch queue' )) @@ -558,9 +588,10 @@ self.__hgQueueCreateQueue) self.actions.append(self.hgQueueCreateQueueAct) - self.hgQueueRenameQueueAct = E5Action(self.trUtf8('Rename Queue'), - self.trUtf8('Rename Queue'), - 0, 0, self, 'mercurial_queues_rename_queue') + self.hgQueueRenameQueueAct = E5Action( + self.trUtf8('Rename Queue'), + self.trUtf8('Rename Queue'), + 0, 0, self, 'mercurial_queues_rename_queue') self.hgQueueRenameQueueAct.setStatusTip(self.trUtf8( 'Rename the active patch queue' )) @@ -572,9 +603,10 @@ self.__hgQueueRenameQueue) self.actions.append(self.hgQueueRenameQueueAct) - self.hgQueueDeleteQueueAct = E5Action(self.trUtf8('Delete Queue'), - self.trUtf8('Delete Queue'), - 0, 0, self, 'mercurial_queues_delete_queue') + self.hgQueueDeleteQueueAct = E5Action( + self.trUtf8('Delete Queue'), + self.trUtf8('Delete Queue'), + 0, 0, self, 'mercurial_queues_delete_queue') self.hgQueueDeleteQueueAct.setStatusTip(self.trUtf8( 'Delete the reference to a patch queue' )) @@ -586,9 +618,10 @@ self.__hgQueueDeleteQueue) self.actions.append(self.hgQueueDeleteQueueAct) - self.hgQueuePurgeQueueAct = E5Action(self.trUtf8('Purge Queue'), - self.trUtf8('Purge Queue'), - 0, 0, self, 'mercurial_queues_purge_queue') + self.hgQueuePurgeQueueAct = E5Action( + self.trUtf8('Purge Queue'), + self.trUtf8('Purge Queue'), + 0, 0, self, 'mercurial_queues_purge_queue') self.hgQueuePurgeQueueAct.setStatusTip(self.trUtf8( 'Delete the reference to a patch queue and remove the patch' ' directory' @@ -602,9 +635,10 @@ self.__hgQueuePurgeQueue) self.actions.append(self.hgQueuePurgeQueueAct) - self.hgQueueActivateQueueAct = E5Action(self.trUtf8('Activate Queue'), - self.trUtf8('Activate Queue'), - 0, 0, self, 'mercurial_queues_activate_queue') + self.hgQueueActivateQueueAct = E5Action( + self.trUtf8('Activate Queue'), + self.trUtf8('Activate Queue'), + 0, 0, self, 'mercurial_queues_activate_queue') self.hgQueueActivateQueueAct.setStatusTip(self.trUtf8( 'Set the active queue' )) @@ -616,9 +650,10 @@ self.__hgQueueActivateQueue) self.actions.append(self.hgQueueActivateQueueAct) - self.hgQueueListQueuesAct = E5Action(self.trUtf8('List Queues'), - self.trUtf8('List Queues...'), - 0, 0, self, 'mercurial_queues_list_queues') + self.hgQueueListQueuesAct = E5Action( + self.trUtf8('List Queues'), + self.trUtf8('List Queues...'), + 0, 0, self, 'mercurial_queues_list_queues') self.hgQueueListQueuesAct.setStatusTip(self.trUtf8( 'List the available queues' )) @@ -791,109 +826,123 @@ """ Private slot used to push the next patch onto the stack. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=False, named=False) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=False, named=False) def __hgQueuePushPatchForced(self): """ Private slot used to push the next patch onto the stack on top of local changes. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=False, named=False, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=False, named=False, force=True) def __hgQueuePushAllPatches(self): """ Private slot used to push all patches onto the stack. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=True, named=False) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=True, named=False) def __hgQueuePushAllPatchesForced(self): """ Private slot used to push all patches onto the stack on top of local changes. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=True, named=False, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=True, named=False, force=True) def __hgQueuePushPatches(self): """ Private slot used to push patches onto the stack until a named one is at the top. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=False, named=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=False, named=True) def __hgQueuePushPatchesForced(self): """ Private slot used to push patches onto the stack until a named one is at the top on top of local changes. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.PUSH, all=False, named=True, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.PUSH, all=False, named=True, force=True) def __hgQueuePopPatch(self): """ Private slot used to pop the current patch off the stack. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=False, named=False) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=False, named=False) def __hgQueuePopPatchForced(self): """ Private slot used to pop the current patch off the stack forgetting any local changes to patched files. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=False, named=False, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=False, named=False, force=True) def __hgQueuePopAllPatches(self): """ Private slot used to pop all patches off the stack. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=True, named=False) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=True, named=False) def __hgQueuePopAllPatchesForced(self): """ Private slot used to pop all patches off the stack forgetting any local changes to patched files. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=True, named=False, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=True, named=False, force=True) def __hgQueuePopPatches(self): """ Private slot used to pop patches off the stack until a named one is at the top. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=False, named=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=False, named=True) def __hgQueuePopPatchesForced(self): """ Private slot used to pop patches off the stack until a named one is at the top forgetting any local changes to patched files. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.POP, all=False, named=True, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.POP, all=False, named=True, force=True) def __hgQueueGotoPatch(self): """ Private slot used to push or pop patches until the a named one is at the top of the stack. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.GOTO, all=False, named=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.GOTO, all=False, named=True) def __hgQueueGotoPatchForced(self): """ Private slot used to push or pop patches until the a named one is at the top of the stack overwriting local changes. """ - self.__hgQueuePushPopPatches(self.project.getProjectPath(), - operation=Queues.GOTO, all=False, named=True, force=True) + self.__hgQueuePushPopPatches( + self.project.getProjectPath(), + operation=Queues.GOTO, all=False, named=True, force=True) def __hgQueueListPatches(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -31,10 +31,11 @@ """ Public method to generate the action objects. """ - self.hgRebaseAct = E5Action(self.trUtf8('Rebase Changesets'), - UI.PixmapCache.getIcon("vcsRebase.png"), - self.trUtf8('Rebase Changesets'), - 0, 0, self, 'mercurial_rebase') + self.hgRebaseAct = E5Action( + self.trUtf8('Rebase Changesets'), + UI.PixmapCache.getIcon("vcsRebase.png"), + self.trUtf8('Rebase Changesets'), + 0, 0, self, 'mercurial_rebase') self.hgRebaseAct.setStatusTip(self.trUtf8( 'Rebase changesets to another branch' ))
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Tue Oct 15 18:54:53 2013 +0200 @@ -45,10 +45,11 @@ """ Public method to generate the action objects. """ - self.hgTransplantAct = E5Action(self.trUtf8('Transplant Changesets'), - UI.PixmapCache.getIcon("vcsTransplant.png"), - self.trUtf8('Transplant Changesets'), - 0, 0, self, 'mercurial_transplant') + self.hgTransplantAct = E5Action( + self.trUtf8('Transplant Changesets'), + UI.PixmapCache.getIcon("vcsTransplant.png"), + self.trUtf8('Transplant Changesets'), + 0, 0, self, 'mercurial_transplant') self.hgTransplantAct.setStatusTip(self.trUtf8( 'Transplant changesets from another branch' ))
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 15 18:29:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 15 18:54:53 2013 +0200 @@ -957,7 +957,8 @@ if names[0]: from UI.DeleteFilesConfirmationDialog import \ DeleteFilesConfirmationDialog - dlg = DeleteFilesConfirmationDialog(self.parent(), + dlg = DeleteFilesConfirmationDialog( + self.parent(), self.trUtf8("Revert changes"), self.trUtf8( "Do you really want to revert all changes to these files" @@ -1175,8 +1176,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: @@ -1337,7 +1338,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: output, error = self.__client.runcommand(args) @@ -1351,23 +1353,28 @@ line.split("@@@") cdate, ctime = date.split()[:2] info = [] - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\ .format(index, changeset)) if tags: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(tags.split()))) if bookmarks: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(bookmarks.split()))) if branches: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(branches.split()))) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\ @@ -1391,7 +1398,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: output, error = self.__client.runcommand(args) @@ -1401,7 +1409,8 @@ else: url = "" - return QApplication.translate('mercurial', + return QApplication.translate( + 'mercurial', """<h3>Repository information</h3>\n""" """<p><table>\n""" """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n""" @@ -1488,8 +1497,8 @@ if os.path.splitdrive(repodir)[1] == os.sep: return False - dia = HgDialog(self.trUtf8('Copying {0}') - .format(name), self) + dia = HgDialog( + self.trUtf8('Copying {0}').format(name), self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -1717,16 +1726,19 @@ finished = process.waitForFinished(30000) if finished: if process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: - error = str(process.readAllStandardError(), + error = str( + process.readAllStandardError(), Preferences.getSystem("IOEncoding"), 'replace') else: error = self.trUtf8( "The hg process did not finish within 30s.") else: - error = self.trUtf8('The process {0} could not be started. ' + error = self.trUtf8( + 'The process {0} could not be started. ' 'Ensure, that it is in the search path.').format('hg') else: output, error = self.__client.runcommand(args) @@ -1972,7 +1984,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: output, error = self.__client.runcommand(args) @@ -1986,36 +1999,45 @@ cdate, ctime = date.split()[:2] info.append("""<p><table>""") if mode == "heads": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Head #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "parents": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "tip": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Tip</b></td><td></td></tr>\n""")) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\ .format(changeset)) if tags: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(tags.split()))) if bookmarks: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(bookmarks.split()))) if branches: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(branches.split()))) if parents: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(parents.split()))) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate( + "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" @@ -3192,7 +3214,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: output, error = self.__client.runcommand(args)
