Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py

branch
Py2 comp.
changeset 3057
10516539f238
parent 2791
a9577f248f04
parent 3009
bf5ae5d7477d
child 3058
0a02c433f52d
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Oct 18 23:00:41 2013 +0200
@@ -45,8 +45,8 @@
         self.process = None
         self.vcs = vcs
         
-        self.rx_status = \
-            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
+        self.rx_status = QRegExp(
+            '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
             # flags (8 or 9 anything), revision, changed rev, author, path
         self.rx_status2 = \
             QRegExp('(.{8,9})\\s+(.+)\\s*')
@@ -68,7 +68,8 @@
         if current is not None:
             changelist = current.text()
             if changelist in self.changeListsDict:
-                self.filesList.addItems(sorted(self.changeListsDict[changelist]))
+                self.filesList.addItems(
+                    sorted(self.changeListsDict[changelist]))
     
     def start(self, path):
         """
@@ -78,7 +79,8 @@
         """
         self.changeListsDict = {}
         
-        self.filesLabel.setText(self.trUtf8("Files (relative to {0}):").format(path))
+        self.filesLabel.setText(
+            self.trUtf8("Files (relative to {0}):").format(path))
         
         self.errorGroup.hide()
         self.intercept = False
@@ -142,7 +144,8 @@
         
         if len(self.changeListsDict) == 0:
             self.changeLists.addItem(self.trUtf8("No changelists found"))
-            self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason)
+            self.buttonBox.button(QDialogButtonBox.Close).setFocus(
+                Qt.OtherFocusReason)
         else:
             self.changeLists.addItems(sorted(self.changeListsDict.keys()))
             self.changeLists.setCurrentRow(0)
@@ -182,16 +185,22 @@
                 s = str(self.process.readLine(),
                         Preferences.getSystem("IOEncoding"),
                         'replace')
-                if self.currentChangelist != "" and self.rx_status.exactMatch(s):
+                if self.currentChangelist != "" and \
+                        self.rx_status.exactMatch(s):
                     file = self.rx_status.cap(5).strip()
                     filename = file.replace(self.path + os.sep, "")
-                    if filename not in self.changeListsDict[self.currentChangelist]:
-                        self.changeListsDict[self.currentChangelist].append(filename)
-                elif self.currentChangelist != "" and self.rx_status2.exactMatch(s):
+                    if filename not in \
+                            self.changeListsDict[self.currentChangelist]:
+                        self.changeListsDict[self.currentChangelist].append(
+                            filename)
+                elif self.currentChangelist != "" and \
+                        self.rx_status2.exactMatch(s):
                     file = self.rx_status2.cap(2).strip()
                     filename = file.replace(self.path + os.sep, "")
-                    if filename not in self.changeListsDict[self.currentChangelist]:
-                        self.changeListsDict[self.currentChangelist].append(filename)
+                    if filename not in \
+                            self.changeListsDict[self.currentChangelist]:
+                        self.changeListsDict[self.currentChangelist].append(
+                            filename)
                 elif self.rx_changelist.exactMatch(s):
                     self.currentChangelist = self.rx_changelist.cap(1)
                     if self.currentChangelist not in self.changeListsDict:

eric ide

mercurial