eric: comparison Plugins/VcsPlugins/vcsSubversion/subversion.py

-:10516539f238
+:0a02c433f52d
 @param vcsDataDict dictionary of data required for the conversion
 @param project reference to the project object
 """
 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."""
 """ Maybe the given repository doesn't exist or the"""
 """ repository server is down."""))
 self.vcsCommit(project.ppath, vcsDataDict["message"], True)
 pfn = project.pfile
 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"""
 """ repository.<br />"""
 """Restoring the original contents."""))
 args.append('-m')
 args.append(msg)
 args.append(self.__svnURL(vcsDir))
 if noDialog:
-status = self.startSynchronizedProcess(QProcess(), "svn", args,
+status = self.startSynchronizedProcess(
-os.path.join(tmpDir, project))
+QProcess(), "svn", args, os.path.join(tmpDir, project))
 else:
 dia = SvnDialog(
 self.trUtf8('Importing project into Subversion repository'))
 res = dia.startProcess(args, os.path.join(tmpDir, project))
 if res:
 if not tag.startswith('tags') and \
 not tag.startswith('branches'):
 type, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Checkout"),
-self.trUtf8("The tag must be a normal tag (tags) or"
+self.trUtf8(
+"The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 if not ok:
 if not tag.startswith('tags') and \
 not tag.startswith('branches'):
 type, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Export"),
-self.trUtf8("The tag must be a normal tag (tags) or"
+self.trUtf8(
+"The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 if not ok:
 ok &= editor.checkDirty()
 if not ok:
 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"""
 """ changes. Shall the commit be continued?"""),
 icon=E5MessageBox.Warning)
 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)] == \
 self.canBeAdded):
 tree2.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 if noDialog:
 res = self.startSynchronizedProcess(QProcess(), "svn", args)
 else:
 dia = SvnDialog(self.trUtf8('Moving {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if res and not rx_prot.exactMatch(target):
 """
 dname, fname = self.splitPath(name)
 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"""
 """ retrieved from the working copy. The tag operation"""
 """ will be aborted"""))
 return
 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"""
+self.trUtf8(
+"""The URL of the project repository has an"""
 """ invalid format. The tag operation will"""
 """ be aborted"""))
 return
 reposRoot = rx_base.cap(1)
 args.append('--message')
 args.append('Deleted tag <{0}>'.format(tag))
 args.append(url)
 dia = SvnDialog(self.trUtf8('Tagging {0} in the Subversion repository')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 def vcsRevert(self, name):
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import \
 DeleteFilesConfirmationDialog
-dlg = DeleteFilesConfirmationDialog(self.parent(),
+dlg = DeleteFilesConfirmationDialog(
+self.parent(),
 self.trUtf8("Revert changes"),
 self.trUtf8("Do you really want to revert all changes to"
 " these files or directories?"),
 names)
 yes = dlg.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?"""))
 if yes:
 dia = SvnDialog(self.trUtf8('Reverting changes'))
 """
 dname, fname = self.splitPath(name)
 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"""
 """ retrieved from the working copy. The switch"""
 """ operation will be aborted"""))
 return False
 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"""
+self.trUtf8(
+"""The URL of the project repository has an"""
 """ invalid format. The switch operation will"""
 """ be aborted"""))
 return False
 reposRoot = rx_base.cap(1)
 args.append('postpone')
 args.append(url)
 args.append(name)
 dia = SvnDialog(self.trUtf8('Switching to {0}')
 .format(tn))
 res = dia.startProcess(args, setLanguage=True)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 args.append('cleanup')
 self.addArguments(args, self.options['global'])
 args.append(name)
 dia = SvnDialog(self.trUtf8('Cleaning up {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 def vcsCommandLine(self, name):
 date, time = value.split('T')
 info['committed-date'] = date
 info['committed-time'] = "{0}{1}".format(
 time.split('.')[0], time[-1])
-return QApplication.translate('subversion',
+return QApplication.translate(
+'subversion',
 """<h3>Repository information</h3>"""
 """<table>"""
 """<tr><td><b>Subversion V.</b></td><td>{0}</td></tr>"""
 """<tr><td><b>URL</b></td><td>{1}</td></tr>"""
 """<tr><td><b>Current revision</b></td><td>{2}</td></tr>"""
 target = self.__svnURL(target)
 args.append(name)
 args.append(target)
 dia = SvnDialog(self.trUtf8('Copying {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if res and \
 from .SvnPropSetDialog import SvnPropSetDialog
 dlg = SvnPropSetDialog()
 if dlg.exec_() == QDialog.Accepted:
 propName, fileFlag, propValue = 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."""))
 return
 if not ok:
 return
 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."""))
 return
 dname = self.splitPath(names[0])[0]
 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog
 dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList,
 dname)
 if dlg.exec_() == QDialog.Accepted:
 urls, summary = dlg.getURLs()
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished:
 if process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = str(process.readAllStandardError(),
+error = str(
+process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 error = self.trUtf8(
 "The svn process did not finish within 30s.")
 else:
-error = self.trUtf8('The process {0} could not be started. '
+error = self.trUtf8(
-'Ensure, that it is in the search path.').format('svn')
+'The process {0} could not be started. '
+'Ensure, that it is in the search path.').format('svn')
 return output, error
 def svnSbsDiff(self, name, extended=False, revisions=None):
 """
 else:
 rev1, rev2 = "", ""
 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
 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".")
 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
 name2 = "{0} (rev. {1})".format(name, rev2)
 else:
 f1 = open(name, "r", encoding="utf-8")
 output2 = f1.read()
 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>""")
 .format(name))
 return

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py

Plugins/VcsPlugins/vcsSubversion/subversion.py