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

-:96232974dcdb
+:645c12de6b0c
 """
 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))
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(vcsDir)
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Importing project into Subversion repository'),
+self.tr('Importing project into Subversion repository'),
 "import{0} --message {1} .".format(
 (not recurse) and " --non-recursive" or "", msg),
 client)
 QApplication.processEvents()
 try:
 rev = None
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
-rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n")
+rev and dlg.showMessage(self.tr("Imported revision {0}.\n")
 .format(rev.number))
 dlg.finish()
 dlg.exec_()
 os.chdir(cwd)
 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)
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(svnUrl)
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Checking project out of Subversion repository'),
+self.tr('Checking project out of Subversion repository'),
 "checkout{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 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)
 opts = self.options['global']
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(svnUrl)
 client = self.getClient()
 dlg = SvnDialog(
-self.trUtf8('Exporting project from Subversion repository'),
+self.tr('Exporting project from Subversion repository'),
 "export --force{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 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
 recurse = "--non-recursive" not in opts
 keeplocks = "--keep-locks" in opts
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Commiting changes to Subversion repository'),
+self.tr('Commiting changes to Subversion repository'),
 "commit{0}{1}{2}{3} --message {4} {5}".format(
 (not recurse) and " --non-recursive" or "",
 keeplocks and " --keep-locks" or "",
 keepChangelists and " --keep-changelists" or "",
 changelists and
 rev = None
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
-rev and dlg.showMessage(self.trUtf8("Committed revision {0}.")
+rev and dlg.showMessage(self.tr("Committed revision {0}.")
 .format(rev.number))
 dlg.finish()
 dlg.exec_()
 os.chdir(cwd)
 self.committed.emit()
 opts = self.options['global'] + self.options['update']
 recurse = "--non-recursive" not in opts
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Synchronizing with the Subversion repository'),
+self.tr('Synchronizing with the Subversion repository'),
 "update{0} {1}".format(
 (not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 force = "--force" in opts or noDialog
 noignore = "--no-ignore" in opts
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Adding files/directories to the Subversion'
+self.tr('Adding files/directories to the Subversion'
 ' repository'),
 "add --non-recursive{0}{1} {2}".format(
 force and " --force" or "",
 noignore and " --no-ignore" or "",
 " ".join(names)),
 client)
 recurse = True
 force = "--force" in opts
 ignore = "--ignore" in opts
 client = self.getClient()
 dlg = SvnDialog(
-self.trUtf8('Adding directory trees to the Subversion repository'),
+self.tr('Adding directory trees to the Subversion repository'),
 "add{0}{1} {2}".format(
 force and " --force" or "",
 ignore and " --ignore" or "",
 " ".join(names)),
 client)
 opts = self.options['global'] + self.options['remove']
 force = "--force" in opts or noDialog
 client = self.getClient()
 if not noDialog:
 dlg = SvnDialog(
-self.trUtf8('Removing files/directories from the Subversion'
+self.tr('Removing files/directories from the Subversion'
 ' repository'),
 "remove{0} {1}".format(
 force and " --force" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 log = ""
 target = target
 if not noDialog:
 dlg = \
 SvnDialog(
-self.trUtf8('Moving {0}').format(name),
+self.tr('Moving {0}').format(name),
 "move{0}{1} {2} {3}".format(
 force and " --force" or "",
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 @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
 client = self.getClient()
 rev = None
 if tagOp in [1, 2]:
 log = 'Created tag <{0}>'.format(self.tagName)
 dlg = SvnDialog(
-self.trUtf8('Tagging {0} in the Subversion repository')
+self.tr('Tagging {0} in the Subversion repository')
 .format(name),
 "copy --message {0} {1} {2}".format(log, reposURL, url),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 dlg.showError(e.args[0])
 locker.unlock()
 else:
 log = 'Deleted tag <{0}>'.format(self.tagName)
 dlg = SvnDialog(
-self.trUtf8('Tagging {0} in the Subversion repository')
+self.tr('Tagging {0} in the Subversion repository')
 .format(name),
 "remove --message {0} {1}".format(log, url),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 rev = client.remove(url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 rev and dlg.showMessage(
-self.trUtf8("Revision {0}.\n").format(rev.number))
+self.tr("Revision {0}.\n").format(rev.number))
 dlg.finish()
 dlg.exec_()
 def vcsRevert(self, name):
 """
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import \
 DeleteFilesConfirmationDialog
 dia = DeleteFilesConfirmationDialog(
 self.parent(),
-self.trUtf8("Revert changes"),
+self.tr("Revert changes"),
-self.trUtf8(
+self.tr(
 "Do you really want to revert all changes to these files"
 " or directories?"),
 name)
 yes = dia.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:
 client = self.getClient()
 dlg = SvnDialog(
-self.trUtf8('Reverting changes'),
+self.tr('Reverting changes'),
 "revert {0} {1}".format(
 (not recurse) and " --non-recursive" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 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
 else:
 url = self.__svnURL(tag)
 tn = url
 client = self.getClient()
-dlg = SvnDialog(self.trUtf8('Switching to {0}').format(tn),
+dlg = SvnDialog(self.tr('Switching to {0}').format(tn),
 "switch {0} {1}".format(url, name),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.switch(name, url)
-dlg.showMessage(self.trUtf8("Revision {0}.\n").format(rev.number))
+dlg.showMessage(self.tr("Revision {0}.\n").format(rev.number))
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
 dlg.exec_()
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.unspecified)
 rev2 = ""
 client = self.getClient()
 dlg = \
 SvnDialog(
-self.trUtf8('Merging {0}').format(name),
+self.tr('Merging {0}').format(name),
 "merge{0}{1} {2} {3} {4}".format(
 (not recurse) and " --non-recursive" or "",
 force and " --force" or "",
 "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
 "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
 Public method used to cleanup the working copy.
 @param name directory name to be cleaned up (string)
 """
 client = self.getClient()
-dlg = SvnDialog(self.trUtf8('Cleaning up {0}').format(name),
+dlg = SvnDialog(self.tr('Cleaning up {0}').format(name),
 "cleanup {0}".format(name),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 args = []
 self.addArguments(args, commandList)
 from Plugins.VcsPlugins.vcsSubversion.SvnDialog import \
 SvnDialog as SvnProcessDialog
-dia = SvnProcessDialog(self.trUtf8('Subversion command'))
+dia = SvnProcessDialog(self.tr('Subversion command'))
 res = dia.startProcess(args, wd)
 if res:
 dia.exec_()
 def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 cwd = os.getcwd()
 os.chdir(dname)
 opts = self.options['global']
 recurse = "--non-recursive" not in opts
 client = self.getClient()
-dlg = SvnDialog(self.trUtf8('Resolving conficts'),
+dlg = SvnDialog(self.tr('Resolving conficts'),
 "resolved{0} {1}".format(
 (not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 else:
 log = ""
 target = target
 dlg = \
 SvnDialog(
-self.trUtf8('Copying {0}').format(name),
+self.tr('Copying {0}').format(name),
 "copy{0} {1} {2}".format(
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 QApplication.processEvents()
 if dlg.exec_() == QDialog.Accepted:
 propName, propValue, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Set Property"),
+self.tr("Subversion Set Property"),
-self.trUtf8(
+self.tr(
 """You have to supply a property name. Aborting."""))
 return
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(
-self.trUtf8('Subversion Set Property'),
+self.tr('Subversion Set Property'),
 "propset{0}{1} {2} {3} {4}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, propValue,
 " ".join(fnames)),
 client.propset(propName, propValue, name,
 recurse=recurse, skip_checks=skipchecks)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
-dlg.showMessage(self.trUtf8("Property set."))
+dlg.showMessage(self.tr("Property set."))
 dlg.finish()
 dlg.exec_()
 os.chdir(cwd)
 def svnDelProp(self, name, recursive=False):
 propName, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Subversion Delete Property"),
+self.tr("Subversion Delete Property"),
-self.trUtf8(
+self.tr(
 """You have to supply a property name. Aborting."""))
 return
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(
-self.trUtf8('Subversion Delete Property'),
+self.tr('Subversion Delete Property'),
 "propdel{0}{1} {2} {3}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, " ".join(fnames)),
 client)
 client.propdel(propName, name,
 recurse=recurse, skip_checks=skipchecks)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
-dlg.showMessage(self.trUtf8("Property deleted."))
+dlg.showMessage(self.tr("Property deleted."))
 dlg.finish()
 dlg.exec_()
 os.chdir(cwd)
 def svnListTagBranch(self, path, tags=True):
 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:
 from UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 self.sbsDiff.show()
 self.sbsDiff.compare(output1, output2, name1, name2)
-def svnLogBrowser(self, path, isFile=False):
+def vcsLogBrowser(self, name, isFile=False):
 """
 Public method used to browse the log of a file/directory from the
 Subversion repository.
-@param path file/directory name to show the log of (string)
+@param name file/directory name to show the log of (string)
 @param isFile flag indicating log for a file is to be shown (boolean)
 """
-from .SvnLogBrowserDialog import SvnLogBrowserDialog
+if self.logBrowser is None:
-self.logBrowser = SvnLogBrowserDialog(self, isFile=isFile)
+from .SvnLogBrowserDialog import SvnLogBrowserDialog
+self.logBrowser = SvnLogBrowserDialog(self)
 self.logBrowser.show()
 QApplication.processEvents()
-self.logBrowser.start(path)
+self.logBrowser.start(name, isFile=isFile)
 def svnLock(self, name, stealIt=False, parent=None):
 """
 Public method used to lock a file in the Subversion repository.
 @param parent reference to the parent object of the subversion dialog
 (QWidget)
 """
 comment, ok = QInputDialog.getText(
 None,
-self.trUtf8("Subversion Lock"),
+self.tr("Subversion Lock"),
-self.trUtf8("Enter lock comment"),
+self.tr("Enter lock comment"),
 QLineEdit.Normal)
 if not ok:
 return
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(
-self.trUtf8('Locking in the Subversion repository'),
+self.tr('Locking in the Subversion repository'),
 "lock{0}{1} {2}".format(
 stealIt and " --force" or "",
 comment and (" --message {0}".format(comment)) or "",
 " ".join(fnames)),
 client, parent=parent)
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(
-self.trUtf8('Unlocking in the Subversion repository'),
+self.tr('Unlocking in the Subversion repository'),
 "unlock{0} {1}".format(
 breakIt and " --force" or "",
 " ".join(fnames)),
 client, parent=parent)
 QApplication.processEvents()
 else:
 msg = "relocate {0} {1} {2}".format(currUrl, newUrl,
 projectPath)
 client = self.getClient()
 dlg = \
-SvnDialog(self.trUtf8('Relocating'), msg, client)
+SvnDialog(self.tr('Relocating'), msg, client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 if inside:
 client.switch(projectPath, newUrl)
 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
 """
 if not isinstance(names, list):
 names = [names]
 client = self.getClient()
 dlg = \
-SvnDialog(self.trUtf8('Remove from changelist'),
+SvnDialog(self.tr('Remove from changelist'),
 "changelist --remove {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 if not isinstance(names, list):
 names = [names]
 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
 client = self.getClient()
 dlg = \
-SvnDialog(self.trUtf8('Add to changelist'),
+SvnDialog(self.tr('Add to changelist'),
 "changelist {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 @param path directory name to show change lists for (string)
 """
 client = self.getClient()
 dlg = \
-SvnDialog(self.trUtf8('Upgrade'),
+SvnDialog(self.tr('Upgrade'),
 "upgrade {0}".format(path),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py