Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon Oct 14 18:26:25 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon Oct 14 19:30:36 2013 +0200
@@ -197,7 +197,8 @@
         """
         success = self.vcsImport(vcsDataDict, project.ppath)[0]
         if not success:
-            E5MessageBox.critical(self.__ui,
+            E5MessageBox.critical(
+                self.__ui,
                 self.trUtf8("Create project in repository"),
                 self.trUtf8(
                     """The project could not be created in the repository."""
@@ -220,7 +221,8 @@
             if not os.path.isfile(pfn):
                 pfn += "z"
             if not os.path.isfile(pfn):
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("New project"),
                     self.trUtf8(
                         """The project could not be checked out of the"""
@@ -507,7 +509,8 @@
                     break
             
             if not ok:
-                res = E5MessageBox.yesNo(self.__ui,
+                res = E5MessageBox.yesNo(
+                    self.__ui,
                     self.trUtf8("Commit Changes"),
                     self.trUtf8(
                         """The commit affects files, that have unsaved"""
@@ -1033,7 +1036,8 @@
         
         reposURL = self.svnGetReposName(dname)
         if reposURL is None:
-            E5MessageBox.critical(self.__ui,
+            E5MessageBox.critical(
+                self.__ui,
                 self.trUtf8("Subversion Error"),
                 self.trUtf8(
                     """The URL of the project repository could not be"""
@@ -1059,7 +1063,8 @@
         if self.otherData["standardLayout"]:
             rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
             if not rx_base.exactMatch(reposURL):
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Error"),
                     self.trUtf8("""The URL of the project repository has an"""
                         """ invalid format. The tag operation will"""
@@ -1136,7 +1141,8 @@
                 name)
             yes = dia.exec_() == QDialog.Accepted
         else:
-            yes = E5MessageBox.yesNo(None,
+            yes = E5MessageBox.yesNo(
+                None,
                 self.trUtf8("Revert changes"),
                 self.trUtf8("""Do you really want to revert all changes of"""
                             """ the project?"""))
@@ -1171,7 +1177,8 @@
         
         reposURL = self.svnGetReposName(dname)
         if reposURL is None:
-            E5MessageBox.critical(self.__ui,
+            E5MessageBox.critical(
+                self.__ui,
                 self.trUtf8("Subversion Error"),
                 self.trUtf8(
                     """The URL of the project repository could not be"""
@@ -1197,7 +1204,8 @@
         if self.otherData["standardLayout"]:
             rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
             if not rx_base.exactMatch(reposURL):
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Error"),
                     self.trUtf8("""The URL of the project repository has an"""
                         """ invalid format. The switch operation will"""
@@ -1851,7 +1859,8 @@
         if dlg.exec_() == QDialog.Accepted:
             propName, propValue, recurse = dlg.getData()
             if not propName:
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Set Property"),
                     self.trUtf8(
                         """You have to supply a property name. Aborting."""))
@@ -1904,7 +1913,8 @@
             propName, recurse = dlg.getData()
             
             if not propName:
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Delete Property"),
                     self.trUtf8(
                         """You have to supply a property name. Aborting."""))
@@ -2132,7 +2142,8 @@
         
         output1, error = self.__svnGetFileForRevision(name, rev=rev1)
         if error:
-            E5MessageBox.critical(self.__ui,
+            E5MessageBox.critical(
+                self.__ui,
                 self.trUtf8("Subversion Side-by-Side Difference"),
                 error)
             return
@@ -2141,7 +2152,8 @@
         if rev2:
             output2, error = self.__svnGetFileForRevision(name, rev=rev2)
             if error:
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Side-by-Side Difference"),
                     error)
                 return
@@ -2153,7 +2165,8 @@
                 f1.close()
                 name2 = name
             except IOError:
-                E5MessageBox.critical(self.__ui,
+                E5MessageBox.critical(
+                    self.__ui,
                     self.trUtf8("Subversion Side-by-Side Difference"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be read.</p>""")