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

-:9a21c547de5f
+:a9a94491c4fd
 v.append(0)
 self.version = tuple(v)
 return True, errMsg
 else:
 if finished:
-errMsg = self.trUtf8(
+errMsg = self.tr(
 "The svn process finished with the exit code {0}")\
 .format(process.exitCode())
 else:
-errMsg = self.trUtf8(
+errMsg = self.tr(
 "The svn process did not finish within 30s.")
 else:
-errMsg = self.trUtf8("Could not start the svn executable.")
+errMsg = self.tr("Could not start the svn executable.")
 return False, errMsg
 def vcsInit(self, vcsDir, noDialog=False):
 """
 """
 success = self.vcsImport(vcsDataDict, project.ppath)[0]
 if not success:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Create project in repository"),
+self.tr("Create project in repository"),
-self.trUtf8(
+self.tr(
 """The project could not be created in the repository."""
 """ Maybe the given repository doesn't exist or the"""
 """ repository server is down."""))
 else:
 cwdIsPpath = False
 if not os.path.isfile(pfn):
 pfn += "z"
 if not os.path.isfile(pfn):
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("New project"),
+self.tr("New project"),
-self.trUtf8(
+self.tr(
 """The project could not be checked out of the"""
 """ repository.<br />"""
 """Restoring the original contents."""))
 if os.getcwd() == project.ppath:
 os.chdir(os.path.dirname(project.ppath))
 if noDialog:
 status = self.startSynchronizedProcess(
 QProcess(), "svn", args, os.path.join(tmpDir, project))
 else:
 dia = SvnDialog(
-self.trUtf8('Importing project into Subversion repository'))
+self.tr('Importing project into Subversion repository'))
 res = dia.startProcess(args, os.path.join(tmpDir, project))
 if res:
 dia.exec_()
 status = dia.normalExit()
 else:
 if not tag.startswith('tags') and \
 not tag.startswith('branches'):
 type, ok = QInputDialog.getItem(
 None,
-self.trUtf8("Subversion Checkout"),
+self.tr("Subversion Checkout"),
-self.trUtf8(
+self.tr(
 "The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 if noDialog:
 return self.startSynchronizedProcess(QProcess(), 'svn', args)
 else:
 dia = SvnDialog(
-self.trUtf8('Checking project out of Subversion repository'))
+self.tr('Checking project out of Subversion repository'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 return dia.normalExit()
 else:
 if not tag.startswith('tags') and \
 not tag.startswith('branches'):
 type, ok = QInputDialog.getItem(
 None,
-self.trUtf8("Subversion Export"),
+self.tr("Subversion Export"),
-self.trUtf8(
+self.tr(
 "The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 args.append("--force")
 args.append(self.__svnURL(svnUrl))
 args.append(projectDir)
 dia = SvnDialog(
-self.trUtf8('Exporting project from Subversion repository'))
+self.tr('Exporting project from Subversion repository'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 return dia.normalExit()
 break
 if not ok:
 res = E5MessageBox.yesNo(
 self.__ui,
-self.trUtf8("Commit Changes"),
+self.tr("Commit Changes"),
-self.trUtf8(
+self.tr(
 """The commit affects files, that have unsaved"""
 """ changes. Shall the commit be continued?"""),
 icon=E5MessageBox.Warning)
 if not res:
 return
 if noDialog:
 self.startSynchronizedProcess(QProcess(), "svn", args, dname)
 else:
 dia = SvnDialog(
-self.trUtf8('Commiting changes to Subversion repository'))
+self.tr('Commiting changes to Subversion repository'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 self.committed.emit()
 self.checkVCSStatus()
 if noDialog:
 self.startSynchronizedProcess(QProcess(), "svn", args, dname)
 res = False
 else:
 dia = SvnDialog(
-self.trUtf8('Synchronizing with the Subversion repository'))
+self.tr('Synchronizing with the Subversion repository'))
 res = dia.startProcess(args, dname, True)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 if noDialog:
 self.startSynchronizedProcess(QProcess(), "svn", args, wdir)
 else:
 dia = SvnDialog(
-self.trUtf8('Adding files/directories to the Subversion'
+self.tr('Adding files/directories to the Subversion'
 ' repository'))
 res = dia.startProcess(args, wdir)
 if res:
 dia.exec_()
 def vcsAddBinary(self, name, isDir=False):
 self.addArguments(args, path)
 else:
 args.append(path)
 dia = SvnDialog(
-self.trUtf8('Adding directory trees to the Subversion repository'))
+self.tr('Adding directory trees to the Subversion repository'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def vcsRemove(self, name, project=False, noDialog=False):
 if noDialog:
 res = self.startSynchronizedProcess(QProcess(), "svn", args)
 else:
 dia = SvnDialog(
-self.trUtf8('Removing files/directories from the Subversion'
+self.tr('Removing files/directories from the Subversion'
 ' repository'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 res = dia.normalExit()
 args.append(target)
 if noDialog:
 res = self.startSynchronizedProcess(QProcess(), "svn", args)
 else:
-dia = SvnDialog(self.trUtf8('Moving {0}')
+dia = SvnDialog(self.tr('Moving {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 res = dia.normalExit()
 @param name file/directory name to show the log of (string)
 """
 isFile = os.path.isfile(name)
 noEntries, ok = QInputDialog.getInt(
 None,
-self.trUtf8("Subversion Log"),
+self.tr("Subversion Log"),
-self.trUtf8("Select number of entries to show."),
+self.tr("Select number of entries to show."),
 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1)
 if ok:
 from .SvnLogDialog import SvnLogDialog
 self.log = SvnLogDialog(self, isFile=isFile)
 self.log.show()
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Error"),
+self.tr("Subversion Error"),
-self.trUtf8(
+self.tr(
 """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,
-self.trUtf8("Subversion Error"),
+self.tr("Subversion Error"),
-self.trUtf8(
+self.tr(
 """The URL of the project repository has an"""
 """ invalid format. The tag operation will"""
 """ be aborted"""))
 return
 self.addArguments(args, self.options['tag'])
 args.append('--message')
 args.append('Deleted tag <{0}>'.format(tag))
 args.append(url)
-dia = SvnDialog(self.trUtf8('Tagging {0} in the Subversion repository')
+dia = SvnDialog(self.tr('Tagging {0} in the Subversion repository')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import \
 DeleteFilesConfirmationDialog
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
-self.trUtf8("Revert changes"),
+self.tr("Revert changes"),
-self.trUtf8("Do you really want to revert all changes to"
+self.tr("Do you really want to revert all changes to"
 " these files or directories?"),
 names)
 yes = dlg.exec_() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
-self.trUtf8("Revert changes"),
+self.tr("Revert changes"),
-self.trUtf8("""Do you really want to revert all changes of"""
+self.tr("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
-dia = SvnDialog(self.trUtf8('Reverting changes'))
+dia = SvnDialog(self.tr('Reverting changes'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 self.checkVCSStatus()
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Error"),
+self.tr("Subversion Error"),
-self.trUtf8(
+self.tr(
 """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,
-self.trUtf8("Subversion Error"),
+self.tr("Subversion Error"),
-self.trUtf8(
+self.tr(
 """The URL of the project repository has an"""
 """ invalid format. The switch operation will"""
 """ be aborted"""))
 return False
 args.append('--accept')
 args.append('postpone')
 args.append(url)
 args.append(name)
-dia = SvnDialog(self.trUtf8('Switching to {0}')
+dia = SvnDialog(self.tr('Switching to {0}')
 .format(tn))
 res = dia.startProcess(args, setLanguage=True)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 else:
 args.append(self.__svnURL(urlrev1))
 args.append(self.__svnURL(urlrev2))
 args.append(fname)
-dia = SvnDialog(self.trUtf8('Merging {0}').format(name))
+dia = SvnDialog(self.tr('Merging {0}').format(name))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def vcsRegisteredState(self, name):
 args = []
 args.append('cleanup')
 self.addArguments(args, self.options['global'])
 args.append(name)
-dia = SvnDialog(self.trUtf8('Cleaning up {0}')
+dia = SvnDialog(self.tr('Cleaning up {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 self.wdHistory.insert(0, wd)
 args = []
 self.addArguments(args, commandList)
-dia = SvnDialog(self.trUtf8('Subversion command'))
+dia = SvnDialog(self.tr('Subversion command'))
 res = dia.startProcess(args, wd)
 if res:
 dia.exec_()
 def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 else:
 if os.path.isdir(name):
 args.append('--recursive')
 args.append(name)
-dia = SvnDialog(self.trUtf8('Resolving conficts'))
+dia = SvnDialog(self.tr('Resolving conficts'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 self.checkVCSStatus()
 args.append('Copying {0} to {1}'.format(name, target))
 target = self.__svnURL(target)
 args.append(name)
 args.append(target)
-dia = SvnDialog(self.trUtf8('Copying {0}')
+dia = SvnDialog(self.tr('Copying {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if dlg.exec_() == QDialog.Accepted:
 propName, fileFlag, propValue = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Set Property"),
+self.tr("Subversion Set Property"),
-self.trUtf8("""You have to supply a property name."""
+self.tr("""You have to supply a property name."""
 """ Aborting."""))
 return
 args = []
 args.append('propset')
 self.addArguments(args, self.options['global'])
 self.addArguments(args, fnames)
 else:
 dname, fname = self.splitPath(name)
 args.append(fname)
-dia = SvnDialog(self.trUtf8('Subversion Set Property'))
+dia = SvnDialog(self.tr('Subversion Set Property'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnDelProp(self, name, recursive=False):
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive list is requested
 """
 propName, ok = QInputDialog.getText(
 None,
-self.trUtf8("Subversion Delete Property"),
+self.tr("Subversion Delete Property"),
-self.trUtf8("Enter property name"),
+self.tr("Enter property name"),
 QLineEdit.Normal)
 if not ok:
 return
 if not propName:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Delete Property"),
+self.tr("Subversion Delete Property"),
-self.trUtf8("""You have to supply a property name."""
+self.tr("""You have to supply a property name."""
 """ Aborting."""))
 return
 args = []
 args.append('propdel')
 self.addArguments(args, self.options['global'])
 self.addArguments(args, fnames)
 else:
 dname, fname = self.splitPath(name)
 args.append(fname)
-dia = SvnDialog(self.trUtf8('Subversion Delete Property'))
+dia = SvnDialog(self.tr('Subversion Delete Property'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnListTagBranch(self, path, tags=True):
 else:
 error = str(
 process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = self.trUtf8(
+error = self.tr(
 "The svn process did not finish within 30s.")
 else:
-error = self.trUtf8(
+error = self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.').format('svn')
 return output, error
 output1, error = self.__svnGetFileForRevision(name, rev=rev1)
 if error:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Side-by-Side Difference"),
+self.tr("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,
-self.trUtf8("Subversion Side-by-Side Difference"),
+self.tr("Subversion Side-by-Side Difference"),
 error)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 else:
 try:
 f1.close()
 name2 = name
 except IOError:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Side-by-Side Difference"),
+self.tr("Subversion Side-by-Side Difference"),
-self.trUtf8(
+self.tr(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 return
 if self.sbsDiff is None:
 else:
 dname, fname = self.splitPath(name)
 args.append(fname)
 dia = SvnDialog(
-self.trUtf8('Locking in the Subversion repository'), parent)
+self.tr('Locking in the Subversion repository'), parent)
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnUnlock(self, name, breakIt=False, parent=None):
 else:
 dname, fname = self.splitPath(name)
 args.append(fname)
 dia = SvnDialog(
-self.trUtf8('Unlocking in the Subversion repository'), parent)
+self.tr('Unlocking in the Subversion repository'), parent)
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnRelocate(self, projectPath):
 args.append('--relocate')
 args.append(currUrl)
 args.append(newUrl)
 args.append(projectPath)
-dia = SvnDialog(self.trUtf8('Relocating'))
+dia = SvnDialog(self.tr('Relocating'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 def svnRepoBrowser(self, projectPath=None):
 url = None
 if url is None:
 url, ok = QInputDialog.getText(
 None,
-self.trUtf8("Repository Browser"),
+self.tr("Repository Browser"),
-self.trUtf8("Enter the repository URL."),
+self.tr("Enter the repository URL."),
 QLineEdit.Normal)
 if not ok or not url:
 return
 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
 self.addArguments(args, fnames)
 else:
 dname, fname = self.splitPath(names)
 args.append(fname)
-dia = SvnDialog(self.trUtf8('Remove from changelist'))
+dia = SvnDialog(self.tr('Remove from changelist'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnAddToChangelist(self, names):
 @param names name or list of names of file or directory to add
 (string)
 """
 clname, ok = QInputDialog.getItem(
 None,
-self.trUtf8("Add to changelist"),
+self.tr("Add to changelist"),
-self.trUtf8("Enter name of the changelist:"),
+self.tr("Enter name of the changelist:"),
 sorted(self.svnGetChangelists()),
 0, True)
 if not ok or not clname:
 return
 self.addArguments(args, fnames)
 else:
 dname, fname = self.splitPath(names)
 args.append(fname)
-dia = SvnDialog(self.trUtf8('Remove from changelist'))
+dia = SvnDialog(self.tr('Remove from changelist'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 def svnShowChangelists(self, path):
 """
 args = []
 args.append("upgrade")
 args.append(".")
-dia = SvnDialog(self.trUtf8('Upgrade'))
+dia = SvnDialog(self.tr('Upgrade'))
 res = dia.startProcess(args, path)
 if res:
 dia.exec_()
 ###########################################################################

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py

Plugins/VcsPlugins/vcsSubversion/subversion.py