Mercurial Repositories > eric / changeset
changeset
Continued to shorten the code lines to max. 79 characters.
Sat, 12 Oct 2013 15:01:28 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 12 Oct 2013 15:01:28 +0200
- changeset 3008
- 7848489bcb92
- parent 3007
- bad2e89047e7
- child 3009
- bf5ae5d7477d
Continued to shorten the code lines to max. 79 characters.
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -20,7 +20,8 @@ DEFINE_MODE = 0 MOVE_MODE = 1 - def __init__(self, mode, tagsList, branchesList, bookmarksList, parent=None): + def __init__(self, mode, tagsList, branchesList, bookmarksList, + parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -10,8 +10,8 @@ import os from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ - QLineEdit +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox @@ -22,7 +22,8 @@ class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog): """ - Class implementing a dialog to show a list of incoming or outgoing bookmarks. + Class implementing a dialog to show a list of incoming or outgoing + bookmarks. """ INCOMING = 0 OUTGOING = 1 @@ -55,7 +56,8 @@ self.mode = mode self.__hgClient = vcs.getClient() - self.bookmarksList.headerItem().setText(self.bookmarksList.columnCount(), "") + self.bookmarksList.headerItem().setText( + self.bookmarksList.columnCount(), "") self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) self.process.finished.connect(self.__procFinished) @@ -147,7 +149,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -161,7 +164,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.process = None @@ -205,7 +209,8 @@ """ Private method to resize the list columns. """ - self.bookmarksList.header().resizeSections(QHeaderView.ResizeToContents) + self.bookmarksList.header().resizeSections( + QHeaderView.ResizeToContents) self.bookmarksList.header().setStretchLastSection(True) def __generateItem(self, changeset, name):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -10,8 +10,8 @@ import os from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ - QLineEdit +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox @@ -42,7 +42,8 @@ self.__bookmarksList = None self.__hgClient = vcs.getClient() - self.bookmarksList.headerItem().setText(self.bookmarksList.columnCount(), "") + self.bookmarksList.headerItem().setText( + self.bookmarksList.columnCount(), "") self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) self.process.finished.connect(self.__procFinished) @@ -130,7 +131,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -144,13 +146,15 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.process = None if self.bookmarksList.topLevelItemCount() == 0: # no bookmarks defined - self.__generateItem(self.trUtf8("no bookmarks defined"), "", "", "") + self.__generateItem( + self.trUtf8("no bookmarks defined"), "", "", "") self.__resizeColumns() self.__resort() @@ -188,7 +192,8 @@ """ Private method to resize the list columns. """ - self.bookmarksList.header().resizeSections(QHeaderView.ResizeToContents) + self.bookmarksList.header().resizeSections( + QHeaderView.ResizeToContents) self.bookmarksList.header().setStretchLastSection(True) def __generateItem(self, revision, changeset, status, name):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -95,15 +95,17 @@ )) self.hgBookmarkMoveAct.setWhatsThis(self.trUtf8( """<b>Move bookmark</b>""" - """<p>This moves a bookmark of the project to another changeset.</p>""" + """<p>This moves a bookmark of the project to another""" + """ changeset.</p>""" )) self.hgBookmarkMoveAct.triggered[()].connect(self.__hgBookmarkMove) self.actions.append(self.hgBookmarkMoveAct) - self.hgBookmarkIncomingAct = E5Action(self.trUtf8('Show incoming bookmarks'), - UI.PixmapCache.getIcon("incomingBookmark.png"), - self.trUtf8('Show incoming bookmarks'), - 0, 0, self, 'mercurial_incoming_bookmarks') + self.hgBookmarkIncomingAct = E5Action( + self.trUtf8('Show incoming bookmarks'), + UI.PixmapCache.getIcon("incomingBookmark.png"), + self.trUtf8('Show incoming bookmarks'), + 0, 0, self, 'mercurial_incoming_bookmarks') self.hgBookmarkIncomingAct.setStatusTip(self.trUtf8( 'Show a list of incoming bookmarks' )) @@ -112,7 +114,8 @@ """<p>This shows a list of new bookmarks available at the remote""" """ repository.</p>""" )) - self.hgBookmarkIncomingAct.triggered[()].connect(self.__hgBookmarkIncoming) + self.hgBookmarkIncomingAct.triggered[()].connect( + self.__hgBookmarkIncoming) self.actions.append(self.hgBookmarkIncomingAct) self.hgBookmarkPullAct = E5Action(self.trUtf8('Pull bookmark'), @@ -130,10 +133,11 @@ self.hgBookmarkPullAct.triggered[()].connect(self.__hgBookmarkPull) self.actions.append(self.hgBookmarkPullAct) - self.hgBookmarkOutgoingAct = E5Action(self.trUtf8('Show outgoing bookmarks'), - UI.PixmapCache.getIcon("outgoingBookmark.png"), - self.trUtf8('Show outgoing bookmarks'), - 0, 0, self, 'mercurial_outgoing_bookmarks') + self.hgBookmarkOutgoingAct = E5Action( + self.trUtf8('Show outgoing bookmarks'), + UI.PixmapCache.getIcon("outgoingBookmark.png"), + self.trUtf8('Show outgoing bookmarks'), + 0, 0, self, 'mercurial_outgoing_bookmarks') self.hgBookmarkOutgoingAct.setStatusTip(self.trUtf8( 'Show a list of outgoing bookmarks' )) @@ -142,7 +146,8 @@ """<p>This shows a list of new bookmarks available at the local""" """ repository.</p>""" )) - self.hgBookmarkOutgoingAct.triggered[()].connect(self.__hgBookmarkOutgoing) + self.hgBookmarkOutgoingAct.triggered[()].connect( + self.__hgBookmarkOutgoing) self.actions.append(self.hgBookmarkOutgoingAct) self.hgBookmarkPushAct = E5Action(self.trUtf8('Push bookmark'),
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Sat Oct 12 15:01:28 2013 +0200 @@ -79,8 +79,9 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace') + output = str( + process.readAllStandardOutput(), ioEncoding, + 'replace') self.bookmarksList = [] for line in output.splitlines(): @@ -275,8 +276,9 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace') + output = str( + process.readAllStandardOutput(), ioEncoding, + 'replace') for line in output.splitlines(): if line.startswith(" "):
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Oct 12 15:01:28 2013 +0200 @@ -12,7 +12,8 @@ from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QDialog -from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase +from Preferences.ConfigurationPages.ConfigurationPageBase import \ + ConfigurationPageBase from .Ui_MercurialPage import Ui_MercurialPage @@ -33,27 +34,39 @@ self.__plugin = plugin # set initial values - self.logSpinBox.setValue(self.__plugin.getPreferences("LogLimit")) - self.commitSpinBox.setValue(self.__plugin.getPreferences("CommitMessages")) - self.logBrowserCheckBox.setChecked(self.__plugin.getPreferences("UseLogBrowser")) - self.pullUpdateCheckBox.setChecked(self.__plugin.getPreferences("PullUpdate")) + self.logSpinBox.setValue( + self.__plugin.getPreferences("LogLimit")) + self.commitSpinBox.setValue( + self.__plugin.getPreferences("CommitMessages")) + self.logBrowserCheckBox.setChecked( + self.__plugin.getPreferences("UseLogBrowser")) + self.pullUpdateCheckBox.setChecked( + self.__plugin.getPreferences("PullUpdate")) self.preferUnbundleCheckBox.setChecked( self.__plugin.getPreferences("PreferUnbundle")) - self.cleanupPatternEdit.setText(self.__plugin.getPreferences("CleanupPatterns")) - self.backupCheckBox.setChecked(self.__plugin.getPreferences("CreateBackup")) + self.cleanupPatternEdit.setText( + self.__plugin.getPreferences("CleanupPatterns")) + self.backupCheckBox.setChecked( + self.__plugin.getPreferences("CreateBackup")) def save(self): """ Public slot to save the Mercurial configuration. """ - self.__plugin.setPreferences("LogLimit", self.logSpinBox.value()) - self.__plugin.setPreferences("CommitMessages", self.commitSpinBox.value()) - self.__plugin.setPreferences("UseLogBrowser", self.logBrowserCheckBox.isChecked()) - self.__plugin.setPreferences("PullUpdate", self.pullUpdateCheckBox.isChecked()) - self.__plugin.setPreferences("PreferUnbundle", - self.preferUnbundleCheckBox.isChecked()) - self.__plugin.setPreferences("CleanupPatterns", self.cleanupPatternEdit.text()) - self.__plugin.setPreferences("CreateBackup", self.backupCheckBox.isChecked()) + self.__plugin.setPreferences( + "LogLimit", self.logSpinBox.value()) + self.__plugin.setPreferences( + "CommitMessages", self.commitSpinBox.value()) + self.__plugin.setPreferences( + "UseLogBrowser", self.logBrowserCheckBox.isChecked()) + self.__plugin.setPreferences( + "PullUpdate", self.pullUpdateCheckBox.isChecked()) + self.__plugin.setPreferences( + "PreferUnbundle", self.preferUnbundleCheckBox.isChecked()) + self.__plugin.setPreferences( + "CleanupPatterns", self.cleanupPatternEdit.text()) + self.__plugin.setPreferences( + "CreateBackup", self.backupCheckBox.isChecked()) @pyqtSlot() def on_configButton_clicked(self): @@ -76,7 +89,8 @@ username = email try: f = open(cfgFile, "w") - f.write(os.linesep.join(["[ui]", "username = {0}".format(username), ""])) + f.write(os.linesep.join(["[ui]", + "username = {0}".format(username), ""])) f.close() except (IOError, OSError): # ignore these
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -29,6 +29,7 @@ """ Public method to retrieve the data. - @return tuple containing the user name and the user email address (string, string) + @return tuple containing the user name and the user email address + (string, string) """ return self.usernameEdit.text(), self.emailEdit.text()
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -41,10 +41,10 @@ self.hgFetchAct.setWhatsThis(self.trUtf8( """<b>Fetch changes</b>""" """<p>This pulls changes from a remote repository into the """ - """local repository. If the pulled changes add a new branch head,""" - """ the head is automatically merged, and the result of the merge""" - """ is committed. Otherwise, the working directory is updated to""" - """ include the new changes.</p>""" + """local repository. If the pulled changes add a new branch""" + """ head, the head is automatically merged, and the result of""" + """ the merge is committed. Otherwise, the working directory""" + """ is updated to include the new changes.</p>""" )) self.hgFetchAct.triggered[()].connect(self.__hgFetch) self.actions.append(self.hgFetchAct)
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py Sat Oct 12 15:01:28 2013 +0200 @@ -56,8 +56,9 @@ args.append("--switch-parent") args.append("-v") - dia = HgDialog(self.trUtf8('Fetching from a remote Mercurial repository'), - self.vcs) + dia = HgDialog( + self.trUtf8('Fetching from a remote Mercurial repository'), + self.vcs) res = dia.startProcess(args, repodir) if res: dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter data for signing a revision. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -9,9 +9,10 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ - QLineEdit +from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, \ + QCoreApplication +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox @@ -124,7 +125,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -138,7 +140,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.process = None @@ -182,7 +185,8 @@ """ Private method to resize the list columns. """ - self.signaturesList.header().resizeSections(QHeaderView.ResizeToContents) + self.signaturesList.header().resizeSections( + QHeaderView.ResizeToContents) self.signaturesList.header().setStretchLastSection(True) def __generateItem(self, revision, changeset, signature): @@ -197,7 +201,8 @@ QTreeWidgetItem(self.signaturesList, [signature]) else: revString = "{0:>7}:{1}".format(revision, changeset) - topItems = self.signaturesList.findItems(revString, Qt.MatchExactly) + topItems = self.signaturesList.findItems( + revString, Qt.MatchExactly) if len(topItems) == 0: # first signature for this changeset topItm = QTreeWidgetItem(self.signaturesList, [ @@ -279,7 +284,8 @@ """ Private slot to verify the signatures of the selected revision. """ - rev = self.signaturesList.selectedItems()[0].text(0).split(":")[0].strip() + rev = self.signaturesList.selectedItems()[0].text(0)\ + .split(":")[0].strip() self.vcs.getExtensionObject("gpg")\ .hgGpgVerifySignatures(self.__path, rev) @@ -308,13 +314,15 @@ searchRxText = self.rxEdit.text() filterTop = self.categoryCombo.currentText() == self.trUtf8("Revision") if filterTop and searchRxText.startswith("^"): - searchRx = QRegExp("^\s*{0}".format(searchRxText[1:]), Qt.CaseInsensitive) + searchRx = QRegExp( + "^\s*{0}".format(searchRxText[1:]), Qt.CaseInsensitive) else: searchRx = QRegExp(searchRxText, Qt.CaseInsensitive) for topIndex in range(self.signaturesList.topLevelItemCount()): topLevelItem = self.signaturesList.topLevelItem(topIndex) if filterTop: - topLevelItem.setHidden(searchRx.indexIn(topLevelItem.text(0)) == -1) + topLevelItem.setHidden( + searchRx.indexIn(topLevelItem.text(0)) == -1) else: visibleChildren = topLevelItem.childCount() for childIndex in range(topLevelItem.childCount()):
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sat Oct 12 15:01:28 2013 +0200 @@ -66,12 +66,14 @@ if rev is None: if self.vcs.isExtensionActive("bookmarks"): bookmarksList = \ - self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.vcs.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None - dlg = HgRevisionSelectionDialog(self.vcs.hgGetTagsList(repodir), - self.vcs.hgGetBranchesList(repodir), - bookmarksList) + dlg = HgRevisionSelectionDialog( + self.vcs.hgGetTagsList(repodir), + self.vcs.hgGetBranchesList(repodir), + bookmarksList) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() @@ -102,7 +104,8 @@ if self.vcs.isExtensionActive("bookmarks"): bookmarksList = \ - self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.vcs.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgGpgSignDialog import HgGpgSignDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -76,7 +76,8 @@ @pyqtSlot() def on_pathButton_clicked(self): """ - Private slot to handle the path selection via a directory selection dialog. + Private slot to handle the path selection via a directory selection + dialog. """ path = E5FileDialog.getExistingDirectory( self, @@ -100,8 +101,9 @@ """ Public method to get the data. - @return tuple containing the relative path within the project, the sub-repository - type and the sub-repository URL (string, string, string) + @return tuple containing the relative path within the project, the + sub-repository type and the sub-repository URL (string, string, + string) """ return ( self.pathEdit.text(),
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -38,13 +38,20 @@ self.archiveEdit.setCompleter(self.__activeCompleter) self.__activeCompleter.model().setNameFilters([]) - self.typeComboBox.addItem(self.trUtf8("Detect Automatically"), "") - self.typeComboBox.addItem(self.trUtf8("Directory of Files"), "files") - self.typeComboBox.addItem(self.trUtf8("Uncompressed TAR-Archive"), "tar") - self.typeComboBox.addItem(self.trUtf8("Bzip2 compressed TAR-Archive"), "tbz2") - self.typeComboBox.addItem(self.trUtf8("Gzip compressed TAR-Archive"), "tgz") - self.typeComboBox.addItem(self.trUtf8("Uncompressed ZIP-Archive"), "uzip") - self.typeComboBox.addItem(self.trUtf8("Compressed ZIP-Archive"), "zip") + self.typeComboBox.addItem( + self.trUtf8("Detect Automatically"), "") + self.typeComboBox.addItem( + self.trUtf8("Directory of Files"), "files") + self.typeComboBox.addItem( + self.trUtf8("Uncompressed TAR-Archive"), "tar") + self.typeComboBox.addItem( + self.trUtf8("Bzip2 compressed TAR-Archive"), "tbz2") + self.typeComboBox.addItem( + self.trUtf8("Gzip compressed TAR-Archive"), "tgz") + self.typeComboBox.addItem( + self.trUtf8("Uncompressed ZIP-Archive"), "uzip") + self.typeComboBox.addItem( + self.trUtf8("Compressed ZIP-Archive"), "zip") self.__unixFileFilters = [ self.trUtf8("Bzip2 compressed TAR-Archive (*.tar.bz2)"), @@ -139,7 +146,8 @@ self.__activeCompleter = self.__archiveFileCompleter self.archiveEdit.setCompleter(self.__activeCompleter) if type_ in self.__typeFilters: - self.__activeCompleter.model().setNameFilters(self.__typeFilters[type_]) + self.__activeCompleter.model().setNameFilters( + self.__typeFilters[type_]) else: self.__activeCompleter.model().setNameFilters([]) @@ -147,9 +155,9 @@ """ Public method to retrieve the data. - @return tuple giving the archive name (string), the archive type (string), - the directory prefix 8string) and a flag indicating to recurse into - subrepositories (boolean) + @return tuple giving the archive name (string), the archive type + (string), the directory prefix 8string) and a flag indicating + to recurse into subrepositories (boolean) """ return ( self.archiveEdit.text(),
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter the data for a backout operation. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter the data for a bundle operation. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor @@ -130,8 +131,9 @@ """ Public method to retrieve the bundle data. - @return tuple naming the revisions, base revisions, the compression type and - a flag indicating to bundle all changesets (string, string, boolean) + @return tuple naming the revisions, base revisions, the compression + type and a flag indicating to bundle all changesets (string, + string, boolean) """ if self.multipleButton.isChecked(): revs = self.multipleEdit.toPlainText().strip().splitlines()
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sat Oct 12 15:01:28 2013 +0200 @@ -105,7 +105,6 @@ self.__server.waitForFinished(3000) self.__started = False -## self.__server.finished.disconnect(self.__serverFinished) self.__server.deleteLater() self.__server = None
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -85,7 +85,8 @@ def commitSubrepositories(self): """ - Public method to retrieve the state of the commit sub-repositories flag. + Public method to retrieve the state of the commit sub-repositories + flag. @return state of the sub-repositories flag (boolean) """
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -22,7 +22,8 @@ class HgCopyDialog(QDialog, Ui_HgCopyDialog): """ - Class implementing a dialog to enter the data for a copy or rename operation. + Class implementing a dialog to enter the data for a copy or rename + operation. """ def __init__(self, source, parent=None, move=False, force=False): """ @@ -63,7 +64,8 @@ if not os.path.isabs(target): sourceDir = os.path.dirname(self.sourceEdit.text()) target = os.path.join(sourceDir, target) - return Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked() + return Utilities.toNativeSeparators(target), \ + self.forceCheckBox.isChecked() @pyqtSlot() def on_dirButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -53,7 +53,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.proc is not None and \ self.proc.state() != QProcess.NotRunning: @@ -69,7 +70,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) if Preferences.getVCS("AutoClose") and \ self.normal and \ @@ -114,8 +116,9 @@ self.intercept = False self.__hasAddOrDelete = False - if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", - "update", "import", "revert", "graft"] or \ + if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", + "transplant", "update", "import", "revert", + "graft"] or \ (args[0] in ["pull", "unbundle"] and \ ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -24,7 +24,8 @@ class HgDiffDialog(QWidget, Ui_HgDiffDialog): """ - Class implementing a dialog to show the output of the hg diff command process. + Class implementing a dialog to show the output of the hg diff command + process. """ def __init__(self, vcs, parent=None): """ @@ -94,7 +95,8 @@ Public slot to start the hg diff command. @param fn filename to be diffed (string) - @param versions list of versions to be diffed (list of up to 2 strings or None) + @param versions list of versions to be diffed (list of up to 2 strings + or None) @param bundle name of a bundle file (string) @param qdiff flag indicating qdiff command shall be used (boolean) """ @@ -208,7 +210,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ QApplication.restoreOverrideCursor() self.inputGroup.setEnabled(False) @@ -221,7 +224,8 @@ self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) tc = self.contents.textCursor() tc.movePosition(QTextCursor.Start) @@ -232,7 +236,8 @@ self.filesCombo.addItem(self.trUtf8("<End>"), -1) for oldFile, newFile, pos in sorted(self.__fileSeparators): if oldFile != newFile: - self.filesCombo.addItem("{0}\n{1}".format(oldFile, newFile), pos) + self.filesCombo.addItem( + "{0}\n{1}".format(oldFile, newFile), pos) else: self.filesCombo.addItem(oldFile, pos) @@ -272,7 +277,8 @@ self.__oldFile = self.__extractFileName(line) else: self.__fileSeparators.append( - (self.__oldFile, self.__extractFileName(line), self.__oldFileLine)) + (self.__oldFile, self.__extractFileName(line), + self.__oldFileLine)) def __processOutputLine(self, line): """ @@ -371,7 +377,8 @@ # step 2: move cursor to desired line tc = self.contents.textCursor() delta = tc.blockNumber() - para - tc.movePosition(QTextCursor.PreviousBlock, QTextCursor.MoveAnchor, delta) + tc.movePosition(QTextCursor.PreviousBlock, QTextCursor.MoveAnchor, + delta) self.contents.setTextCursor(tc) self.contents.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -12,10 +12,11 @@ class HgExtensionProjectHelper(QObject): """ - Class implementing the project helper base for Mercurial extension interfaces. + Class implementing the project helper base for Mercurial extension + interfaces. - Note: The methods initActions(), initMenu(mainMenu) and menuTitle() have to be - reimplemented by derived classes. + Note: The methods initActions(), initMenu(mainMenu) and menuTitle() have + to be reimplemented by derived classes. """ def __init__(self): """ @@ -51,7 +52,8 @@ Note: Derived class must implement this method. - @exception NotImplementedError raised if the class has not been reimplemente + @exception NotImplementedError raised if the class has not been + reimplemente """ raise NotImplementedError @@ -63,7 +65,8 @@ @param mainMenu reference to the main menu (QMenu) @ireturn populated menu (QMenu) - @exception NotImplementedError raised if the class has not been reimplemente + @exception NotImplementedError raised if the class has not been + reimplemente """ raise NotImplementedError @@ -74,6 +77,7 @@ Note: Derived class must implement this method. @ireturn title of the menu (string) - @exception NotImplementedError raised if the class has not been reimplemente + @exception NotImplementedError raised if the class has not been + reimplemente """ raise NotImplementedError
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -22,7 +22,8 @@ Constructor @param vcs reference to the VCS object (Hg) - @param revs list of revisions to show in the revisions pane (list of strings) + @param revs list of revisions to show in the revisions pane (list of + strings) @param parent reference to the parent widget (QWidget) """ super().__init__(parent) @@ -95,9 +96,9 @@ current user and the user name, another tuple giving a flag indicating to set the date, a flag indicating to use the current date and the date, a flag indicating to append graft info - to the log message and a flag indicating a dry-run (list of strings, - (boolean, boolean, string), (boolean, boolean, string), boolean, - boolean) + to the log message and a flag indicating a dry-run (list of + strings, (boolean, boolean, string), (boolean, boolean, string), + boolean, boolean) """ userData = (self.userGroup.isChecked(), self.currentUserCheckBox.isChecked(),
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -41,7 +41,8 @@ MessageColumn = 6 TagsColumn = 7 - def __init__(self, vcs, mode="log", bundle=None, isFile=False, parent=None): + def __init__(self, vcs, mode="log", bundle=None, isFile=False, + parent=None): """ Constructor @@ -67,8 +68,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) - self.refreshButton = \ - self.buttonBox.addButton(self.trUtf8("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton = self.buttonBox.addButton( + self.trUtf8("&Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( self.trUtf8("Press to refresh the list of changesets")) self.refreshButton.setEnabled(False) @@ -389,7 +390,8 @@ if self.bundle: args.append("--repository") args.append(self.bundle) - elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): + elif self.vcs.bundleFile and \ + os.path.exists(self.vcs.bundleFile): args.append("--repository") args.append(self.vcs.bundleFile) args.append("--template") @@ -660,13 +662,16 @@ args.append('--style') if self.vcs.version >= (2, 1): args.append(os.path.join(os.path.dirname(__file__), - "styles", "logBrowserBookmarkPhase.style")) + "styles", + "logBrowserBookmarkPhase.style")) elif self.vcs.version >= (1, 8): args.append(os.path.join(os.path.dirname(__file__), - "styles", "logBrowserBookmark.style")) + "styles", + "logBrowserBookmark.style")) else: args.append(os.path.join(os.path.dirname(__file__), - "styles", "logBrowser.style")) + "styles", + "logBrowser.style")) if self.commandMode == "incoming": if self.bundle: args.append(self.bundle) @@ -1045,7 +1050,8 @@ """ if self.graftButton.isVisible(): if self.initialCommandMode == "log": - # step 1: count selected entries not belonging to the current branch + # step 1: count selected entries not belonging to the + # current branch otherBranches = 0 for itm in self.logTree.selectedItems(): branch = itm.text(self.BranchColumn) @@ -1061,7 +1067,8 @@ """ Private slot to update GUI elements except the diff and phase buttons. - @param itm reference to the item the update should be based on (QTreeWidgetItem) + @param itm reference to the item the update should be based on + (QTreeWidgetItem) """ self.messageEdit.clear() self.filesTree.clear() @@ -1344,7 +1351,8 @@ revs = [] for itm in self.logTree.selectedItems(): if itm.text(self.PhaseColumn) == currentPhase: - revs.append(itm.text(self.RevisionColumn).split(":")[0].strip()) + revs.append( + itm.text(self.RevisionColumn).split(":")[0].strip()) if not revs: self.phaseButton.setEnabled(False) @@ -1371,14 +1379,16 @@ for itm in self.logTree.selectedItems(): branch = itm.text(self.BranchColumn) if branch != self.__projectBranch: - revs.append(itm.text(self.RevisionColumn).strip().split(":", 1)[0]) + revs.append( + itm.text(self.RevisionColumn).strip().split(":", 1)[0]) if revs: shouldReopen = self.vcs.hgGraft(self.repodir, revs) if shouldReopen: res = E5MessageBox.yesNo(None, self.trUtf8("Copy Changesets"), - self.trUtf8("""The project should be reread. Do this now?"""), + self.trUtf8( + """The project should be reread. Do this now?"""), yesDefault=True) if res: e5App().getObject("Project").reopenProject()
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -24,12 +24,14 @@ class HgLogDialog(QWidget, Ui_HgLogDialog): """ - Class implementing a dialog to show the output of the hg log command process. + Class implementing a dialog to show the output of the hg log command + process. The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the revisions. """ - def __init__(self, vcs, mode="log", bundle=None, isFile=False, parent=None): + def __init__(self, vcs, mode="log", bundle=None, isFile=False, + parent=None): """ Constructor @@ -195,7 +197,8 @@ def __getParents(self, rev): """ - Private method to get the parents of the currently viewed file/directory. + Private method to get the parents of the currently viewed + file/directory. @param rev revision number to get parents for (string) @return list of parent revisions (list of strings) @@ -210,7 +213,8 @@ if self.bundle: args.append("--repository") args.append(self.bundle) - elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): + elif self.vcs.bundleFile and \ + os.path.exists(self.vcs.bundleFile): args.append("--repository") args.append(self.vcs.bundleFile) args.append("--template") @@ -263,7 +267,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ self.inputGroup.setEnabled(False) self.inputGroup.hide() @@ -313,21 +318,27 @@ html += dstr if "phase" in entry: - html += self.trUtf8("Phase: {0}<br />\n").format(entry["phase"]) + html += self.trUtf8("Phase: {0}<br />\n")\ + .format(entry["phase"]) - html += self.trUtf8("Branches: {0}<br />\n").format(entry["branches"]) + html += self.trUtf8("Branches: {0}<br />\n")\ + .format(entry["branches"]) html += self.trUtf8("Tags: {0}<br />\n").format(entry["tags"]) if "bookmarks" in entry: - html += self.trUtf8("Bookmarks: {0}<br />\n").format(entry["bookmarks"]) + html += self.trUtf8("Bookmarks: {0}<br />\n")\ + .format(entry["bookmarks"]) - html += self.trUtf8("Parents: {0}<br />\n").format(entry["parents"]) + html += self.trUtf8("Parents: {0}<br />\n")\ + .format(entry["parents"]) - html += self.trUtf8('<i>Author: {0}</i><br />\n').format(entry["user"]) + html += self.trUtf8('<i>Author: {0}</i><br />\n')\ + .format(entry["user"]) date, time = entry["date"].split()[:2] - html += self.trUtf8('<i>Date: {0}, {1}</i><br />\n').format(date, time) + html += self.trUtf8('<i>Date: {0}, {1}</i><br />\n')\ + .format(date, time) for line in entry["description"]: html += Utilities.html_encode(line.strip()) @@ -337,9 +348,10 @@ html += '<br />\n' for f in entry["file_adds"].strip().split(", "): if f in fileCopies: - html += self.trUtf8('Added {0} (copied from {1})<br />\n')\ - .format(Utilities.html_encode(f), - Utilities.html_encode(fileCopies[f])) + html += self.trUtf8( + 'Added {0} (copied from {1})<br />\n')\ + .format(Utilities.html_encode(f), + Utilities.html_encode(fileCopies[f])) else: html += self.trUtf8('Added {0}<br />\n')\ .format(Utilities.html_encode(f))
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, force, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, force, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -10,22 +10,26 @@ from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QDialog, QDialogButtonBox -from .Ui_HgMultiRevisionSelectionDialog import Ui_HgMultiRevisionSelectionDialog +from .Ui_HgMultiRevisionSelectionDialog import \ + Ui_HgMultiRevisionSelectionDialog -class HgMultiRevisionSelectionDialog(QDialog, Ui_HgMultiRevisionSelectionDialog): +class HgMultiRevisionSelectionDialog( + QDialog, Ui_HgMultiRevisionSelectionDialog): """ Class implementing a dialog to select revisions. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, - showLimit=False, limitDefault=100, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + emptyRevsOk=False, showLimit=False, limitDefault=100, + parent=None): """ Constructor @param tagsList list of tags (list of strings) @param branchesList list of branches (list of strings) @param bookmarksList list of bookmarks (list of strings) - @param emptyRevsOk flag indicating that it is ok to not enter revisions (boolean) + @param emptyRevsOk flag indicating that it is ok to not enter + revisions (boolean) @param showLimit flag indicating to show the limit entry (boolean) @param limitDefault default value for the limit (integer) @param parent parent widget (QWidget)
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -4,7 +4,8 @@ # """ -Module implementing the Mercurial Options Dialog for a new project from the repository. +Module implementing the Mercurial Options Dialog for a new project from the +repository. """ import os @@ -24,7 +25,8 @@ class HgNewProjectOptionsDialog(QDialog, Ui_HgNewProjectOptionsDialog): """ - Class implementing the Options Dialog for a new project from the repository. + Class implementing the Options Dialog for a new project from the + repository. """ def __init__(self, vcs, parent=None): """ @@ -52,7 +54,8 @@ self.localProtocol = True self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators( - Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())) + Preferences.getMultiProject("Workspace") or \ + Utilities.getHomeDir())) @pyqtSlot() def on_vcsUrlButton_clicked(self): @@ -67,7 +70,8 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) + self.vcsUrlEdit.setText( + Utilities.toNativeSeparators(directory)) @pyqtSlot() def on_projectDirButton_clicked(self): @@ -81,7 +85,8 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(directory)) + self.vcsProjectDirEdit.setText( + Utilities.toNativeSeparators(directory)) @pyqtSlot(str) def on_protocolCombo_activated(self, protocol):
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -4,7 +4,8 @@ # """ -Module implementing a dialog to enter options used to start a project in the VCS. +Module implementing a dialog to enter options used to start a project in +the VCS. """ from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -15,7 +15,8 @@ class HgPhaseDialog(QDialog, Ui_HgPhaseDialog): """ - Class dimplementing a dialog to enter data for the Mercurial Phase operation. + Class dimplementing a dialog to enter data for the Mercurial Phase + operation. """ def __init__(self, parent=None): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -35,7 +35,8 @@ """ Private slot handling the selection of entries. """ - self.removeButton.setEnabled(len(self.subrepositories.selectedItems()) > 0) + self.removeButton.setEnabled( + len(self.subrepositories.selectedItems()) > 0) @pyqtSlot() def on_removeButton_clicked(self): @@ -53,8 +54,8 @@ Public method to retrieve the data. @return tuple giving the remaining sub-repositories, the removed ones - and a flag indicating to delete the removed ones from disc (list of strings, - list of strings, boolean) + and a flag indicating to delete the removed ones from disc (list + of strings, list of strings, boolean) """ return ( [self.subrepositories.item(row).text()
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,15 +17,16 @@ """ Class implementing a dialog to select a revision. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, showNone=False, - parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + showNone=False, parent=None): """ Constructor @param tagsList list of tags (list of strings) @param branchesList list of branches (list of strings) @param bookmarksList list of bookmarks (list of strings) - @param showNone flag influencing the label of the 'None' selection (boolean) + @param showNone flag influencing the label of the 'None' selection + (boolean) @param parent parent widget (QWidget) """ super().__init__(parent)
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter the revisions for the hg diff command. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -45,12 +45,14 @@ self.__startAct = QAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "startServer.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "startServer.png")), self.trUtf8("Start Server"), self) self.__startAct.triggered[()].connect(self.__startServer) self.__stopAct = QAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "stopServer.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "stopServer.png")), self.trUtf8("Stop Server"), self) self.__stopAct.triggered[()].connect(self.__stopServer) self.__browserAct = QAction( @@ -62,7 +64,8 @@ self.__portSpin.setMinimum(2048) self.__portSpin.setMaximum(65535) self.__portSpin.setToolTip(self.trUtf8("Enter the server port")) - self.__portSpin.setValue(self.vcs.getPlugin().getPreferences("ServerPort")) + self.__portSpin.setValue( + self.vcs.getPlugin().getPreferences("ServerPort")) self.__styleCombo = QComboBox(self) self.__styleCombo.addItems(self.__styles) @@ -101,7 +104,8 @@ self.cNormalFormat = self.__log.currentCharFormat() self.cErrorFormat = self.__log.currentCharFormat() - self.cErrorFormat.setForeground(QBrush(Preferences.getUI("LogStdErrColour"))) + self.cErrorFormat.setForeground( + QBrush(Preferences.getUI("LogStdErrColour"))) def __startServer(self): """ @@ -160,7 +164,8 @@ Private slot to start a browser for the served repository. """ ui = e5App().getObject("UserInterface") - ui.launchHelpViewer("http://localhost:{0}".format(self.__portSpin.value())) + ui.launchHelpViewer( + "http://localhost:{0}".format(self.__portSpin.value())) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -4,14 +4,15 @@ # """ -Module implementing a dialog to show the output of the hg status command process. +Module implementing a dialog to show the output of the hg status command +process. """ import os from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer -from PyQt4.QtGui import QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \ - QLineEdit +from PyQt4.QtGui import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ + QTreeWidgetItem, QLineEdit from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -23,7 +24,8 @@ class HgStatusDialog(QWidget, Ui_HgStatusDialog): """ - Class implementing a dialog to show the output of the hg status command process. + Class implementing a dialog to show the output of the hg status command + process. """ def __init__(self, vcs, mq=False, parent=None): """ @@ -41,9 +43,10 @@ self.__pathColumn = 2 self.__lastColumn = self.statusList.columnCount() - self.refreshButton = \ - self.buttonBox.addButton(self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) - self.refreshButton.setToolTip(self.trUtf8("Press to refresh the status display")) + self.refreshButton = self.buttonBox.addButton( + self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.trUtf8("Press to refresh the status display")) self.refreshButton.setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) @@ -56,7 +59,8 @@ self.__mq = mq self.statusList.headerItem().setText(self.__lastColumn, "") - self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder) + self.statusList.header().setSortIndicator( + self.__pathColumn, Qt.AscendingOrder) if mq: self.buttonsLine.setVisible(False) @@ -75,7 +79,8 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Select all for commit"), self.__commitSelectAll)) self.menuactions.append(self.menu.addAction( - self.trUtf8("Deselect all from commit"), self.__commitDeselectAll)) + self.trUtf8("Deselect all from commit"), + self.__commitDeselectAll)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) @@ -96,7 +101,8 @@ act.setEnabled(False) self.statusList.setContextMenuPolicy(Qt.CustomContextMenu) - self.statusList.customContextMenuRequested.connect(self.__showContextMenu) + self.statusList.customContextMenuRequested.connect( + self.__showContextMenu) self.modifiedIndicators = [ self.trUtf8('added'), @@ -206,7 +212,8 @@ self.__statusFilters = [] if self.__mq: - self.setWindowTitle(self.trUtf8("Mercurial Queue Repository Status")) + self.setWindowTitle( + self.trUtf8("Mercurial Queue Repository Status")) else: self.setWindowTitle(self.trUtf8('Mercurial Status')) @@ -280,7 +287,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -295,7 +303,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.__statusFilters.sort() self.__statusFilters.insert(0, "<{0}>".format(self.trUtf8("all"))) @@ -558,9 +567,9 @@ """ self.__restoreMissing() - ############################################################################ + ########################################################################### ## Context menu handling methods - ############################################################################ + ########################################################################### def __showContextMenu(self, coord): """ @@ -756,7 +765,8 @@ def __getUnversionedItems(self): """ - Private method to retrieve all entries, that have an unversioned status. + Private method to retrieve all entries, that have an unversioned + status. @return list of all items with an unversioned status """
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat Oct 12 15:01:28 2013 +0200 @@ -89,13 +89,13 @@ if procStarted: finished = process.waitForFinished(300000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') + output = str(process.readAllStandardOutput(), + self.__ioEncoding, 'replace') else: process.kill() process.waitForFinished() - error = \ - str(process.readAllStandardError(), self.__ioEncoding, 'replace') + error = str(process.readAllStandardError(), + self.__ioEncoding, 'replace') else: process.kill() process.waitForFinished() @@ -132,7 +132,8 @@ finished = process.waitForFinished(300000) if finished and process.exitCode() == 0: output = str( - process.readAllStandardOutput(), self.__ioEncoding, 'replace') + process.readAllStandardOutput(), + self.__ioEncoding, 'replace') for line in output.splitlines(): flag, name = line.split(" ", 1) @@ -143,7 +144,8 @@ for name in states: try: if self.reportedStates[name] != states[name]: - self.statusList.append("{0} {1}".format(states[name], name)) + self.statusList.append( + "{0} {1}".format(states[name], name)) except KeyError: self.statusList.append("{0} {1}".format(states[name], name)) for name in self.reportedStates.keys():
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -37,9 +37,10 @@ super().__init__(parent) self.setupUi(self) - self.refreshButton = \ - self.buttonBox.addButton(self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) - self.refreshButton.setToolTip(self.trUtf8("Press to refresh the summary display")) + self.refreshButton = self.buttonBox.addButton( + self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.trUtf8("Press to refresh the summary display")) self.refreshButton.setEnabled(False) self.process = None @@ -89,7 +90,8 @@ self.process.kill() else: self.process = QProcess() - prepareProcess(self.process, Preferences.getSystem("IOEncoding"), "C") + prepareProcess(self.process, Preferences.getSystem("IOEncoding"), + "C") self.process.finished.connect(self.__procFinished) self.process.readyReadStandardOutput.connect(self.__readStdout) self.process.readyReadStandardError.connect(self.__readStderr) @@ -110,7 +112,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -313,19 +316,20 @@ pindex += 1 changeset = "{0}:{1}".format(rev, node) if len(infoDict["parent"]) > 1: - info.append( - self.trUtf8("<tr><td><b>Parent #{0}</b></td><td>{1}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Parent #{0}</b></td><td>{1}</td></tr>") .format(pindex, changeset)) else: - info.append( - self.trUtf8("<tr><td><b>Parent</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Parent</b></td><td>{0}</td></tr>") .format(changeset)) if tags: - info.append(self.trUtf8("<tr><td><b>Tags</b></td><td>{0}</td></tr>") - .format('<br/>'.join(tags.split()))) + info.append(self.trUtf8( + "<tr><td><b>Tags</b></td><td>{0}</td></tr>") + .format('<br/>'.join(tags.split()))) if message: - info.append( - self.trUtf8("<tr><td><b>Commit Message</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Commit Message</b></td><td>{0}</td></tr>") .format(message)) if remarks: rem = [] @@ -333,19 +337,21 @@ rem.append(self.trUtf8("empty repository")) if "@NO_REVISION@" in remarks: rem.append(self.trUtf8("no revision checked out")) - info.append( - self.trUtf8("<tr><td><b>Remarks</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Remarks</b></td><td>{0}</td></tr>") .format(", ".join(rem))) if "branch" in infoDict: - info.append(self.trUtf8("<tr><td><b>Branch</b></td><td>{0}</td></tr>") - .format(infoDict["branch"])) + info.append(self.trUtf8( + "<tr><td><b>Branch</b></td><td>{0}</td></tr>") + .format(infoDict["branch"])) if "bookmarks" in infoDict: bookmarks = infoDict["bookmarks"].split() for i in range(len(bookmarks)): if bookmarks[i].startswith("*"): bookmarks[i] = "<b>{0}</b>".format(bookmarks[i]) - info.append(self.trUtf8("<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>") - .format('<br/>'.join(bookmarks))) + info.append(self.trUtf8( + "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>") + .format('<br/>'.join(bookmarks))) if "commit" in infoDict: cinfo = [] for category, count in infoDict["commit"][0].items(): @@ -366,7 +372,8 @@ elif category == "ignored": cinfo.append(self.trUtf8("{0} ignored").format(count)) elif category == "unresolved": - cinfo.append(self.trUtf8("{0} unresolved").format(count)) + cinfo.append( + self.trUtf8("{0} unresolved").format(count)) elif category == "subrepos": cinfo.append(self.trUtf8("{0} subrepos").format(count)) remark = infoDict["commit"][1] @@ -380,25 +387,29 @@ cinfo.append(self.trUtf8("No commit required")) elif remark == "new branch head": cinfo.append(self.trUtf8("New Branch Head")) - info.append( - self.trUtf8("<tr><td><b>Commit Status</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Commit Status</b></td><td>{0}</td></tr>") .format("<br/>".join(cinfo))) if "update" in infoDict: if infoDict["update"][0] == "@CURRENT@": uinfo = self.trUtf8("current") elif infoDict["update"][0] == "@UPDATE@": - uinfo = self.trUtf8("%n new changeset(s)<br/>Update required", "", + uinfo = self.trUtf8( + "%n new changeset(s)<br/>Update required", "", infoDict["update"][1]) elif infoDict["update"][0] == "@MERGE@": - uinfo1 = self.trUtf8("%n new changeset(s)", "", infoDict["update"][1]) - uinfo2 = self.trUtf8("%n branch head(s)", "", infoDict["update"][2]) - uinfo = self.trUtf8("{0}<br/>{1}<br/>Merge required", + uinfo1 = self.trUtf8( + "%n new changeset(s)", "", infoDict["update"][1]) + uinfo2 = self.trUtf8( + "%n branch head(s)", "", infoDict["update"][2]) + uinfo = self.trUtf8( + "{0}<br/>{1}<br/>Merge required", "0 is changesets, 1 is branch heads")\ .format(uinfo1, uinfo2) else: uinfo = self.trUtf8("unknown status") - info.append( - self.trUtf8("<tr><td><b>Update Status</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Update Status</b></td><td>{0}</td></tr>") .format(uinfo)) if "remote" in infoDict: if infoDict["remote"] == (0, 0, 0, 0): @@ -417,8 +428,8 @@ l.append(self.trUtf8("%n outgoing bookmark(s)", "", infoDict["remote"][3])) rinfo = "<br/>".join(l) - info.append( - self.trUtf8("<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") .format(rinfo)) if "mq" in infoDict: if infoDict["mq"] == (0, 0): @@ -426,12 +437,14 @@ else: l = [] if infoDict["mq"][0]: - l.append(self.trUtf8("{0} applied").format(infoDict["mq"][0])) + l.append(self.trUtf8("{0} applied") + .format(infoDict["mq"][0])) if infoDict["mq"][1]: - l.append(self.trUtf8("{0} unapplied").format(infoDict["mq"][1])) + l.append(self.trUtf8("{0} unapplied") + .format(infoDict["mq"][1])) qinfo = "<br/>".join(l) - info.append( - self.trUtf8("<tr><td><b>Queues Status</b></td><td>{0}</td></tr>") + info.append(self.trUtf8( + "<tr><td><b>Queues Status</b></td><td>{0}</td></tr>") .format(qinfo)) info.append("</table>") else:
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -22,21 +22,22 @@ """ Class implementing the VCS project browser helper for Mercurial. """ - def __init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, - parent=None, name=None): + def __init__(self, vcsObject, browserObject, projectObject, + isTranslationsBrowser, parent=None, name=None): """ Constructor @param vcsObject reference to the vcs object @param browserObject reference to the project browser object @param projectObject reference to the project object - @param isTranslationsBrowser flag indicating, the helper is requested for the - translations browser (this needs some special treatment) + @param isTranslationsBrowser flag indicating, the helper is requested + for the translations browser (this needs some special treatment) @param parent parent widget (QWidget) @param name name of this object (string) """ - VcsProjectBrowserHelper.__init__(self, vcsObject, browserObject, projectObject, - isTranslationsBrowser, parent, name) + VcsProjectBrowserHelper.__init__(self, vcsObject, browserObject, + projectObject, isTranslationsBrowser, + parent, name) def showContextMenu(self, menu, standardItems): """ @@ -46,8 +47,8 @@ VCS status and the file status. @param menu reference to the menu to be shown - @param standardItems array of standard items that need activation/deactivation - depending on the overall VCS status + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status """ if self.browser.currentItem().data(1) == self.vcs.vcsName(): for act in self.vcsMenuActions: @@ -74,8 +75,8 @@ VCS status and the files status. @param menu reference to the menu to be shown - @param standardItems array of standard items that need activation/deactivation - depending on the overall VCS status + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status """ vcsName = self.vcs.vcsName() items = self.browser.getSelectedItems() @@ -112,8 +113,8 @@ VCS status and the directory status. @param menu reference to the menu to be shown - @param standardItems array of standard items that need activation/deactivation - depending on the overall VCS status + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status """ if self.browser.currentItem().data(1) == self.vcs.vcsName(): for act in self.vcsDirMenuActions: @@ -138,8 +139,8 @@ VCS status and the directory status. @param menu reference to the menu to be shown - @param standardItems array of standard items that need activation/deactivation - depending on the overall VCS status + @param standardItems array of standard items that need + activation/deactivation depending on the overall VCS status """ vcsName = self.vcs.vcsName() items = self.browser.getSelectedItems() @@ -168,9 +169,9 @@ for act in standardItems: act.setEnabled(True) - ############################################################################ + ########################################################################### # Protected menu generation methods below - ############################################################################ + ########################################################################### def _addVCSMenu(self, mainMenu): """ @@ -185,7 +186,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -247,7 +249,8 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) + act = menu.addAction( + self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -278,7 +281,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -317,7 +321,8 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) + act = menu.addAction( + self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -344,7 +349,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -381,7 +387,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -428,7 +435,8 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) + act = menu.addAction( + self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -461,7 +469,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -496,7 +505,8 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) + act = menu.addAction( + self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -513,9 +523,9 @@ mainMenu.addMenu(menu) self.menuDirMulti = menu - ############################################################################ + ########################################################################### # Menu handling methods below - ############################################################################ + ########################################################################### def __HgRevert(self): """ @@ -561,8 +571,8 @@ def __HgExtendedDiff(self): """ - Private slot called by the context menu to show the difference of a file to - the repository. + Private slot called by the context menu to show the difference of a + file to the repository. This gives the chance to enter the revisions to compare. """ @@ -576,8 +586,8 @@ def __HgSbsDiff(self): """ - Private slot called by the context menu to show the difference of a file to - the repository side-by-side. + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. """ itm = self.browser.currentItem() fn = itm.fileName() @@ -585,8 +595,10 @@ def __HgSbsExtendedDiff(self): """ - Private slot called by the context menu to show the difference of a file to - the repository side-by-side allowing the selection of revisions to compare. + Private slot called by the context menu to show the difference of a + file to the repository side-by-side. + + It allows the selection of revisions to compare. """ itm = self.browser.currentItem() fn = itm.fileName() @@ -594,7 +606,8 @@ def __HgAnnotate(self): """ - Private slot called by the context menu to show the annotations of a file. + Private slot called by the context menu to show the annotations of a + file. """ itm = self.browser.currentItem() fn = itm.fileName() @@ -602,7 +615,8 @@ def __HgLogBrowser(self): """ - Private slot called by the context menu to show the log browser for a file. + Private slot called by the context menu to show the log browser for a + file. """ itm = self.browser.currentItem() try: @@ -627,18 +641,19 @@ def __HgForget(self): """ - Private slot called by the context menu to remove the selected file from the - Mercurial repository leaving a copy in the project directory. + Private slot called by the context menu to remove the selected file + from the Mercurial repository leaving a copy in the project directory. """ - from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog if self.isTranslationsBrowser: items = self.browser.getSelectedItems([ProjectBrowserFileItem]) names = [itm.fileName() for itm in items] dlg = DeleteFilesConfirmationDialog(self.parent(), self.trUtf8("Remove from repository only"), - self.trUtf8("Do you really want to remove these translation files from" - " the repository?"), + self.trUtf8("Do you really want to remove these files" + " from the repository?"), names) else: items = self.browser.getSelectedItems()
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -57,8 +57,8 @@ self.__extensionMenuTitles = {} for extension in self.__extensions: - self.__extensionMenuTitles[self.__extensions[extension].menuTitle()] = \ - extension + self.__extensionMenuTitles[ + self.__extensions[extension].menuTitle()] = extension def setObjects(self, vcsObject, projectObject): """ @@ -98,7 +98,8 @@ """ self.vcsNewAct = E5Action(self.trUtf8('New from repository'), UI.PixmapCache.getIcon("vcsCheckout.png"), - self.trUtf8('&New from repository...'), 0, 0, self, 'mercurial_new') + self.trUtf8('&New from repository...'), 0, 0, + self, 'mercurial_new') self.vcsNewAct.setStatusTip(self.trUtf8( 'Create (clone) a new project from a Mercurial repository' )) @@ -119,7 +120,8 @@ )) self.hgIncomingAct.setWhatsThis(self.trUtf8( """<b>Show incoming log</b>""" - """<p>This shows the log of changes coming into the repository.</p>""" + """<p>This shows the log of changes coming into the""" + """ repository.</p>""" )) self.hgIncomingAct.triggered[()].connect(self.__hgIncoming) self.actions.append(self.hgIncomingAct) @@ -148,15 +150,17 @@ )) self.vcsUpdateAct.setWhatsThis(self.trUtf8( """<b>Update from repository</b>""" - """<p>This updates the local project from the Mercurial repository.</p>""" + """<p>This updates the local project from the Mercurial""" + """ repository.</p>""" )) self.vcsUpdateAct.triggered[()].connect(self._vcsUpdate) self.actions.append(self.vcsUpdateAct) - self.vcsCommitAct = E5Action(self.trUtf8('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('&Commit changes to repository...'), 0, 0, self, - 'mercurial_commit') + self.vcsCommitAct = E5Action( + self.trUtf8('Commit changes to repository'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.trUtf8('&Commit changes to repository...'), 0, 0, self, + 'mercurial_commit') self.vcsCommitAct.setStatusTip(self.trUtf8( 'Commit changes to the local project to the Mercurial repository' )) @@ -177,7 +181,8 @@ )) self.hgOutgoingAct.setWhatsThis(self.trUtf8( """<b>Show outgoing log</b>""" - """<p>This shows the log of changes outgoing out of the repository.</p>""" + """<p>This shows the log of changes outgoing out of the""" + """ repository.</p>""" )) self.hgOutgoingAct.triggered[()].connect(self.__hgOutgoing) self.actions.append(self.hgOutgoingAct) @@ -249,9 +254,9 @@ )) self.hgLogBrowserAct.setWhatsThis(self.trUtf8( """<b>Show log browser</b>""" - """<p>This shows a dialog to browse the log of the local project.""" - """ A limited number of entries is shown first. More can be""" - """ retrieved later on.</p>""" + """<p>This shows a dialog to browse the log of the local""" + """ project. A limited number of entries is shown first.""" + """ More can be retrieved later on.</p>""" )) self.hgLogBrowserAct.triggered[()].connect(self.__hgLogBrowser) self.actions.append(self.hgLogBrowserAct) @@ -265,7 +270,8 @@ )) self.vcsDiffAct.setWhatsThis(self.trUtf8( """<b>Show difference</b>""" - """<p>This shows the difference of the local project to the repository.</p>""" + """<p>This shows the difference of the local project to the""" + """ repository.</p>""" )) self.vcsDiffAct.triggered[()].connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) @@ -279,7 +285,8 @@ )) self.hgExtDiffAct.setWhatsThis(self.trUtf8( """<b>Show difference (extended)</b>""" - """<p>This shows the difference of selectable revisions of the project.</p>""" + """<p>This shows the difference of selectable revisions of the""" + """ project.</p>""" )) self.hgExtDiffAct.triggered[()].connect(self.__hgExtendedDiff) self.actions.append(self.hgExtDiffAct) @@ -376,7 +383,8 @@ )) self.vcsMergeAct.setWhatsThis(self.trUtf8( """<b>Merge</b>""" - """<p>This merges changes of a revision into the local project.</p>""" + """<p>This merges changes of a revision into the local""" + """ project.</p>""" )) self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) @@ -389,7 +397,8 @@ )) self.vcsResolveAct.setWhatsThis(self.trUtf8( """<b>Conflicts resolved</b>""" - """<p>This marks all conflicts of the local project as resolved.</p>""" + """<p>This marks all conflicts of the local project as""" + """ resolved.</p>""" )) self.vcsResolveAct.triggered[()].connect(self.__hgResolve) self.actions.append(self.vcsResolveAct) @@ -453,7 +462,8 @@ 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' + 'Push the current branch of the local project as a new named' + ' branch' )) self.hgPushBranchAct.setWhatsThis(self.trUtf8( """<b>Push new branch</b>""" @@ -498,7 +508,8 @@ )) self.vcsSwitchAct.setWhatsThis(self.trUtf8( """<b>Switch</b>""" - """<p>This switches the working directory to another revision.</p>""" + """<p>This switches the working directory to another""" + """ revision.</p>""" )) self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) @@ -524,7 +535,8 @@ )) self.vcsCommandAct.setWhatsThis(self.trUtf8( """<b>Execute command</b>""" - """<p>This opens a dialog to enter an arbitrary Mercurial command.</p>""" + """<p>This opens a dialog to enter an arbitrary Mercurial""" + """ command.</p>""" )) self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) @@ -532,10 +544,12 @@ 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.setStatusTip(self.trUtf8( + 'Show the Mercurial command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( """<b>Command options...</b>""" - """<p>This shows a dialog to edit the Mercurial command options.</p>""" + """<p>This shows a dialog to edit the Mercurial command""" + """ options.</p>""" )) self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) @@ -548,14 +562,16 @@ )) self.hgConfigAct.setWhatsThis(self.trUtf8( """<b>Configure</b>""" - """<p>Show the configuration dialog with the Mercurial page selected.</p>""" + """<p>Show the configuration dialog with the Mercurial page""" + """ selected.</p>""" )) self.hgConfigAct.triggered[()].connect(self.__hgConfigure) self.actions.append(self.hgConfigAct) - self.hgEditUserConfigAct = E5Action(self.trUtf8('Edit user configuration'), - self.trUtf8('Edit user configuration...'), - 0, 0, self, 'mercurial_user_configure') + self.hgEditUserConfigAct = E5Action( + self.trUtf8('Edit user configuration'), + self.trUtf8('Edit user configuration...'), + 0, 0, self, 'mercurial_user_configure') self.hgEditUserConfigAct.setStatusTip(self.trUtf8( 'Show an editor to edit the user configuration file' )) @@ -566,15 +582,17 @@ self.hgEditUserConfigAct.triggered[()].connect(self.__hgEditUserConfig) self.actions.append(self.hgEditUserConfigAct) - self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository configuration'), - self.trUtf8('Edit repository configuration...'), - 0, 0, self, 'mercurial_repo_configure') + self.hgRepoConfigAct = E5Action( + self.trUtf8('Edit repository configuration'), + self.trUtf8('Edit repository configuration...'), + 0, 0, self, 'mercurial_repo_configure') self.hgRepoConfigAct.setStatusTip(self.trUtf8( 'Show an editor to edit the repository configuration file' )) self.hgRepoConfigAct.setWhatsThis(self.trUtf8( """<b>Edit repository configuration</b>""" - """<p>Show an editor to edit the repository configuration file.</p>""" + """<p>Show an editor to edit the repository configuration""" + """ file.</p>""" )) self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig) self.actions.append(self.hgRepoConfigAct) @@ -584,7 +602,8 @@ 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' + 'Show the combined configuration settings from all configuration' + ' files' )) self.hgShowConfigAct.setWhatsThis(self.trUtf8( """<b>Show combined configuration settings</b>""" @@ -667,8 +686,8 @@ )) self.hgBundleAct.setWhatsThis(self.trUtf8( """<b>Create changegroup</b>""" - """<p>This creates a changegroup file collecting selected changesets""" - """ (hg bundle).</p>""" + """<p>This creates a changegroup file collecting selected""" + """ changesets (hg bundle).</p>""" )) self.hgBundleAct.triggered[()].connect(self.__hgBundle) self.actions.append(self.hgBundleAct) @@ -681,22 +700,23 @@ )) self.hgPreviewBundleAct.setWhatsThis(self.trUtf8( """<b>Preview changegroup</b>""" - """<p>This previews a changegroup file containing a collection of""" - """ changesets.</p>""" + """<p>This previews a changegroup file containing a collection""" + """ of changesets.</p>""" )) self.hgPreviewBundleAct.triggered[()].connect(self.__hgPreviewBundle) self.actions.append(self.hgPreviewBundleAct) - self.hgIdentifyBundleAct = E5Action(self.trUtf8('Identify changegroup'), - self.trUtf8('Identify changegroup...'), - 0, 0, self, 'mercurial_identify_bundle') + self.hgIdentifyBundleAct = E5Action( + self.trUtf8('Identify changegroup'), + self.trUtf8('Identify changegroup...'), + 0, 0, self, 'mercurial_identify_bundle') self.hgIdentifyBundleAct.setStatusTip(self.trUtf8( 'Identify a changegroup file containing a collection of changesets' )) self.hgIdentifyBundleAct.setWhatsThis(self.trUtf8( """<b>Identify changegroup</b>""" - """<p>This identifies a changegroup file containing a collection of""" - """ changesets.</p>""" + """<p>This identifies a changegroup file containing a""" + """ collection of changesets.</p>""" )) self.hgIdentifyBundleAct.triggered[()].connect(self.__hgIdentifyBundle) self.actions.append(self.hgIdentifyBundleAct) @@ -788,19 +808,20 @@ )) self.hgRollbackAct.setWhatsThis(self.trUtf8( """<b>Rollback last transaction</b>""" - """<p>This performs a rollback of the last transaction. Transactions""" - """ are used to encapsulate the effects of all commands that create new""" - """ changesets or propagate existing changesets into a repository.""" - """ For example, the following commands are transactional, and""" - """ their effects can be rolled back:<ul>""" + """<p>This performs a rollback of the last transaction.""" + """ Transactions are used to encapsulate the effects of all""" + """ commands that create new changesets or propagate existing""" + """ changesets into a repository. For example, the following""" + """ commands are transactional, and their effects can be""" + """ rolled back:<ul>""" """<li>commit</li>""" """<li>import</li>""" """<li>pull</li>""" """<li>push (with this repository as the destination)</li>""" """<li>unbundle</li>""" """</ul>""" - """</p><p><strong>This command is dangerous. Please use with care.""" - """</strong></p>""" + """</p><p><strong>This command is dangerous. Please use with""" + """ care. </strong></p>""" )) self.hgRollbackAct.triggered[()].connect(self.__hgRollback) self.actions.append(self.hgRollbackAct) @@ -826,7 +847,8 @@ )) self.hgImportAct.setWhatsThis(self.trUtf8( """<b>Import Patch</b>""" - """<p>This imports a patch from a patch file into the project.</p>""" + """<p>This imports a patch from a patch file into the""" + """ project.</p>""" )) self.hgImportAct.triggered[()].connect(self.__hgImport) self.actions.append(self.hgImportAct) @@ -867,8 +889,8 @@ self.hgGraftAct.setWhatsThis(self.trUtf8( """<b>Copy Changesets</b>""" """<p>This copies changesets from another branch on top of the""" - """ current working directory with the user, date and description""" - """ of the original changeset.</p>""" + """ current working directory with the user, date and""" + """ description of the original changeset.</p>""" )) self.hgGraftAct.triggered[()].connect(self.__hgGraft) self.actions.append(self.hgGraftAct) @@ -882,8 +904,8 @@ )) self.hgGraftContinueAct.setWhatsThis(self.trUtf8( """<b>Continue Copying Session</b>""" - """<p>This continues the last copying session after conflicts were""" - """ resolved.</p>""" + """<p>This continues the last copying session after conflicts""" + """ were resolved.</p>""" )) self.hgGraftContinueAct.triggered[()].connect(self.__hgGraftContinue) self.actions.append(self.hgGraftContinueAct) @@ -915,7 +937,8 @@ """<b>Remove...</b>""" """<p>Remove sub-repositories from the project.</p>""" )) - self.hgRemoveSubreposAct.triggered[()].connect(self.__hgRemoveSubrepositories) + self.hgRemoveSubreposAct.triggered[()].connect( + self.__hgRemoveSubrepositories) self.actions.append(self.hgRemoveSubreposAct) self.hgArchiveAct = E5Action(self.trUtf8('Create unversioned archive'), @@ -927,7 +950,8 @@ )) self.hgArchiveAct.setWhatsThis(self.trUtf8( """<b>Create unversioned archive...</b>""" - """<p>This creates an unversioned archive from the repository.</p>""" + """<p>This creates an unversioned archive from the""" + """ repository.</p>""" )) self.hgArchiveAct.triggered[()].connect(self.__hgArchive) self.actions.append(self.hgArchiveAct) @@ -1003,7 +1027,8 @@ for extensionMenuTitle in sorted(self.__extensionMenuTitles): extensionName = self.__extensionMenuTitles[extensionMenuTitle] self.extensionMenus[extensionName] = self.__extensionsMenu.addMenu( - self.__extensions[extensionName].initMenu(self.__extensionsMenu)) + self.__extensions[extensionName].initMenu( + self.__extensionsMenu)) self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) if self.vcs.version >= (2, 0): @@ -1025,7 +1050,8 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", + "mercurial.png")), self.vcs.vcsName(), self._vcsInfoDisplay) font = act.font() font.setBold(True) @@ -1122,7 +1148,8 @@ self.extensionMenus[extensionName].setEnabled( self.vcs.isExtensionActive(extensionName)) if not self.extensionMenus[extensionName].isEnabled() and \ - self.extensionMenus[extensionName].menu().isTearOffMenuVisible(): + self.extensionMenus[extensionName].menu()\ + .isTearOffMenuVisible(): self.extensionMenus[extensionName].menu().hideTearOffMenu() def __hgExtendedDiff(self): @@ -1139,13 +1166,15 @@ def __hgIncoming(self): """ - Private slot used to show the log of changes coming into the repository. + Private slot used to show the log of changes coming into the + repository. """ self.vcs.hgIncoming(self.project.ppath) def __hgOutgoing(self): """ - Private slot used to show the log of changes going out of the repository. + Private slot used to show the log of changes going out of the + repository. """ self.vcs.hgOutgoing(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -41,7 +41,8 @@ """<b>Purge Files</b>""" """<p>This deletes files and directories not known to Mercurial.""" """ That means that purge will delete:<ul>""" - """<li>unknown files (marked with "not tracked" in the status dialog)</li>""" + """<li>unknown files (marked with "not tracked" in the status""" + """ dialog)</li>""" """<li>empty directories</li>""" """</ul>Note that ignored files will be left untouched.</p>""" )) @@ -52,13 +53,15 @@ 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' + 'Delete files and directories not known to Mercurial including' + ' ignored ones' )) self.hgPurgeAllAct.setWhatsThis(self.trUtf8( """<b>Purge All Files</b>""" """<p>This deletes files and directories not known to Mercurial.""" """ That means that purge will delete:<ul>""" - """<li>unknown files (marked with "not tracked" in the status dialog)</li>""" + """<li>unknown files (marked with "not tracked" in the status""" + """ dialog)</li>""" """<li>empty directories</li>""" """<li>ignored files and directories</li>""" """</ul></p>""" @@ -81,17 +84,19 @@ self.hgPurgeListAct.triggered[()].connect(self.__hgPurgeList) self.actions.append(self.hgPurgeListAct) - self.hgPurgeAllListAct = E5Action(self.trUtf8('List All Files to be Purged'), - self.trUtf8('List All Files to be Purged...'), - 0, 0, self, 'mercurial_purge_all_list') + self.hgPurgeAllListAct = E5Action( + self.trUtf8('List All Files to be Purged'), + self.trUtf8('List All Files to be Purged...'), + 0, 0, self, 'mercurial_purge_all_list') self.hgPurgeAllListAct.setStatusTip(self.trUtf8( - 'List files and directories not known to Mercurial including ignored ones' + 'List files and directories not known to Mercurial including' + ' ignored ones' )) self.hgPurgeAllListAct.setWhatsThis(self.trUtf8( """<b>List All Files to be Purged</b>""" - """<p>This lists files and directories not known to Mercurial including""" - """ ignored ones. These would be deleted by the "Purge All Files" menu""" - """ entry.</p>""" + """<p>This lists files and directories not known to Mercurial""" + """ including ignored ones. These would be deleted by the""" + """ "Purge All Files" menu entry.</p>""" )) self.hgPurgeAllListAct.triggered[()].connect(self.__hgPurgeAllList) self.actions.append(self.hgPurgeAllListAct)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -10,7 +10,8 @@ import os from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem +from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, \ + QListWidgetItem from E5Gui import E5MessageBox @@ -106,7 +107,8 @@ @pyqtSlot(str) def on_patchSelector_activated(self, patch): """ - Private slot to get the list of guards defined for the given patch name. + Private slot to get the list of guards defined for the given patch + name. @param patch selected patch name (empty for current patch) """ @@ -149,8 +151,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace').strip() + output = str(process.readAllStandardOutput(), ioEncoding, + 'replace').strip() if output: patchName, guards = output.split(":", 1) @@ -235,7 +237,8 @@ """ res = E5MessageBox.yesNo(self, self.trUtf8("Remove Guards"), - self.trUtf8("""Do you really want to remove the selected guards?""")) + self.trUtf8( + """Do you really want to remove the selected guards?""")) if res: for guardItem in self.guardsList.selectedItems(): row = self.guardsList.row(guardItem) @@ -290,13 +293,15 @@ finished = process.waitForFinished(30000) if finished: if process.exitCode() != 0: - error = \ - str(process.readAllStandardError(), ioEncoding, 'replace') + error = str( + process.readAllStandardError(), ioEncoding, + 'replace') else: E5MessageBox.warning(self, self.trUtf8("Apply Guard Definitions"), - self.trUtf8("""The Mercurial process did not finish""" - """ in time.""")) + self.trUtf8( + """The Mercurial process did not finish""" + """ in time.""")) if error: E5MessageBox.warning(self, @@ -306,4 +311,5 @@ .format(error)) else: self.__dirtyList = False - self.on_patchSelector_activated(self.patchNameLabel.text()) + self.on_patchSelector_activated( + self.patchNameLabel.text())
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -52,7 +52,8 @@ """ Private slot to add a patch to the list of selected patches. """ - row = self.sourcePatches.indexOfTopLevelItem(self.sourcePatches.currentItem()) + row = self.sourcePatches.indexOfTopLevelItem( + self.sourcePatches.currentItem()) itm = self.sourcePatches.takeTopLevelItem(row) curItm = self.selectedPatches.currentItem() @@ -69,7 +70,8 @@ """ Private slot to remove a patch from the list of selected patches. """ - row = self.selectedPatches.indexOfTopLevelItem(self.selectedPatches.currentItem()) + row = self.selectedPatches.indexOfTopLevelItem( + self.selectedPatches.currentItem()) itm = self.selectedPatches.takeTopLevelItem(row) self.sourcePatches.addTopLevelItem(itm) self.sourcePatches.sortItems(0, Qt.AscendingOrder) @@ -81,7 +83,8 @@ """ Private slot to move a patch up in the list. """ - row = self.selectedPatches.indexOfTopLevelItem(self.selectedPatches.currentItem()) + row = self.selectedPatches.indexOfTopLevelItem( + self.selectedPatches.currentItem()) if row > 0: targetRow = row - 1 itm = self.selectedPatches.takeTopLevelItem(row) @@ -93,7 +96,8 @@ """ Private slot to move a patch down in the list. """ - row = self.selectedPatches.indexOfTopLevelItem(self.selectedPatches.currentItem()) + row = self.selectedPatches.indexOfTopLevelItem( + self.selectedPatches.currentItem()) if row < self.selectedPatches.topLevelItemCount() - 1: targetRow = row + 1 itm = self.selectedPatches.takeTopLevelItem(row) @@ -106,23 +110,27 @@ Private slot to react on changes of the current item of source patches. @param current reference to the new current item (QTreeWidgetItem) - @param previous reference to the previous current item (QTreeWidgetItem) + @param previous reference to the previous current item + (QTreeWidgetItem) """ self.addButton.setEnabled(current is not None) @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) def on_selectedPatches_currentItemChanged(self, current, previous): """ - Private slot to react on changes of the current item of selected patches. + Private slot to react on changes of the current item of selected + patches. @param current reference to the new current item (QTreeWidgetItem) - @param previous reference to the previous current item (QTreeWidgetItem) + @param previous reference to the previous current item + (QTreeWidgetItem) """ self.removeButton.setEnabled(current is not None) row = self.selectedPatches.indexOfTopLevelItem(current) self.upButton.setEnabled(row > 0) - self.downButton.setEnabled(row < self.selectedPatches.topLevelItemCount() - 1) + self.downButton.setEnabled( + row < self.selectedPatches.topLevelItemCount() - 1) def getData(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -7,7 +7,8 @@ Module implementing a dialog to select a list of guards. """ -from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, QAbstractItemView +from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, \ + QAbstractItemView from .Ui_HgQueuesGuardsSelectionDialog import Ui_HgQueuesGuardsSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -21,7 +21,8 @@ class HgQueuesHeaderDialog(QDialog, Ui_HgQueuesHeaderDialog): """ - Class implementing a dialog to show the commit message of the current patch. + Class implementing a dialog to show the commit message of the current + patch. """ def __init__(self, vcs, parent=None): """ @@ -112,7 +113,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -123,7 +125,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.process = None
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -10,8 +10,8 @@ import os from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ - QLineEdit +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox @@ -22,7 +22,8 @@ class HgQueuesListDialog(QDialog, Ui_HgQueuesListDialog): """ - Class implementing a dialog to show a list of applied and unapplied patches. + Class implementing a dialog to show a list of applied and unapplied + patches. """ def __init__(self, vcs, parent=None): """ @@ -100,11 +101,11 @@ def __getSeries(self, missing=False): """ - Private slot to get the list of applied, unapplied and guarded patches and - patches missing in the series file. + Private slot to get the list of applied, unapplied and guarded patches + and patches missing in the series file. - @param missing flag indicating to get the patches missing in the series file - (boolean) + @param missing flag indicating to get the patches missing in the + series file (boolean) """ if missing: self.__mode = "missing" @@ -199,7 +200,8 @@ def __finish(self): """ - Private slot called when the process finished or the user pressed the button. + Private slot called when the process finished or the user pressed + the button. """ if self.process is not None and \ self.process.state() != QProcess.NotRunning: @@ -213,13 +215,15 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) self.process = None if self.patchesList.topLevelItemCount() == 0: # no patches present - self.__generateItem(0, "", self.trUtf8("no patches found"), "", True) + self.__generateItem( + 0, "", self.trUtf8("no patches found"), "", True) self.__resizeColumns() self.__resort()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -117,8 +117,8 @@ flag indicating to set the user, a flag indicating to use the current user and the user name and another tuple giving a flag indicating to set the date, a flag indicating to use the - current date and the date (string, string, (boolean, boolean, string), - (boolean, boolean, string)) + current date and the date (string, string, (boolean, boolean, + string), (boolean, boolean, string)) """ userData = (self.userGroup.isChecked(), self.currentUserCheckBox.isChecked(),
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -8,8 +8,8 @@ """ from PyQt4.QtCore import pyqtSlot, QProcess, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem, \ - QAbstractButton +from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractItemView, \ + QListWidgetItem, QAbstractButton from .Ui_HgQueuesQueueManagementDialog import Ui_HgQueuesQueueManagementDialog @@ -32,8 +32,8 @@ HgQueuesQueueManagementDialog.NAME_INPUT, HgQueuesQueueManagementDialog.QUEUE_INPUT) @param title title for the dialog (string) - @param suppressActive flag indicating to not show the name of the active - queue (boolean) + @param suppressActive flag indicating to not show the name of the + active queue (boolean) @param repodir name of the repository directory (string) @param vcs reference to the vcs object @param parent reference to the parent widget (QWidget) @@ -52,21 +52,26 @@ self.__suppressActive = suppressActive self.__hgClient = vcs.getClient() - self.inputFrame.setHidden(mode != HgQueuesQueueManagementDialog.NAME_INPUT) - self.selectLabel.setHidden(mode != HgQueuesQueueManagementDialog.QUEUE_INPUT) + self.inputFrame.setHidden( + mode != HgQueuesQueueManagementDialog.NAME_INPUT) + self.selectLabel.setHidden( + mode != HgQueuesQueueManagementDialog.QUEUE_INPUT) if mode != HgQueuesQueueManagementDialog.QUEUE_INPUT: self.queuesList.setSelectionMode(QAbstractItemView.NoSelection) if mode == HgQueuesQueueManagementDialog.NO_INPUT: - self.buttonBox.removeButton(self.buttonBox.button(QDialogButtonBox.Ok)) - self.buttonBox.removeButton(self.buttonBox.button(QDialogButtonBox.Cancel)) + self.buttonBox.removeButton( + self.buttonBox.button(QDialogButtonBox.Ok)) + self.buttonBox.removeButton( + self.buttonBox.button(QDialogButtonBox.Cancel)) self.refreshButton = self.buttonBox.addButton( self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( self.trUtf8("Press to refresh the queues list")) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) else: - self.buttonBox.removeButton(self.buttonBox.button(QDialogButtonBox.Close)) + self.buttonBox.removeButton( + self.buttonBox.button(QDialogButtonBox.Close)) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) self.refreshButton = None @@ -79,10 +84,11 @@ def __getQueuesList(self): """ - Public method to get a list of all queues and the name of the active queue. + Public method to get a list of all queues and the name of the active + queue. - @return tuple with a list of all queues and the name of the active queue - (list of strings, string) + @return tuple with a list of all queues and the name of the active + queue (list of strings, string) """ queuesList = [] activeQueue = "" @@ -103,8 +109,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace') + output = str( + process.readAllStandardOutput(), ioEncoding, 'replace') for queue in output.splitlines(): queue = queue.strip()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -39,8 +39,8 @@ )) self.hgQueueInitAct.setWhatsThis(self.trUtf8( """<b>Init Queue Repository</b>""" - """<p>This initializes a new versioned queue repository inside the""" - """ current repository.</p>""" + """<p>This initializes a new versioned queue repository inside""" + """ the current repository.</p>""" )) self.hgQueueInitAct.triggered[()].connect(self.__hgQueueInit) self.actions.append(self.hgQueueInitAct) @@ -82,7 +82,8 @@ """<b>Update Current Patch</b>""" """<p>This updates the current patch.</p>""" )) - self.hgQueueRefreshAct.triggered[()].connect(self.__hgQueueRefreshPatch) + self.hgQueueRefreshAct.triggered[()].connect( + self.__hgQueueRefreshPatch) self.actions.append(self.hgQueueRefreshAct) self.hgQueueRefreshMessageAct = E5Action( @@ -94,8 +95,8 @@ )) self.hgQueueRefreshMessageAct.setWhatsThis(self.trUtf8( """<b>Update Current Patch (with Message)</b>""" - """<p>This updates the current patch after giving the chance to change""" - """ the current commit message.</p>""" + """<p>This updates the current patch after giving the chance""" + """ to change the current commit message.</p>""" )) self.hgQueueRefreshMessageAct.triggered[()].connect( self.__hgQueueRefreshPatchMessage) @@ -153,7 +154,8 @@ """<p>This finishes the applied patches by moving them out of""" """ mq control into regular repository history.</p>""" )) - self.hgQueueFinishAct.triggered[()].connect(self.__hgQueueFinishAppliedPatches) + self.hgQueueFinishAct.triggered[()].connect( + self.__hgQueueFinishAppliedPatches) self.actions.append(self.hgQueueFinishAct) self.hgQueueRenameAct = E5Action(self.trUtf8('Rename Patch'), @@ -192,7 +194,8 @@ """<b>Fold Patches</b>""" """<p>This folds unapplied patches into the current patch.</p>""" )) - self.hgQueueFoldAct.triggered[()].connect(self.__hgQueueFoldUnappliedPatches) + self.hgQueueFoldAct.triggered[()].connect( + self.__hgQueueFoldUnappliedPatches) self.actions.append(self.hgQueueFoldAct) self.hgQueueStatusAct = E5Action(self.trUtf8('Show Status'), @@ -225,7 +228,8 @@ )) self.hgQueuePushAct.setWhatsThis(self.trUtf8( """<b>Push Next Patch</b>""" - """<p>This pushes the next patch onto the stack of applied patches.</p>""" + """<p>This pushes the next patch onto the stack of applied""" + """ patches.</p>""" )) self.hgQueuePushAct.triggered[()].connect(self.__hgQueuePushPatch) self.actions.append(self.hgQueuePushAct) @@ -238,9 +242,11 @@ )) self.hgQueuePushAllAct.setWhatsThis(self.trUtf8( """<b>Push All Patches</b>""" - """<p>This pushes all patches onto the stack of applied patches.</p>""" + """<p>This pushes all patches onto the stack of applied""" + """ patches.</p>""" )) - self.hgQueuePushAllAct.triggered[()].connect(self.__hgQueuePushAllPatches) + self.hgQueuePushAllAct.triggered[()].connect( + self.__hgQueuePushAllPatches) self.actions.append(self.hgQueuePushAllAct) self.hgQueuePushUntilAct = E5Action(self.trUtf8('Push Patches'), @@ -251,10 +257,11 @@ )) self.hgQueuePushUntilAct.setWhatsThis(self.trUtf8( """<b>Push Patches</b>""" - """<p>This pushes patches onto the stack of applied patches until""" - """ a named patch is at the top of the stack.</p>""" + """<p>This pushes patches onto the stack of applied patches""" + """ until a named patch is at the top of the stack.</p>""" )) - self.hgQueuePushUntilAct.triggered[()].connect(self.__hgQueuePushPatches) + self.hgQueuePushUntilAct.triggered[()].connect( + self.__hgQueuePushPatches) self.actions.append(self.hgQueuePushUntilAct) self.hgQueuePopAct = E5Action(self.trUtf8('Pop Current Patch'), @@ -265,7 +272,8 @@ )) self.hgQueuePopAct.setWhatsThis(self.trUtf8( """<b>Pop Current Patch</b>""" - """<p>This pops the current patch off the stack of applied patches.</p>""" + """<p>This pops the current patch off the stack of applied""" + """ patches.</p>""" )) self.hgQueuePopAct.triggered[()].connect(self.__hgQueuePopPatch) self.actions.append(self.hgQueuePopAct) @@ -278,9 +286,11 @@ )) self.hgQueuePopAllAct.setWhatsThis(self.trUtf8( """<b>Pop All Patches</b>""" - """<p>This pops all patches off the stack of applied patches.</p>""" + """<p>This pops all patches off the stack of applied""" + """ patches.</p>""" )) - self.hgQueuePopAllAct.triggered[()].connect(self.__hgQueuePopAllPatches) + self.hgQueuePopAllAct.triggered[()].connect( + self.__hgQueuePopAllPatches) self.actions.append(self.hgQueuePopAllAct) self.hgQueuePopUntilAct = E5Action(self.trUtf8('Pop Patches'), @@ -291,8 +301,8 @@ )) self.hgQueuePopUntilAct.setWhatsThis(self.trUtf8( """<b>Pop Patches</b>""" - """<p>This pops patches off the stack of applied patches until a named""" - """ patch is at the top of the stack.</p>""" + """<p>This pops patches off the stack of applied patches""" + """ until a named patch is at the top of the stack.</p>""" )) self.hgQueuePopUntilAct.triggered[()].connect(self.__hgQueuePopPatches) self.actions.append(self.hgQueuePopUntilAct) @@ -323,10 +333,11 @@ )) self.hgQueuePushForceAct.setWhatsThis(self.trUtf8( """<b>Push Next Patch</b>""" - """<p>This pushes the next patch onto the stack of applied patches""" - """ on top of local changes.</p>""" + """<p>This pushes the next patch onto the stack of applied""" + """ patches on top of local changes.</p>""" )) - self.hgQueuePushForceAct.triggered[()].connect(self.__hgQueuePushPatchForced) + self.hgQueuePushForceAct.triggered[()].connect( + self.__hgQueuePushPatchForced) self.actions.append(self.hgQueuePushForceAct) self.hgQueuePushAllForceAct = E5Action(self.trUtf8('Push All Patches'), @@ -352,8 +363,9 @@ )) self.hgQueuePushUntilForceAct.setWhatsThis(self.trUtf8( """<b>Push Patches</b>""" - """<p>This pushes patches onto the stack of applied patches until""" - """ a named patch is at the top of the stack on top of local changes.</p>""" + """<p>This pushes patches onto the stack of applied patches""" + """ until a named patch is at the top of the stack on top of""" + """ local changes.</p>""" )) self.hgQueuePushUntilForceAct.triggered[()].connect( self.__hgQueuePushPatchesForced) @@ -367,10 +379,12 @@ )) self.hgQueuePopForceAct.setWhatsThis(self.trUtf8( """<b>Pop Current Patch</b>""" - """<p>This pops the current patch off the stack of applied patches""" + """<p>This pops the current patch off the stack of applied""" + """ patches""" """ forgetting local changes.</p>""" )) - self.hgQueuePopForceAct.triggered[()].connect(self.__hgQueuePopPatchForced) + self.hgQueuePopForceAct.triggered[()].connect( + self.__hgQueuePopPatchForced) self.actions.append(self.hgQueuePopForceAct) self.hgQueuePopAllForceAct = E5Action(self.trUtf8('Pop All Patches'), @@ -396,25 +410,28 @@ )) self.hgQueuePopUntilForceAct.setWhatsThis(self.trUtf8( """<b>Pop Patches</b>""" - """<p>This pops patches off the stack of applied patches until a named""" - """ patch is at the top of the stack forgetting local changes.</p>""" + """<p>This pops patches off the stack of applied patches until""" + """ a named patch is at the top of the stack forgetting local""" + """ changes.</p>""" )) - self.hgQueuePopUntilForceAct.triggered[()].connect(self.__hgQueuePopPatchesForced) + self.hgQueuePopUntilForceAct.triggered[()].connect( + 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.setStatusTip(self.trUtf8( - 'Push or pop patches until named patch is at top of stack overwriting' - ' any local changes' + 'Push or pop patches until named patch is at top of stack' + ' overwriting any local changes' )) self.hgQueueGotoForceAct.setWhatsThis(self.trUtf8( """<b>Go to Patch</b>""" """<p>This pushes or pops patches until a named patch is at the""" """ top of the stack overwriting any local changes.</p>""" )) - self.hgQueueGotoForceAct.triggered[()].connect(self.__hgQueueGotoPatchForced) + self.hgQueueGotoForceAct.triggered[()].connect( + self.__hgQueueGotoPatchForced) self.actions.append(self.hgQueueGotoForceAct) def __initGuardsActions(self): @@ -432,7 +449,8 @@ """<p>This opens a dialog to define guards for the current""" """ or a named patch.</p>""" )) - self.hgQueueDefineGuardsAct.triggered[()].connect(self.__hgQueueGuardsDefine) + self.hgQueueDefineGuardsAct.triggered[()].connect( + self.__hgQueueGuardsDefine) self.actions.append(self.hgQueueDefineGuardsAct) self.hgQueueDropAllGuardsAct = E5Action(self.trUtf8('Drop All Guards'), @@ -445,7 +463,8 @@ """<b>Drop All Guards</b>""" """<p>This drops all guards of the current or a named patch.</p>""" )) - self.hgQueueDropAllGuardsAct.triggered[()].connect(self.__hgQueueGuardsDropAll) + self.hgQueueDropAllGuardsAct.triggered[()].connect( + self.__hgQueueGuardsDropAll) self.actions.append(self.hgQueueDropAllGuardsAct) self.hgQueueListGuardsAct = E5Action(self.trUtf8('List Guards'), @@ -458,7 +477,8 @@ """<b>List Guards</b>""" """<p>This lists the guards of the current or a named patch.</p>""" )) - self.hgQueueListGuardsAct.triggered[()].connect(self.__hgQueueGuardsList) + self.hgQueueListGuardsAct.triggered[()].connect( + self.__hgQueueGuardsList) self.actions.append(self.hgQueueListGuardsAct) self.hgQueueListAllGuardsAct = E5Action(self.trUtf8('List All Guards'), @@ -471,12 +491,14 @@ """<b>List All Guards</b>""" """<p>This lists all guards of all patches.</p>""" )) - self.hgQueueListAllGuardsAct.triggered[()].connect(self.__hgQueueGuardsListAll) + self.hgQueueListAllGuardsAct.triggered[()].connect( + self.__hgQueueGuardsListAll) self.actions.append(self.hgQueueListAllGuardsAct) - self.hgQueueActivateGuardsAct = E5Action(self.trUtf8('Set Active Guards'), - self.trUtf8('Set Active Guards...'), - 0, 0, self, 'mercurial_queues_guards_set_active') + self.hgQueueActivateGuardsAct = E5Action( + self.trUtf8('Set Active Guards'), + self.trUtf8('Set Active Guards...'), + 0, 0, self, 'mercurial_queues_guards_set_active') self.hgQueueActivateGuardsAct.setStatusTip(self.trUtf8( 'Set the list of active guards' )) @@ -484,12 +506,14 @@ """<b>Set Active Guards</b>""" """<p>This opens a dialog to set the active guards.</p>""" )) - self.hgQueueActivateGuardsAct.triggered[()].connect(self.__hgQueueGuardsSetActive) + self.hgQueueActivateGuardsAct.triggered[()].connect( + self.__hgQueueGuardsSetActive) self.actions.append(self.hgQueueActivateGuardsAct) - self.hgQueueDeactivateGuardsAct = E5Action(self.trUtf8('Deactivate Guards'), - self.trUtf8('Deactivate Guards...'), - 0, 0, self, 'mercurial_queues_guards_deactivate') + self.hgQueueDeactivateGuardsAct = E5Action( + self.trUtf8('Deactivate Guards'), + self.trUtf8('Deactivate Guards...'), + 0, 0, self, 'mercurial_queues_guards_deactivate') self.hgQueueDeactivateGuardsAct.setStatusTip(self.trUtf8( 'Deactivate all active guards' )) @@ -566,7 +590,8 @@ 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' + 'Delete the reference to a patch queue and remove the patch' + ' directory' )) self.hgQueuePurgeQueueAct.setWhatsThis(self.trUtf8( """<b>Purge Queue</b>""" @@ -719,7 +744,8 @@ Private slot used to refresh the current patch and its commit message. """ self.vcs.getExtensionObject("mq")\ - .hgQueueRefreshPatch(self.project.getProjectPath(), editMessage=True) + .hgQueueRefreshPatch(self.project.getProjectPath(), + editMessage=True) def __hgQueueShowPatch(self): """ @@ -738,7 +764,8 @@ def __hgQueuePushPopPatches(self, name, operation, all=False, named=False, force=False): """ - Private method to push patches onto the stack or pop patches off the stack. + Private method to push patches onto the stack or pop patches off the + stack. @param name file/directory name (string) @param operation operation type to be performed (Queues.POP, @@ -749,8 +776,8 @@ @keyparam force flag indicating a forceful pop (boolean) """ shouldReopen = self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(name, operation=operation, all=all, named=named, - force=force) + .hgQueuePushPopPatches(name, operation=operation, all=all, + named=named, force=force) if shouldReopen: res = E5MessageBox.yesNo(None, self.trUtf8("Changing Applied Patches"),
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Oct 12 15:01:28 2013 +0200 @@ -112,8 +112,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace') + output = str( + process.readAllStandardOutput(), ioEncoding, 'replace') for line in output.splitlines(): if withSummary: @@ -216,8 +216,8 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = \ - str(process.readAllStandardOutput(), ioEncoding, 'replace') + output = str( + process.readAllStandardOutput(), ioEncoding, 'replace') for guard in output.splitlines(): guard = guard.strip() @@ -346,9 +346,11 @@ QApplication.processEvents() self.qheaderDialog.start(name) - def hgQueuePushPopPatches(self, name, operation, all=False, named=False, force=False): + def hgQueuePushPopPatches(self, name, operation, all=False, named=False, + force=False): """ - Public method to push patches onto the stack or pop patches off the stack. + Public method to push patches onto the stack or pop patches off the + stack. @param name file/directory name (string) @param operation operation type to be performed (Queues.POP, @@ -467,7 +469,8 @@ if patchnames: currentPatch = self.__getCurrentPatch(repodir) if currentPatch: - from .HgQueuesRenamePatchDialog import HgQueuesRenamePatchDialog + from .HgQueuesRenamePatchDialog import \ + HgQueuesRenamePatchDialog dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) if dlg.exec_() == QDialog.Accepted: newName, selectedPatch = dlg.getData() @@ -495,7 +498,8 @@ args = [] args.append("qdelete") - patchnames = sorted(self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST)) + patchnames = sorted(self.__getPatchesList(repodir, + Queues.UNAPPLIED_LIST)) if patchnames: patch, ok = QInputDialog.getItem( None, @@ -531,7 +535,8 @@ args = [] args.append("qfold") patchnames = sorted( - self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST, withSummary=True)) + self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST, + withSummary=True)) if patchnames: from .HgQueuesFoldDialog import HgQueuesFoldDialog dlg = HgQueuesFoldDialog(patchnames) @@ -573,7 +578,8 @@ self.__getPatchesList(repodir, Queues.SERIES_LIST)) if patchnames: from .HgQueuesListGuardsDialog import HgQueuesListGuardsDialog - self.queuesListGuardsDialog = HgQueuesListGuardsDialog(self.vcs, patchnames) + self.queuesListGuardsDialog = \ + HgQueuesListGuardsDialog(self.vcs, patchnames) self.queuesListGuardsDialog.show() self.queuesListGuardsDialog.start(name) else: @@ -679,7 +685,8 @@ guardsList = self.getGuardsList(repodir) if guardsList: activeGuardsList = self.getGuardsList(repodir, all=False) - from .HgQueuesGuardsSelectionDialog import HgQueuesGuardsSelectionDialog + from .HgQueuesGuardsSelectionDialog import \ + HgQueuesGuardsSelectionDialog dlg = HgQueuesGuardsSelectionDialog( guardsList, activeGuards=activeGuardsList, listOnly=False) if dlg.exec_() == QDialog.Accepted: @@ -736,7 +743,8 @@ guardsList = self.getGuardsList(repodir, all=False) if guardsList: - from .HgQueuesGuardsSelectionDialog import HgQueuesGuardsSelectionDialog + from .HgQueuesGuardsSelectionDialog import \ + HgQueuesGuardsSelectionDialog dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True) dlg.exec_() @@ -758,8 +766,10 @@ title = self.trUtf8("Create New Queue") else: title = self.trUtf8("Rename Active Queue") - from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog - dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.NAME_INPUT, + from .HgQueuesQueueManagementDialog import \ + HgQueuesQueueManagementDialog + dlg = HgQueuesQueueManagementDialog( + HgQueuesQueueManagementDialog.NAME_INPUT, title, False, repodir, self.vcs) if dlg.exec_() == QDialog.Accepted: queueName = dlg.getData() @@ -831,8 +841,10 @@ else: raise ValueError("illegal value for operation") - from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog - dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.QUEUE_INPUT, + from .HgQueuesQueueManagementDialog import \ + HgQueuesQueueManagementDialog + dlg = HgQueuesQueueManagementDialog( + HgQueuesQueueManagementDialog.QUEUE_INPUT, title, True, repodir, self.vcs) if dlg.exec_() == QDialog.Accepted: queueName = dlg.getData() @@ -892,7 +904,8 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog + from .HgQueuesQueueManagementDialog import \ + HgQueuesQueueManagementDialog self.queuesListQueuesDialog = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NO_INPUT, self.trUtf8("Available Queues"), @@ -917,7 +930,8 @@ args.append('--mq') args.append(repodir) # init is not possible with the command server - dia = HgDialog(self.trUtf8('Initializing new queue repository'), self.vcs) + dia = HgDialog( + self.trUtf8('Initializing new queue repository'), self.vcs) res = dia.startProcess(args) if res: dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -17,7 +17,8 @@ """ Class implementing a dialog to enter the data for a rebase session. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor @@ -261,11 +262,12 @@ """ Private method to retrieve the data for the rebase session. - @return tuple with a source indicator of "S" or "B", the source revision, the - destination revision, a flag indicating to collapse, a flag indicating to - keep the original changesets, a flag indicating to keep the original branch - name and a flag indicating to detach the source (string, string, string, - boolean, boolean, boolean, boolean) + @return tuple with a source indicator of "S" or "B", the source + revision, the destination revision, a flag indicating to collapse, + a flag indicating to keep the original changesets, a flag + indicating to keep the original branch name and a flag indicating + to detach the source (string, string, string, boolean, boolean, + boolean, boolean) """ if self.sourceButton.isChecked(): indicator = "S"
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Sat Oct 12 15:01:28 2013 +0200 @@ -44,7 +44,8 @@ res = False if self.vcs.isExtensionActive("bookmarks"): bookmarksList = \ - self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.vcs.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgRebaseDialog import HgRebaseDialog @@ -52,8 +53,8 @@ self.vcs.hgGetBranchesList(repodir), bookmarksList) if dlg.exec_() == QDialog.Accepted: - indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \ - dlg.getData() + (indicator, sourceRev, destRev, collapse, keep, keepBranches, + detach) = dlg.getData() args = [] args.append("rebase")
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Sat Oct 12 15:01:28 2013 +0200 @@ -54,8 +54,9 @@ )) self.hgTransplantAct.setWhatsThis(self.trUtf8( """<b>Transplant Changesets</b>""" - """<p>This transplants changesets from another branch on top of the""" - """ current working directory with the log of the original changeset.</p>""" + """<p>This transplants changesets from another branch on top""" + """ of the current working directory with the log of the""" + """ original changeset.</p>""" )) self.hgTransplantAct.triggered[()].connect(self.__hgTransplant) self.actions.append(self.hgTransplantAct) @@ -69,9 +70,11 @@ )) self.hgTransplantContinueAct.setWhatsThis(self.trUtf8( """<b>Continue Transplant Session</b>""" - """<p>This continues the last transplant session after repair.</p>""" + """<p>This continues the last transplant session after""" + """ repair.</p>""" )) - self.hgTransplantContinueAct.triggered[()].connect(self.__hgTransplantContinue) + self.hgTransplantContinueAct.triggered[()].connect( + self.__hgTransplantContinue) self.actions.append(self.hgTransplantContinueAct) def initMenu(self, mainMenu): @@ -85,7 +88,8 @@ menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) if self.vcs.version >= (2, 3): # transplant is deprecated as of Mercurial 2.3 - menu.addAction(self.trUtf8("Transplant is deprecated")).setEnabled(False) + menu.addAction( + self.trUtf8("Transplant is deprecated")).setEnabled(False) else: menu.setTearOffEnabled(True)
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sat Oct 12 15:01:28 2013 +0200 @@ -21,7 +21,8 @@ """ Constructor - @param multiRevsAllowed flag indicating, if multi revs are allowed (boolean) + @param multiRevsAllowed flag indicating, if multi revs are allowed + (boolean) @param parent reference to the parent object (QObject) """ super().__init__(parent) @@ -93,7 +94,8 @@ Private slot to update the state of the OK button. """ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.revisionsEdit.toPlainText() != "" or self.allCheckBox.isChecked()) + self.revisionsEdit.toPlainText() != "" or + self.allCheckBox.isChecked()) @pyqtSlot() def on_revisionsEdit_textChanged(self):
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Sat Oct 12 15:01:28 2013 +0200 @@ -45,7 +45,8 @@ res = False dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) if dlg.exec_() == QDialog.Accepted: - revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = dlg.getData() + revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = \ + dlg.getData() args = [] args.append("transplant") @@ -95,7 +96,8 @@ args.append("--continue") args.append("--verbose") - dia = HgDialog(self.trUtf8('Transplant Changesets (Continue)'), self.vcs) + dia = HgDialog( + self.trUtf8('Transplant Changesets (Continue)'), self.vcs) res = dia.startProcess(args, repodir) if res: dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Oct 11 19:51:20 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 12 15:01:28 2013 +0200 @@ -34,8 +34,8 @@ Class implementing the version control systems interface to Mercurial. @signal committed() emitted after the commit action has completed - @signal activeExtensionsChanged() emitted when the list of active extensions - has changed + @signal activeExtensionsChanged() emitted when the list of active + extensions has changed """ committed = pyqtSignal() activeExtensionsChanged = pyqtSignal() @@ -195,7 +195,8 @@ """ Public method used to test for the presence of the hg executable. - @return flag indicating the existance (boolean) and an error message (string) + @return flag indicating the existance (boolean) and an error message + (string) """ self.versionStr = '' errMsg = "" @@ -224,11 +225,12 @@ return True, errMsg else: if finished: - errMsg = \ - self.trUtf8("The hg process finished with the exit code {0}")\ + errMsg = self.trUtf8( + "The hg process finished with the exit code {0}")\ .format(process.exitCode()) else: - errMsg = self.trUtf8("The hg process did not finish within 30s.") + errMsg = self.trUtf8( + "The hg process did not finish within 30s.") else: errMsg = self.trUtf8("Could not start the hg executable.") @@ -238,8 +240,9 @@ """ Public method used to initialize the mercurial repository. - The initialization is done, when a project is converted into a Mercurial - controlled project. Therefore we always return TRUE without doing anything. + The initialization is done, when a project is converted into a + Mercurial controlled project. Therefore we always return TRUE without + doing anything. @param vcsDir name of the VCS directory (string) @param noDialog flag indicating quiet operations (boolean) @@ -249,7 +252,8 @@ def vcsConvertProject(self, vcsDataDict, project): """ - Public method to convert an uncontrolled project to a version controlled project. + Public method to convert an uncontrolled project to a version + controlled project. @param vcsDataDict dictionary of data required for the conversion @param project reference to the project object @@ -258,7 +262,8 @@ if not success: E5MessageBox.critical(self.__ui, self.trUtf8("Create project repository"), - self.trUtf8("""The project repository could not be created.""")) + self.trUtf8( + """The project repository could not be created.""")) else: pfn = project.pfile if not os.path.isfile(pfn): @@ -268,7 +273,7 @@ def vcsImport(self, vcsDataDict, projectDir, noDialog=False): """ - Public method used to import the project into the Subversion repository. + Public method used to import the project into the Mercurial repository. @param vcsDataDict dictionary of data required for the import @param projectDir project directory (string) @@ -301,8 +306,9 @@ args.append('--addremove') args.append('--message') args.append(msg) - dia = HgDialog(self.trUtf8('Initial commit to Mercurial repository'), - self) + dia = HgDialog( + self.trUtf8('Initial commit to Mercurial repository'), + self) res = dia.startProcess(args, projectDir) if res: dia.exec_() @@ -312,7 +318,8 @@ def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): """ - Public method used to check the project out of a Mercurial repository (clone). + Public method used to check the project out of a Mercurial repository + (clone). @param vcsDataDict dictionary of data required for the checkout @param projectDir project directory to create (string) @@ -347,8 +354,9 @@ out, err = self.__client.runcommand(args) return err == "" else: - dia = HgDialog(self.trUtf8('Cloning project from a Mercurial repository'), - self) + dia = HgDialog( + self.trUtf8('Cloning project from a Mercurial repository'), + self) res = dia.startProcess(args) if res: dia.exec_() @@ -356,7 +364,7 @@ def vcsExport(self, vcsDataDict, projectDir): """ - Public method used to export a directory from the Subversion repository. + Public method used to export a directory from the Mercurial repository. @param vcsDataDict dictionary of data required for the checkout @param projectDir project directory to create (string) @@ -368,12 +376,14 @@ os.remove(os.path.join(projectDir, '.hgignore')) return status - def vcsCommit(self, name, message, noDialog=False, closeBranch=False, mq=False): + def vcsCommit(self, name, message, noDialog=False, closeBranch=False, + mq=False): """ - Public method used to make the change of a file/directory permanent in the - Mercurial repository. + Public method used to make the change of a file/directory permanent + in the Mercurial repository. - @param name file/directory name to be committed (string or list of strings) + @param name file/directory name to be committed (string or list of + strings) @param message message for this operation (string) @param noDialog flag indicating quiet operations @keyparam closeBranch flag indicating a close branch commit (boolean) @@ -426,11 +436,14 @@ if os.path.isdir(nam): project = e5App().getObject("Project") if nam == project.getProjectPath(): - ok &= project.checkAllScriptsDirty(reportSyntaxErrors=True) and \ - project.checkDirty() + ok &= \ + project.checkAllScriptsDirty( + reportSyntaxErrors=True) and \ + project.checkDirty() continue elif os.path.isfile(nam): - editor = e5App().getObject("ViewManager").getOpenEditor(nam) + editor = \ + e5App().getObject("ViewManager").getOpenEditor(nam) if editor: ok &= editor.checkDirty() if not ok: @@ -439,8 +452,9 @@ if not ok: res = E5MessageBox.yesNo(self.__ui, self.trUtf8("Commit Changes"), - self.trUtf8("""The commit affects files, that have unsaved""" - """ changes. Shall the commit be continued?"""), + self.trUtf8( + """The commit affects files, that have unsaved""" + """ changes. Shall the commit be continued?"""), icon=E5MessageBox.Warning) if not res: return @@ -503,8 +517,9 @@ if noDialog: self.startSynchronizedProcess(QProcess(), "hg", args, dname) else: - dia = HgDialog(self.trUtf8('Committing changes to Mercurial repository'), - self) + dia = HgDialog( + self.trUtf8('Committing changes to Mercurial repository'), + self) res = dia.startProcess(args, dname) if res: dia.exec_() @@ -518,9 +533,11 @@ def vcsUpdate(self, name, noDialog=False, revision=None): """ - Public method used to update a file/directory with the Mercurial repository. + Public method used to update a file/directory with the Mercurial + repository. - @param name file/directory name to be updated (string or list of strings) + @param name file/directory name to be updated (string or list of + strings) @param noDialog flag indicating quiet operations (boolean) @keyparam revision revision to update to (string) @return flag indicating, that the update contained an add @@ -555,8 +572,9 @@ out, err = self.__client.runcommand(args) res = False else: - dia = HgDialog(self.trUtf8('Synchronizing with the Mercurial repository'), - self) + dia = HgDialog(self.trUtf8( + 'Synchronizing with the Mercurial repository'), + self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -608,7 +626,9 @@ out, err = self.__client.runcommand(args) else: dia = HgDialog( - self.trUtf8('Adding files/directories to the Mercurial repository'), self) + self.trUtf8( + 'Adding files/directories to the Mercurial repository'), + self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -625,20 +645,25 @@ def vcsAddTree(self, path): """ - Public method to add a directory tree rooted at path to the Mercurial repository. + Public method to add a directory tree rooted at path to the Mercurial + repository. - @param path root directory of the tree to be added (string or list of strings)) + @param path root directory of the tree to be added (string or list of + strings)) """ self.vcsAdd(path, isDir=False) def vcsRemove(self, name, project=False, noDialog=False): """ - Public method used to remove a file/directory from the Mercurial repository. + Public method used to remove a file/directory from the Mercurial + repository. The default operation is to remove the local copy as well. - @param name file/directory name to be removed (string or list of strings)) - @param project flag indicating deletion of a project tree (boolean) (not needed) + @param name file/directory name to be removed (string or list of + strings)) + @param project flag indicating deletion of a project tree (boolean) + (not needed) @param noDialog flag indicating quiet operations @return flag indicating successfull operation (boolean) """ @@ -666,13 +691,16 @@ if noDialog: if self.__client is None: - res = self.startSynchronizedProcess(QProcess(), 'hg', args, repodir) + res = self.startSynchronizedProcess( + QProcess(), 'hg', args, repodir) else: out, err = self.__client.runcommand(args) res = err == "" else: dia = HgDialog( - self.trUtf8('Removing files/directories from the Mercurial repository'), + self.trUtf8( + 'Removing files/directories from the Mercurial' + ' repository'), self) res = dia.startProcess(args, repodir) if res: @@ -730,7 +758,8 @@ if noDialog: if self.__client is None: - res = self.startSynchronizedProcess(QProcess(), 'hg', args, repodir) + res = self.startSynchronizedProcess( + QProcess(), 'hg', args, repodir) else: out, err = self.__client.runcommand(args) res = err == "" @@ -772,11 +801,13 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None - from .HgMultiRevisionSelectionDialog import HgMultiRevisionSelectionDialog + from .HgMultiRevisionSelectionDialog import \ + HgMultiRevisionSelectionDialog dlg = HgMultiRevisionSelectionDialog( self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), @@ -797,8 +828,9 @@ Mercurial repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited - and has unsaved modification, they can be saved or the operation may be aborted. + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. @param name file/directory name to be diffed (string) """ @@ -844,7 +876,8 @@ from .HgSummaryDialog import HgSummaryDialog self.summary = HgSummaryDialog(self) self.summary.show() - self.summary.start(self.__projectHelper.getProject().getProjectPath(), mq=mq) + self.summary.start(self.__projectHelper.getProject().getProjectPath(), + mq=mq) def vcsTag(self, name): """ @@ -920,11 +953,13 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog dlg = DeleteFilesConfirmationDialog(self.parent(), self.trUtf8("Revert changes"), - self.trUtf8("Do you really want to revert all changes to these files" - " or directories?"), + self.trUtf8( + "Do you really want to revert all changes to these files" + " or directories?"), names) yes = dlg.exec_() == QDialog.Accepted else: @@ -966,7 +1001,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgMergeDialog import HgMergeDialog @@ -995,7 +1031,8 @@ def vcsSwitch(self, name): """ - Public method used to switch a working directory to a different revision. + Public method used to switch a working directory to a different + revision. @param name directory name to be switched (string) @return flag indicating, that the switch contained an add @@ -1012,7 +1049,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgRevisionSelectionDialog import HgRevisionSelectionDialog @@ -1089,11 +1127,12 @@ def vcsAllRegisteredStates(self, names, dname, shortcut=True): """ - Public method used to get the registered states of a number of files in the vcs. + Public method used to get the registered states of a number of files + in the vcs. - <b>Note:</b> If a shortcut is to be taken, the code will only check, if the named - directory has been scanned already. If so, it is assumed, that the states for - all files have been populated by the previous run. + <b>Note:</b> If a shortcut is to be taken, the code will only check, + if the named directory has been scanned already. If so, it is assumed, + that the states for all files have been populated by the previous run. @param names dictionary with all filenames to be checked as keys @param dname directory to check in (string) @@ -1305,7 +1344,8 @@ index = 0 for line in output.splitlines(): index += 1 - changeset, tags, author, date, branches, bookmarks = line.split("@@@") + changeset, tags, author, date, branches, bookmarks = \ + line.split("@@@") cdate, ctime = date.split()[:2] info = [] info.append(QApplication.translate("mercurial", @@ -1368,9 +1408,9 @@ """</table></p>\n""" ).format(self.versionStr, url, infoStr) - ############################################################################ + ########################################################################### ## Private Mercurial specific methods are below. - ############################################################################ + ########################################################################### def __hgURL(self, url): """ @@ -1392,14 +1432,16 @@ scheme = url[0] host = url[1] port, path = url[2].split("/", 1) - return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path)) + return "{0}:{1}:{2}/{3}".format( + scheme, host, port, urllib.parse.quote(path)) else: scheme = url[0] if scheme == "file": return "{0}:{1}".format(scheme, urllib.parse.quote(url[1])) else: host, path = url[1][2:].split("/", 1) - return "{0}://{1}/{2}".format(scheme, host, urllib.parse.quote(path)) + return "{0}://{1}/{2}".format( + scheme, host, urllib.parse.quote(path)) def hgNormalizeURL(self, url): """ @@ -1569,7 +1611,8 @@ self.branchesList = [] allTagsBranchesList = None self.tagbranchList.start(path, tags, - self.branchesList, self.allTagsBranchesList) + self.branchesList, + self.allTagsBranchesList) def hgAnnotate(self, name): """ @@ -1588,8 +1631,9 @@ Mercurial repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited - and has unsaved modification, they can be saved or the operation may be aborted. + are saved first. If name is a file (or list of files), which is/are + being edited and has unsaved modification, they can be saved or the + operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1620,7 +1664,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog @@ -1636,7 +1681,8 @@ def __hgGetFileForRevision(self, name, rev=""): """ - Private method to get a file for a specific revision from the repository. + Private method to get a file for a specific revision from the + repository. @param name file name to get from the repository (string) @keyparam rev revision to retrieve (string) @@ -1674,7 +1720,8 @@ error = str(process.readAllStandardError(), Preferences.getSystem("IOEncoding"), 'replace') else: - error = self.trUtf8("The hg process did not finish within 30s.") + error = self.trUtf8( + "The hg process did not finish within 30s.") else: error = self.trUtf8('The process {0} could not be started. ' 'Ensure, that it is in the search path.').format('hg') @@ -1685,8 +1732,8 @@ def hgSbsDiff(self, name, extended=False, revisions=None): """ - Public method used to view the difference of a file to the Mercurial repository - side-by-side. + Public method used to view the difference of a file to the Mercurial + repository side-by-side. @param name file name to be diffed (string) @keyparam extended flag indicating the extended variant (boolean) @@ -1706,7 +1753,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None @@ -1746,7 +1794,8 @@ except IOError: E5MessageBox.critical(self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), - self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") + self.trUtf8( + """<p>The file <b>{0}</b> could not be read.</p>""") .format(name)) return @@ -1762,7 +1811,8 @@ Mercurial repository. @param path file/directory name to show the log of (string) - @keyparam isFile flag indicating log for a file is to be shown (boolean) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) """ from .HgLogBrowserDialog import HgLogBrowserDialog self.logBrowser = HgLogBrowserDialog(self, isFile=isFile) @@ -1873,7 +1923,8 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - dia = HgDialog(self.trUtf8('Pushing to a remote Mercurial repository'), self) + dia = HgDialog( + self.trUtf8('Pushing to a remote Mercurial repository'), self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -1885,7 +1936,8 @@ Public method to show information about the heads of the repository. @param ppath local path to get the repository infos (string) - @keyparam mode mode of the operation (string, one of heads, parents, tip) + @keyparam mode mode of the operation (string, one of heads, parents, + tip) """ if mode not in ("heads", "parents", "tip"): mode = "heads" @@ -2024,8 +2076,9 @@ args.append('branch') args.append(name.strip().replace(" ", "_")) - dia = HgDialog(self.trUtf8('Creating branch in the Mercurial repository'), - self) + dia = HgDialog( + self.trUtf8('Creating branch in the Mercurial repository'), + self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -2062,7 +2115,8 @@ if not os.path.exists(cfgFile): try: f = open(cfgFile, "w") - f.write("[ui]\nusername = Firstname Lastname <email_address>\n") + f.write("[ui]\nusername = Firstname Lastname" + " <email_address>\n") f.close() except (IOError, OSError): # ignore these @@ -2114,8 +2168,9 @@ args = [] args.append('verify') - dia = HgDialog(self.trUtf8('Verifying the integrity of the Mercurial repository'), - self) + dia = HgDialog( + self.trUtf8('Verifying the integrity of the Mercurial repository'), + self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -2139,7 +2194,9 @@ args.append('showconfig') args.append("--untrusted") - dia = HgDialog(self.trUtf8('Showing the combined configuration settings'), self) + dia = HgDialog( + self.trUtf8('Showing the combined configuration settings'), + self) res = dia.startProcess(args, repodir, False) if res: dia.exec_() @@ -2162,7 +2219,9 @@ args = [] args.append('paths') - dia = HgDialog(self.trUtf8('Showing aliases for remote repositories'), self) + dia = HgDialog( + self.trUtf8('Showing aliases for remote repositories'), + self) res = dia.startProcess(args, repodir, False) if res: dia.exec_() @@ -2185,7 +2244,9 @@ args = [] args.append('recover') - dia = HgDialog(self.trUtf8('Recovering from interrupted transaction'), self) + dia = HgDialog( + self.trUtf8('Recovering from interrupted transaction'), + self) res = dia.startProcess(args, repodir, False) if res: dia.exec_() @@ -2286,7 +2347,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgBundleDialog import HgBundleDialog @@ -2469,7 +2531,8 @@ """ if subcommand not in ("good", "bad", "skip", "reset"): raise ValueError( - self.trUtf8("Bisect subcommand ({0}) invalid.").format(subcommand)) + self.trUtf8("Bisect subcommand ({0}) invalid.") + .format(subcommand)) dname, fname = self.splitPath(name) @@ -2484,7 +2547,8 @@ if subcommand in ("good", "bad", "skip"): if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgRevisionSelectionDialog import HgRevisionSelectionDialog @@ -2503,7 +2567,8 @@ if rev: args.append(rev) - dia = HgDialog(self.trUtf8('Mercurial Bisect ({0})').format(subcommand), self) + dia = HgDialog( + self.trUtf8('Mercurial Bisect ({0})').format(subcommand), self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -2514,7 +2579,8 @@ This will not remove the file from the project directory. - @param name file/directory name to be removed (string or list of strings)) + @param name file/directory name to be removed (string or list of + strings)) """ args = [] args.append('forget') @@ -2536,7 +2602,8 @@ return dia = HgDialog( - self.trUtf8('Removing files from the Mercurial repository only'), self) + self.trUtf8('Removing files from the Mercurial repository only'), + self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -2547,7 +2614,8 @@ def hgBackout(self, name): """ - Public method used to backout an earlier changeset from the Mercurial repository. + Public method used to backout an earlier changeset from the Mercurial + repository. @param name directory name (string or list of strings) """ @@ -2562,7 +2630,8 @@ if self.isExtensionActive("bookmarks"): bookmarksList = \ - self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + self.getExtensionObject("bookmarks")\ + .hgGetBookmarksList(repodir) else: bookmarksList = None from .HgBackoutDialog import HgBackoutDialog @@ -2612,9 +2681,11 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Rollback last transaction"), - self.trUtf8("""Are you sure you want to rollback the last transaction?"""), + self.trUtf8("""Are you sure you want to rollback the last""" + """ transaction?"""), icon=E5MessageBox.Warning) if res: dia = HgDialog(self.trUtf8('Rollback last transaction'), self) @@ -2797,7 +2868,8 @@ Public method to copy changesets from another branch. @param path directory name of the project (string) - @param revs list of revisions to show in the revisions pane (list of strings) + @param revs list of revisions to show in the revisions pane (list of + strings) @return flag indicating that the project should be reread (boolean) """ # find the root of the repo @@ -2903,14 +2975,14 @@ if res: dia.exec_() - ############################################################################ + ########################################################################### ## Methods to deal with subrepositories are below. - ############################################################################ + ########################################################################### def getHgSubPath(self): """ - Public method to get the path to the .hgsub file containing the definitions - of sub-repositories. + Public method to get the path to the .hgsub file containing the + definitions of sub-repositories. @return full path of the .hgsub file (string) """ @@ -2953,17 +3025,19 @@ except IOError as err: E5MessageBox.critical(self.__ui, self.trUtf8("Add Sub-repository"), - self.trUtf8("""<p>The sub-repositories file .hgsub could not""" - """ be read.</p><p>Reason: {0}</p>""") - .format(str(err))) + self.trUtf8( + """<p>The sub-repositories file .hgsub could not""" + """ be read.</p><p>Reason: {0}</p>""") + .format(str(err))) return if entry in contents: E5MessageBox.critical(self.__ui, self.trUtf8("Add Sub-repository"), - self.trUtf8("""<p>The sub-repositories file .hgsub already""" - """ contains an entry <b>{0}</b>. Aborting...</p>""") - .format(entry)) + self.trUtf8( + """<p>The sub-repositories file .hgsub already""" + """ contains an entry <b>{0}</b>.""" + """ Aborting...</p>""").format(entry)) return else: needsAdd = True @@ -2978,9 +3052,10 @@ except IOError as err: E5MessageBox.critical(self.__ui, self.trUtf8("Add Sub-repository"), - self.trUtf8("""<p>The sub-repositories file .hgsub could not""" - """ be written to.</p><p>Reason: {0}</p>""") - .format(str(err))) + self.trUtf8( + """<p>The sub-repositories file .hgsub could not""" + """ be written to.</p><p>Reason: {0}</p>""") + .format(str(err))) return if needsAdd: @@ -3013,7 +3088,8 @@ .format(str(err))) return - from .HgRemoveSubrepositoriesDialog import HgRemoveSubrepositoriesDialog + from .HgRemoveSubrepositoriesDialog import \ + HgRemoveSubrepositoriesDialog dlg = HgRemoveSubrepositoriesDialog(subrepositories) if dlg.exec_() == QDialog.Accepted: subrepositories, removedSubrepos, deleteSubrepos = dlg.getData() @@ -3025,9 +3101,10 @@ except IOError as err: E5MessageBox.critical(self.__ui, self.trUtf8("Remove Sub-repositories"), - self.trUtf8("""<p>The sub-repositories file .hgsub could not""" - """ be written to.</p><p>Reason: {0}</p>""") - .format(str(err))) + self.trUtf8( + """<p>The sub-repositories file .hgsub could not""" + """ be written to.</p><p>Reason: {0}</p>""") + .format(str(err))) return if deleteSubrepos: @@ -3037,9 +3114,9 @@ subrepoAbsPath = os.path.join(ppath, subrepoPath) shutil.rmtree(subrepoAbsPath, True) - ############################################################################ + ########################################################################### ## Methods to handle extensions are below. - ############################################################################ + ########################################################################### def __iniFileChanged(self, path): """ @@ -3054,14 +3131,15 @@ if not ok: E5MessageBox.warning(None, self.trUtf8("Mercurial Command Server"), - self.trUtf8("""<p>The Mercurial Command Server could not be""" - """ restarted.</p><p>Reason: {0}</p>""").format(err)) + self.trUtf8( + """<p>The Mercurial Command Server could not be""" + """ restarted.</p><p>Reason: {0}</p>""").format(err)) self.__client = None def __monitorRepoIniFile(self, name): """ - Private slot to add a repository configuration file to the list of monitored - files. + Private slot to add a repository configuration file to the list of + monitored files. @param name directory name pointing into the repository (string) """ @@ -3104,7 +3182,8 @@ if output: for line in output.splitlines(): - extensionName = line.split("=", 1)[0].strip().split(".")[-1].strip() + extensionName = \ + line.split("=", 1)[0].strip().split(".")[-1].strip() self.__activeExtensions.append(extensionName) if self.version >= (1, 8): @@ -3123,7 +3202,9 @@ """ extensionName = extensionName.strip() isActive = extensionName in self.__activeExtensions - if isActive and extensionName == "transplant" and self.version >= (2, 3): + if isActive and \ + extensionName == "transplant" and \ + self.version >= (2, 3): # transplant extension is deprecated as of Mercurial 2.3.0 isActive = False @@ -3138,22 +3219,25 @@ """ return self.__extensions[extensionName] - ############################################################################ + ########################################################################### ## Methods to get the helper objects are below. - ############################################################################ + ########################################################################### - def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): + def vcsGetProjectBrowserHelper(self, browser, project, + isTranslationsBrowser=False): """ - Public method to instantiate a helper object for the different project browsers. + Public method to instantiate a helper object for the different + project browsers. @param browser reference to the project browser object @param project reference to the project object - @param isTranslationsBrowser flag indicating, the helper is requested for the - translations browser (this needs some special treatment) + @param isTranslationsBrowser flag indicating, the helper is requested + for the translations browser (this needs some special treatment) @return the project browser helper object """ from .ProjectBrowserHelper import HgProjectBrowserHelper - return HgProjectBrowserHelper(self, browser, project, isTranslationsBrowser) + return HgProjectBrowserHelper(self, browser, project, + isTranslationsBrowser) def vcsGetProjectHelper(self, project): """ @@ -3183,20 +3267,23 @@ else: E5MessageBox.warning(None, self.trUtf8("Mercurial Command Server"), - self.trUtf8("""<p>The Mercurial Command Server could not be""" - """ started.</p><p>Reason: {0}</p>""").format(err)) + self.trUtf8( + """<p>The Mercurial Command Server could not be""" + """ started.</p><p>Reason: {0}</p>""").format(err)) return self.__projectHelper - ############################################################################ + ########################################################################### ## Status Monitor Thread methods - ############################################################################ + ########################################################################### def _createStatusMonitorThread(self, interval, project): """ - Protected method to create an instance of the VCS status monitor thread. + Protected method to create an instance of the VCS status monitor + thread. - @param interval check interval for the monitor thread in seconds (integer) + @param interval check interval for the monitor thread in seconds + (integer) @param project reference to the project object (Project) @return reference to the monitor thread (QThread) """
