Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sat Oct 19 16:14:07 2013 +0200
@@ -13,44 +13,44 @@
 
 svnNotifyActionMap = {
     pysvn.wc_notify_action.add:
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
     pysvn.wc_notify_action.commit_added:
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
     pysvn.wc_notify_action.commit_deleted:
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
     pysvn.wc_notify_action.commit_modified:
-        QT_TRANSLATE_NOOP('Subversion', 'Modify'),
+    QT_TRANSLATE_NOOP('Subversion', 'Modify'),
     pysvn.wc_notify_action.commit_postfix_txdelta: None,
     pysvn.wc_notify_action.commit_replaced:
-        QT_TRANSLATE_NOOP('Subversion', 'Replace'),
+    QT_TRANSLATE_NOOP('Subversion', 'Replace'),
     pysvn.wc_notify_action.copy:
-        QT_TRANSLATE_NOOP('Subversion', 'Copy'),
+    QT_TRANSLATE_NOOP('Subversion', 'Copy'),
     pysvn.wc_notify_action.delete:
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
     pysvn.wc_notify_action.failed_revert:
-        QT_TRANSLATE_NOOP('Subversion', 'Failed revert'),
+    QT_TRANSLATE_NOOP('Subversion', 'Failed revert'),
     pysvn.wc_notify_action.resolved:
-        QT_TRANSLATE_NOOP('Subversion', 'Resolve'),
+    QT_TRANSLATE_NOOP('Subversion', 'Resolve'),
     pysvn.wc_notify_action.restore:
-        QT_TRANSLATE_NOOP('Subversion', 'Restore'),
+    QT_TRANSLATE_NOOP('Subversion', 'Restore'),
     pysvn.wc_notify_action.revert:
-        QT_TRANSLATE_NOOP('Subversion', 'Revert'),
+    QT_TRANSLATE_NOOP('Subversion', 'Revert'),
     pysvn.wc_notify_action.skip:
-        QT_TRANSLATE_NOOP('Subversion', 'Skip'),
+    QT_TRANSLATE_NOOP('Subversion', 'Skip'),
     pysvn.wc_notify_action.status_completed: None,
     pysvn.wc_notify_action.status_external:
-        QT_TRANSLATE_NOOP('Subversion', 'External'),
+    QT_TRANSLATE_NOOP('Subversion', 'External'),
     pysvn.wc_notify_action.update_add:
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
     pysvn.wc_notify_action.update_completed: None,
     pysvn.wc_notify_action.update_delete:
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
     pysvn.wc_notify_action.update_external:
-        QT_TRANSLATE_NOOP('Subversion', 'External'),
+    QT_TRANSLATE_NOOP('Subversion', 'External'),
     pysvn.wc_notify_action.update_update:
-        QT_TRANSLATE_NOOP('Subversion', 'Update'),
+    QT_TRANSLATE_NOOP('Subversion', 'Update'),
     pysvn.wc_notify_action.annotate_revision:
-        QT_TRANSLATE_NOOP('Subversion', 'Annotate'),
+    QT_TRANSLATE_NOOP('Subversion', 'Annotate'),
 }
 if hasattr(pysvn.wc_notify_action, 'locked'):
     svnNotifyActionMap[pysvn.wc_notify_action.locked] = \
@@ -71,31 +71,31 @@
 
 svnStatusMap = {
     pysvn.wc_status_kind.added:
-        QT_TRANSLATE_NOOP('Subversion', 'added'),
+    QT_TRANSLATE_NOOP('Subversion', 'added'),
     pysvn.wc_status_kind.conflicted:
-        QT_TRANSLATE_NOOP('Subversion', 'conflict'),
+    QT_TRANSLATE_NOOP('Subversion', 'conflict'),
     pysvn.wc_status_kind.deleted:
-        QT_TRANSLATE_NOOP('Subversion', 'deleted'),
+    QT_TRANSLATE_NOOP('Subversion', 'deleted'),
     pysvn.wc_status_kind.external:
-        QT_TRANSLATE_NOOP('Subversion', 'external'),
+    QT_TRANSLATE_NOOP('Subversion', 'external'),
     pysvn.wc_status_kind.ignored:
-        QT_TRANSLATE_NOOP('Subversion', 'ignored'),
+    QT_TRANSLATE_NOOP('Subversion', 'ignored'),
     pysvn.wc_status_kind.incomplete:
-        QT_TRANSLATE_NOOP('Subversion', 'incomplete'),
+    QT_TRANSLATE_NOOP('Subversion', 'incomplete'),
     pysvn.wc_status_kind.missing:
-        QT_TRANSLATE_NOOP('Subversion', 'missing'),
+    QT_TRANSLATE_NOOP('Subversion', 'missing'),
     pysvn.wc_status_kind.merged:
-        QT_TRANSLATE_NOOP('Subversion', 'merged'),
+    QT_TRANSLATE_NOOP('Subversion', 'merged'),
     pysvn.wc_status_kind.modified:
-        QT_TRANSLATE_NOOP('Subversion', 'modified'),
+    QT_TRANSLATE_NOOP('Subversion', 'modified'),
     pysvn.wc_status_kind.none:
-        QT_TRANSLATE_NOOP('Subversion', 'normal'),
+    QT_TRANSLATE_NOOP('Subversion', 'normal'),
     pysvn.wc_status_kind.normal:
-        QT_TRANSLATE_NOOP('Subversion', 'normal'),
+    QT_TRANSLATE_NOOP('Subversion', 'normal'),
     pysvn.wc_status_kind.obstructed:
-        QT_TRANSLATE_NOOP('Subversion', 'type error'),
+    QT_TRANSLATE_NOOP('Subversion', 'type error'),
     pysvn.wc_status_kind.replaced:
-        QT_TRANSLATE_NOOP('Subversion', 'replaced'),
+    QT_TRANSLATE_NOOP('Subversion', 'replaced'),
     pysvn.wc_status_kind.unversioned:
-        QT_TRANSLATE_NOOP('Subversion', 'unversioned'),
+    QT_TRANSLATE_NOOP('Subversion', 'unversioned'),
 }

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -76,8 +76,8 @@
             msg = self.trUtf8("Revision {0}.\n").format(
                 eventDict["revision"].number)
         elif eventDict["path"] != "" and \
-             eventDict["action"] in svnNotifyActionMap and \
-             svnNotifyActionMap[eventDict["action"]] is not None:
+            eventDict["action"] in svnNotifyActionMap and \
+                svnNotifyActionMap[eventDict["action"]] is not None:
             mime = eventDict["mime_type"] == "application/octet-stream" and \
                 self.trUtf8(" (binary)") or ""
             msg = self.trUtf8("{0} {1}{2}\n")\

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -443,7 +443,7 @@
                 self.trUtf8(
                     '<p>The patch file <b>{0}</b> could not be saved.'
                     '<br>Reason: {1}</p>')
-                    .format(fname, str(why)))
+                .format(fname, str(why)))
         
     def __showError(self, msg):
         """

--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -94,7 +94,7 @@
                         .format(formatTime(info['last_changed_date']))
                 if info['last_changed_rev'] and \
                         info['last_changed_rev'].kind == \
-                            pysvn.opt_revision_kind.number:
+                        pysvn.opt_revision_kind.number:
                     infoStr += self.trUtf8(
                         "<tr><td><b>Last changed revision:</b></td>"
                         "<td>{0}</td></tr>")\
@@ -121,8 +121,7 @@
                         "<td>{0}</td></tr>")\
                         .format(formatTime(lockInfo['creation_date']))
                     if lockInfo['expiration_date'] is not None:
-                        infoStr += \
-                            self.trUtf8(
+                        infoStr += self.trUtf8(
                             "<tr><td><b>Lock Expiration Date:</b></td>"
                             "<td>{0}</td></tr>")\
                             .format(formatTime(lockInfo['expiration_date']))

--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -59,8 +59,8 @@
                   self.rx_url.exactMatch(self.tag2Combo.currentText())) or
                  (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and
                   self.rx_rev.exactMatch(self.tag2Combo.currentText()))
-                )
-            )
+                 )
+        )
         
     def on_tag1Combo_editTextChanged(self, text):
         """

--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -65,7 +65,7 @@
         elif dateButton.isChecked():
             return "{{{0}}}".format(
                 QDateTime(dateEdit.date(), timeEdit.time())
-                    .toString(Qt.ISODate))
+                .toString(Qt.ISODate))
         elif headButton.isChecked():
             return "HEAD"
         elif workingButton.isChecked():

--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -330,11 +330,11 @@
                     if file.repos_text_status != pysvn.wc_status_kind.none:
                         uptodate = uptodate and \
                             file.repos_text_status != \
-                                pysvn.wc_status_kind.modified
+                            pysvn.wc_status_kind.modified
                     if file.repos_prop_status != pysvn.wc_status_kind.none:
                         uptodate = uptodate and \
                             file.repos_prop_status != \
-                                pysvn.wc_status_kind.modified
+                            pysvn.wc_status_kind.modified
                     
                     lockState = " "
                     if file.entry is not None and \
@@ -347,8 +347,9 @@
                         elif lockState == " " and file.repos_lock is not None:
                             lockState = "O"
                         elif lockState == "L" and \
-                             file.repos_lock is not None and \
-                             file.entry.lock_token != file.repos_lock["token"]:
+                            file.repos_lock is not None and \
+                            file.entry.lock_token != \
+                                file.repos_lock["token"]:
                             lockState = "S"
                     
                     fpath = Utilities.normcasepath(
@@ -778,7 +779,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-                    self.stealBreakLockIndicators)]
+                     self.stealBreakLockIndicators)]
         if not names:
             E5MessageBox.information(
                 self,
@@ -796,7 +797,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-                    self.stealBreakLockIndicators)]
+                     self.stealBreakLockIndicators)]
         if not names:
             E5MessageBox.information(
                 self,

--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sat Oct 19 16:14:07 2013 +0200
@@ -82,19 +82,19 @@
                     status = "U"
                     self.shouldUpdate = True
                 elif file.text_status == pysvn.wc_status_kind.conflicted or \
-                   file.prop_status == pysvn.wc_status_kind.conflicted:
+                        file.prop_status == pysvn.wc_status_kind.conflicted:
                     status = "Z"
                 elif file.text_status == pysvn.wc_status_kind.deleted or \
-                   file.prop_status == pysvn.wc_status_kind.deleted:
+                        file.prop_status == pysvn.wc_status_kind.deleted:
                     status = "O"
                 elif file.text_status == pysvn.wc_status_kind.modified or \
-                   file.prop_status == pysvn.wc_status_kind.modified:
+                        file.prop_status == pysvn.wc_status_kind.modified:
                     status = "M"
                 elif file.text_status == pysvn.wc_status_kind.added or \
-                   file.prop_status == pysvn.wc_status_kind.added:
+                        file.prop_status == pysvn.wc_status_kind.added:
                     status = "A"
                 elif file.text_status == pysvn.wc_status_kind.replaced or \
-                   file.prop_status == pysvn.wc_status_kind.replaced:
+                        file.prop_status == pysvn.wc_status_kind.replaced:
                     status = "R"
                 if status:
                     states[file.path] = status

--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -142,11 +142,11 @@
         """
         if self.vcs.otherData["standardLayout"]:
             url1 = self.repoRootLabel1.text() + \
-                   self.typeCombo1.currentText() + \
-                   self.labelCombo1.currentText()
+                self.typeCombo1.currentText() + \
+                self.labelCombo1.currentText()
             url2 = self.repoRootLabel2.text() + \
-                   self.typeCombo2.currentText() + \
-                   self.labelCombo2.currentText()
+                self.typeCombo2.currentText() + \
+                self.labelCombo2.currentText()
         else:
             url1 = self.labelCombo1.currentText()
             url2 = self.labelCombo2.currentText()

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Oct 19 16:14:07 2013 +0200
@@ -311,7 +311,7 @@
         locker.unlock()
         if not noDialog:
             rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n")
-                                          .format(rev.number))
+                                    .format(rev.number))
             dlg.finish()
             dlg.exec_()
         os.chdir(cwd)
@@ -371,7 +371,7 @@
                 self.trUtf8('Checking project out of Subversion repository'),
                 "checkout{0} {1} {2}".format(
                     (not recurse) and " --non-recursive" or "",
-                     url, projectDir),
+                    url, projectDir),
                 client)
             QApplication.processEvents()
         locker = QMutexLocker(self.vcsExecutionMutex)
@@ -435,7 +435,7 @@
             self.trUtf8('Exporting project from Subversion repository'),
             "export --force{0} {1} {2}".format(
                 (not recurse) and " --non-recursive" or "",
-                 url, projectDir),
+                url, projectDir),
             client)
         QApplication.processEvents()
         locker = QMutexLocker(self.vcsExecutionMutex)
@@ -499,8 +499,8 @@
                     project = e5App().getObject("Project")
                     if nam == project.getProjectPath():
                         ok &= project.checkAllScriptsDirty(
-                                reportSyntaxErrors=True) and \
-                              project.checkDirty()
+                            reportSyntaxErrors=True) and \
+                            project.checkDirty()
                         continue
                 elif os.path.isfile(nam):
                     editor = e5App().getObject("ViewManager")\
@@ -561,7 +561,7 @@
                     keeplocks and " --keep-locks" or "",
                     keepChangelists and " --keep-changelists" or "",
                     changelists and
-                        " --changelist ".join([""] + changelists) or "",
+                    " --changelist ".join([""] + changelists) or "",
                     msg, " ".join(fnames)),
                 client)
             QApplication.processEvents()
@@ -663,8 +663,8 @@
                 if os.path.splitdrive(repodir)[1] == os.sep:
                     return  # oops, project is not version controlled
             while os.path.normcase(dname) != os.path.normcase(repodir) and \
-                  (os.path.normcase(dname) not in self.statusCache or
-                   self.statusCache[os.path.normcase(dname)] ==
+                (os.path.normcase(dname) not in self.statusCache or
+                 self.statusCache[os.path.normcase(dname)] ==
                     self.canBeAdded):
                 # add directories recursively, if they aren't in the
                 # repository already
@@ -693,9 +693,9 @@
                             return  # oops, project is not version controlled
                     while os.path.normcase(d) != \
                             os.path.normcase(repodir) and \
-                          (d not in tree2 + tree) and \
-                          (os.path.normcase(d) not in self.statusCache or
-                           self.statusCache[os.path.normcase(d)] ==
+                        (d not in tree2 + tree) and \
+                        (os.path.normcase(d) not in self.statusCache or
+                         self.statusCache[os.path.normcase(d)] ==
                             self.canBeAdded):
                         tree2.append(d)
                         d = os.path.dirname(d)
@@ -773,9 +773,9 @@
                             return  # oops, project is not version controlled
                     while os.path.normcase(d) != \
                             os.path.normcase(repodir) and \
-                          (d not in tree) and \
-                          (os.path.normcase(d) not in self.statusCache or
-                           self.statusCache[os.path.normcase(d)] ==
+                        (d not in tree) and \
+                        (os.path.normcase(d) not in self.statusCache or
+                         self.statusCache[os.path.normcase(d)] ==
                             self.canBeAdded):
                         tree.append(d)
                         d = os.path.dirname(d)
@@ -798,8 +798,8 @@
                         return  # oops, project is not version controlled
                 while os.path.normcase(dname) != \
                         os.path.normcase(repodir) and \
-                      (os.path.normcase(dname) not in self.statusCache or
-                       self.statusCache[os.path.normcase(dname)] ==
+                    (os.path.normcase(dname) not in self.statusCache or
+                     self.statusCache[os.path.normcase(dname)] ==
                         self.canBeAdded):
                     # add directories recursively, if they aren't in the
                     # repository already
@@ -931,10 +931,10 @@
                 dlg = \
                     SvnDialog(
                         self.trUtf8('Moving {0}').format(name),
-                            "move{0}{1} {2} {3}".format(
-                                force and " --force" or "",
-                                log and (" --message {0}".format(log)) or "",
-                                name, target),
+                        "move{0}{1} {2} {3}".format(
+                            force and " --force" or "",
+                            log and (" --message {0}".format(log)) or "",
+                            name, target),
                         client, log=log)
                 QApplication.processEvents()
             locker = QMutexLocker(self.vcsExecutionMutex)
@@ -1337,12 +1337,12 @@
         dlg = \
             SvnDialog(
                 self.trUtf8('Merging {0}').format(name),
-                    "merge{0}{1} {2} {3} {4}".format(
-                        (not recurse) and " --non-recursive" or "",
-                        force and " --force" or "",
-                        "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
-                        "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
-                        fname),
+                "merge{0}{1} {2} {3} {4}".format(
+                    (not recurse) and " --non-recursive" or "",
+                    force and " --force" or "",
+                    "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
+                    "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
+                    fname),
                 client)
         QApplication.processEvents()
         try:
@@ -1489,7 +1489,7 @@
             try:
                 locker = QMutexLocker(self.vcsExecutionMutex)
                 allFiles = client.status(dname, recurse=True, get_all=True,
-                                              ignore=True, update=False)
+                                         ignore=True, update=False)
                 locker.unlock()
                 dirs = [x for x in names.keys() if os.path.isdir(x)]
                 for file in allFiles:
@@ -1499,7 +1499,7 @@
                             names[name] = self.canBeCommitted
                             dn = name
                             while os.path.splitdrive(dn)[1] != os.sep and \
-                                  dn != repodir:
+                                    dn != repodir:
                                 dn = os.path.dirname(dn)
                                 if dn in self.statusCache and \
                                    self.statusCache[dn] == self.canBeCommitted:
@@ -1564,7 +1564,7 @@
             try:
                 locker = QMutexLocker(self.vcsExecutionMutex)
                 allFiles = client.status(dname, recurse=True, get_all=True,
-                                              ignore=True, update=False)
+                                         ignore=True, update=False)
                 locker.unlock()
                 for file in allFiles:
                     name = os.path.normcase(file.path)
@@ -1717,7 +1717,7 @@
             """<tr><td><b>Comitted time</b></td><td>{7}</td></tr>"""
             """<tr><td><b>Last author</b></td><td>{8}</td></tr>"""
             """</table>"""
-            )\
+        )\
             .format(".".join([str(v) for v in pysvn.version]),
                     ".".join([str(v) for v in pysvn.svn_version[:3]]),
                     apiVersion,
@@ -1729,7 +1729,7 @@
                     time.strftime(
                         "%H:%M:%S %Z", time.localtime(entry.commit_time)),
                     entry.commit_author
-            )
+                    )
     
     ###########################################################################
     ## Public Subversion specific methods are below.
@@ -1813,9 +1813,9 @@
             dlg = \
                 SvnDialog(
                     self.trUtf8('Copying {0}').format(name),
-                        "copy{0} {1} {2}".format(
-                            log and (" --message {0}".format(log)) or "",
-                            name, target),
+                    "copy{0} {1} {2}".format(
+                        log and (" --message {0}".format(log)) or "",
+                        name, target),
                     client, log=log)
             QApplication.processEvents()
             locker = QMutexLocker(self.vcsExecutionMutex)
@@ -1884,11 +1884,11 @@
             dlg = \
                 SvnDialog(
                     self.trUtf8('Subversion Set Property'),
-                        "propset{0}{1} {2} {3} {4}".format(
-                            recurse and " --recurse" or "",
-                            skipchecks and " --skip-checks" or "",
-                            propName, propValue,
-                            " ".join(fnames)),
+                    "propset{0}{1} {2} {3} {4}".format(
+                        recurse and " --recurse" or "",
+                        skipchecks and " --skip-checks" or "",
+                        propName, propValue,
+                        " ".join(fnames)),
                     client)
             QApplication.processEvents()
             try:
@@ -1938,10 +1938,10 @@
             dlg = \
                 SvnDialog(
                     self.trUtf8('Subversion Delete Property'),
-                        "propdel{0}{1} {2} {3}".format(
-                            recurse and " --recurse" or "",
-                            skipchecks and " --skip-checks" or "",
-                            propName, " ".join(fnames)),
+                    "propdel{0}{1} {2} {3}".format(
+                        recurse and " --recurse" or "",
+                        skipchecks and " --skip-checks" or "",
+                        propName, " ".join(fnames)),
                     client)
             QApplication.processEvents()
             try:
@@ -2173,7 +2173,7 @@
                     self.trUtf8("Subversion Side-by-Side Difference"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be read.</p>""")
-                        .format(name))
+                    .format(name))
                 return
         
         if self.sbsDiff is None:
@@ -2228,10 +2228,10 @@
         dlg = \
             SvnDialog(
                 self.trUtf8('Locking in the Subversion repository'),
-                    "lock{0}{1} {2}".format(
-                        stealIt and " --force" or "",
-                        comment and (" --message {0}".format(comment)) or "",
-                        " ".join(fnames)),
+                "lock{0}{1} {2}".format(
+                    stealIt and " --force" or "",
+                    comment and (" --message {0}".format(comment)) or "",
+                    " ".join(fnames)),
                 client, parent=parent)
         QApplication.processEvents()
         try:
@@ -2268,9 +2268,9 @@
         dlg = \
             SvnDialog(
                 self.trUtf8('Unlocking in the Subversion repository'),
-                    "unlock{0} {1}".format(
-                        breakIt and " --force" or "",
-                        " ".join(fnames)),
+                "unlock{0} {1}".format(
+                    breakIt and " --force" or "",
+                    " ".join(fnames)),
                 client, parent=parent)
         QApplication.processEvents()
         try:

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -265,13 +265,12 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             if self.summaryPath:
                 line = line.replace(self.summaryPath + '/', '')
                 line = " ".join(line.split())
-            if line.startswith("--- ") or \
-                line.startswith("+++ "):
+            if line.startswith("--- ") or line.startswith("+++ "):
                     self.__processFileLine(line)
                 
             if line.startswith('+') or line.startswith('>') or \
@@ -403,7 +402,7 @@
                 self.trUtf8(
                     '<p>The patch file <b>{0}</b> could not be saved.'
                     '<br>Reason: {1}</p>')
-                    .format(fname, str(why)))
+                .format(fname, str(why)))
         
     def on_passwordCheckBox_toggled(self, isOn):
         """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -328,20 +328,20 @@
             elif self.rx_flags1.exactMatch(s):
                 changedPaths.append({
                     "action":
-                        self.rx_flags1.cap(1).strip(),
+                    self.rx_flags1.cap(1).strip(),
                     "path":
-                        self.rx_flags1.cap(2).strip(),
+                    self.rx_flags1.cap(2).strip(),
                     "copyfrom_path":
-                        self.rx_flags1.cap(3).strip(),
+                    self.rx_flags1.cap(3).strip(),
                     "copyfrom_revision":
-                        self.rx_flags1.cap(4).strip(),
+                    self.rx_flags1.cap(4).strip(),
                 })
             elif self.rx_flags2.exactMatch(s):
                 changedPaths.append({
                     "action":
-                        self.rx_flags2.cap(1).strip(),
+                    self.rx_flags2.cap(1).strip(),
                     "path":
-                        self.rx_flags2.cap(2).strip(),
+                    self.rx_flags2.cap(2).strip(),
                     "copyfrom_path": "",
                     "copyfrom_revision": "",
                 })
@@ -400,8 +400,8 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             self.buf.append(line)
     
     def __readStderr(self):
@@ -414,8 +414,8 @@
         if self.process is not None:
             self.errorGroup.show()
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()
     

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -230,8 +230,8 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             self.buf.append(line)
             if self.rx_rev.exactMatch(line):
                 ver = self.rx_rev.cap(1)
@@ -252,8 +252,8 @@
         if self.process is not None:
             self.errorGroup.show()
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()
         

--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -59,8 +59,8 @@
                   self.rx_url.exactMatch(self.tag2Combo.currentText())) or
                  (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and
                   self.rx_rev.exactMatch(self.tag2Combo.currentText()))
-                )
-            )
+                 )
+        )
         
     def on_tag1Combo_editTextChanged(self, text):
         """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -187,8 +187,8 @@
         
         while self.process.canReadLine():
             s = str(self.process.readLine(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             if self.rx_path.exactMatch(s):
                 if self.lastProp:
                     self.__generateItem(
@@ -216,7 +216,7 @@
         if self.process is not None:
             self.errorGroup.show()
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -65,7 +65,7 @@
         elif dateButton.isChecked():
             return "{{{0}}}".format(
                 QDateTime(dateEdit.date(), timeEdit.time())
-                    .toString(Qt.ISODate))
+                .toString(Qt.ISODate))
         elif headButton.isChecked():
             return "HEAD"
         elif workingButton.isChecked():

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -888,7 +888,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-                    self.stealBreakLockIndicators)]
+                     self.stealBreakLockIndicators)]
         if not names:
             E5MessageBox.information(
                 self,
@@ -906,7 +906,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-                    self.stealBreakLockIndicators)]
+                     self.stealBreakLockIndicators)]
         if not names:
             E5MessageBox.information(
                 self,

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Oct 19 16:14:07 2013 +0200
@@ -115,9 +115,9 @@
                 process.kill()
                 process.waitForFinished()
                 return False, \
-                       str(process.readAllStandardError(),
-                           Preferences.getSystem("IOEncoding"),
-                           'replace')
+                    str(process.readAllStandardError(),
+                        Preferences.getSystem("IOEncoding"),
+                        'replace')
         else:
             process.kill()
             process.waitForFinished()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -140,11 +140,11 @@
         """
         if self.vcs.otherData["standardLayout"]:
             url1 = self.repoRootLabel1.text() + \
-                   self.typeCombo1.currentText() + \
-                   self.labelCombo1.currentText()
+                self.typeCombo1.currentText() + \
+                self.labelCombo1.currentText()
             url2 = self.repoRootLabel2.text() + \
-                   self.typeCombo2.currentText() + \
-                   self.labelCombo2.currentText()
+                self.typeCombo2.currentText() + \
+                self.labelCombo2.currentText()
         else:
             url1 = self.labelCombo1.currentText()
             url2 = self.labelCombo2.currentText()

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Oct 19 16:14:07 2013 +0200
@@ -478,7 +478,7 @@
                     project = e5App().getObject("Project")
                     if nam == project.getProjectPath():
                         ok &= project.checkAllScriptsDirty(
-                                reportSyntaxErrors=True) and \
+                            reportSyntaxErrors=True) and \
                             project.checkDirty()
                         continue
                 elif os.path.isfile(nam):
@@ -651,7 +651,7 @@
                         if os.path.splitdrive(repodir)[1] == os.sep:
                             return  # oops, project is not version controlled
                     while os.path.normcase(d) != \
-                                os.path.normcase(repodir) and \
+                        os.path.normcase(repodir) and \
                             (d not in tree2 + tree) and \
                             (os.path.normcase(d) not in self.statusCache or
                              self.statusCache[os.path.normcase(d)] ==
@@ -716,7 +716,7 @@
                         if os.path.splitdrive(repodir)[1] == os.sep:
                             return  # oops, project is not version controlled
                     while os.path.normcase(d) != \
-                                os.path.normcase(repodir) and \
+                        os.path.normcase(repodir) and \
                             (d not in tree) and \
                             (os.path.normcase(d) not in self.statusCache or
                              self.statusCache[os.path.normcase(d)] ==
@@ -741,7 +741,7 @@
                     if os.path.splitdrive(repodir)[1] == os.sep:
                         return  # oops, project is not version controlled
                 while os.path.normcase(dname) != \
-                            os.path.normcase(repodir) and \
+                    os.path.normcase(repodir) and \
                         (os.path.normcase(dname) not in self.statusCache or
                          self.statusCache[os.path.normcase(dname)] ==
                             self.canBeAdded):
@@ -1597,14 +1597,13 @@
             """<tr><td><b>Comitted time</b></td><td>{5}</td></tr>"""
             """<tr><td><b>Last author</b></td><td>{6}</td></tr>"""
             """</table>"""
-            )\
-            .format(self.versionStr,
-                    info['url'],
-                    info['revision'],
-                    info['committed-rev'],
-                    info['committed-date'],
-                    info['committed-time'],
-                    info['last-author'])
+        ).format(self.versionStr,
+                 info['url'],
+                 info['revision'],
+                 info['committed-rev'],
+                 info['committed-date'],
+                 info['committed-time'],
+                 info['last-author'])
     
     ###########################################################################
     ## Public Subversion specific methods are below.
@@ -2021,7 +2020,7 @@
                     self.trUtf8("Subversion Side-by-Side Difference"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be read.</p>""")
-                        .format(name))
+                    .format(name))
                 return
         
         if self.sbsDiff is None:

--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat Oct 19 16:14:07 2013 +0200
@@ -670,7 +670,7 @@
         """
         index = self.contextMenuIndex
         for i in list(range(self.viewlist.count() - 1, index, -1)) + \
-                 list(range(index - 1, -1, -1)):
+                list(range(index - 1, -1, -1)):
             editor = self.editors[i]
             self.closeEditorWindow(editor)
         

--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat Oct 19 16:14:07 2013 +0200
@@ -579,7 +579,7 @@
         """
         index = self.contextMenuIndex
         for i in list(range(self.count() - 1, index, -1)) + \
-                 list(range(index - 1, -1, -1)):
+                list(range(index - 1, -1, -1)):
             editor = self.widget(i).getEditor()
             self.vm.closeEditorWindow(editor)
         
@@ -823,8 +823,8 @@
         # if this was the last editor in this view, switch to the next, that
         # still has open editors
         for i in list(range(self.tabWidgets.index(tw), -1, -1)) + \
-                 list(range(self.tabWidgets.index(tw) + 1,
-                            len(self.tabWidgets))):
+            list(range(self.tabWidgets.index(tw) + 1,
+                 len(self.tabWidgets))):
             if self.tabWidgets[i].hasEditors():
                 self.currentTabWidget.showIndicator(False)
                 self.currentTabWidget = self.tabWidgets[i]

--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -62,14 +62,14 @@
                 try:
                     exec('from PyQt4.QtCore import Qt;'
                          ' QColorDialog.getColor({0}, None, "{1}")'.format(
-                        coStr, self.eTitle.text()))
+                             coStr, self.eTitle.text()))
                 except:
                     E5MessageBox.critical(
                         self,
                         self.trUtf8("QColorDialog Wizard Error"),
                         self.trUtf8(
                             """<p>The colour <b>{0}</b> is not valid.</p>""")
-                            .format(coStr))
+                        .format(coStr))
             
         elif self.rRGBA.isChecked():
             QColorDialog.getColor(

--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -257,9 +257,9 @@
                 None, self.eCaption.text()
             )
         elif self.rInformation.isChecked() or \
-             self.rQuestion.isChecked() or \
-             self.rWarning.isChecked() or \
-             self.rCritical.isChecked():
+            self.rQuestion.isChecked() or \
+            self.rWarning.isChecked() or \
+                self.rCritical.isChecked():
             buttons = E5MessageBox.NoButton
             if self.abortCheck.isChecked():
                 buttons |= E5MessageBox.Abort
@@ -336,7 +336,7 @@
                     defaultButton
                 )
         elif self.rYesNo.isChecked() or \
-             self.rRetryAbort.isChecked():
+                self.rRetryAbort.isChecked():
             if self.iconInformation.isChecked():
                 icon = E5MessageBox.Information
             elif self.iconQuestion.isChecked():

--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -17,7 +17,7 @@
 
 
 class PyRegExpWizardCharactersDialog(
-    QDialog, Ui_PyRegExpWizardCharactersDialog):
+        QDialog, Ui_PyRegExpWizardCharactersDialog):
     """
     Class implementing a dialog for entering character classes.
     """

--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -17,7 +17,7 @@
 
 
 class QRegularExpressionWizardCharactersDialog(
-    QDialog, Ui_QRegularExpressionWizardCharactersDialog):
+        QDialog, Ui_QRegularExpressionWizardCharactersDialog):
     """
     Class implementing a dialog for entering character classes.
     """

--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sat Oct 19 15:15:50 2013 +0200
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sat Oct 19 16:14:07 2013 +0200
@@ -15,7 +15,7 @@
 
 
 class QRegularExpressionWizardRepeatDialog(
-    QDialog, Ui_QRegularExpressionWizardRepeatDialog):
+        QDialog, Ui_QRegularExpressionWizardRepeatDialog):
     """
     Class implementing a dialog for entering repeat counts.
     """