Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Oct 18 23:00:41 2013 +0200
@@ -64,10 +64,12 @@
         self.__ignoreExpand = False
         self.intercept = False
         
-        self.__rx_dir = \
-            QRegExp(r"""\s*([0-9]+)\s+(\w+)\s+((?:\w+\s+\d+|[0-9.]+\s+\w+)\s+[0-9:]+)\s+(.+)\s*""")
-        self.__rx_file = \
-            QRegExp(r"""\s*([0-9]+)\s+(\w+)\s+([0-9]+)\s((?:\w+\s+\d+|[0-9.]+\s+\w+)\s+[0-9:]+)\s+(.+)\s*""")
+        self.__rx_dir = QRegExp(
+            r"""\s*([0-9]+)\s+(\w+)\s+"""
+            r"""((?:\w+\s+\d+|[0-9.]+\s+\w+)\s+[0-9:]+)\s+(.+)\s*""")
+        self.__rx_file = QRegExp(
+            r"""\s*([0-9]+)\s+(\w+)\s+([0-9]+)\s"""
+            r"""((?:\w+\s+\d+|[0-9.]+\s+\w+)\s+[0-9:]+)\s+(.+)\s*""")
     
     def closeEvent(self, e):
         """
@@ -98,11 +100,10 @@
         self.repoTree.header().setStretchLastSection(True)
     
     def __generateItem(self, repopath, revision, author, size, date,
-            nodekind, url):
+                       nodekind, url):
         """
         Private method to generate a tree item in the repository tree.
         
-        @param parent parent of the item to be created (QTreeWidget or QTreeWidgetItem)
         @param repopath path of the item (string)
         @param revision revision info (string)
         @param author author info (string)
@@ -170,11 +171,13 @@
             finished = process.waitForFinished(30000)
             if finished:
                 if process.exitCode() == 0:
-                    output = str(process.readAllStandardOutput(), ioEncoding, 'replace')
+                    output = str(process.readAllStandardOutput(), ioEncoding,
+                                 'replace')
                     for line in output.splitlines():
                         line = line.strip()
                         if line.startswith('<root>'):
-                            repoRoot = line.replace('<root>', '').replace('</root>', '')
+                            repoRoot = line.replace('<root>', '')\
+                                .replace('</root>', '')
                             break
                 else:
                     error = str(process.readAllStandardError(),
@@ -216,14 +219,16 @@
                 self.__finish()
                 return
             self.__ignoreExpand = True
-            itm = self.__generateItem(repoRoot, "", "", "", "", "dir", repoRoot)
+            itm = self.__generateItem(
+                repoRoot, "", "", "", "", "dir", repoRoot)
             itm.setExpanded(True)
             self.parentItem = itm
             urlPart = repoRoot
             for element in url.replace(repoRoot, "").split("/"):
                 if element:
                     urlPart = "{0}/{1}".format(urlPart, element)
-                    itm = self.__generateItem(element, "", "", "", "", "dir", urlPart)
+                    itm = self.__generateItem(
+                        element, "", "", "", "", "dir", urlPart)
                     itm.setExpanded(True)
                     self.parentItem = itm
             itm.setExpanded(False)
@@ -350,7 +355,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:
@@ -407,7 +413,8 @@
                 else:
                     continue
                 url = "{0}/{1}".format(self.repoUrl, name)
-                self.__generateItem(name, revision, author, size, date, nodekind, url)
+                self.__generateItem(
+                    name, revision, author, size, date, nodekind, url)
    
     def __readStderr(self):
         """