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

-:dd7c1558b1df
+:d0915392cbd7
 else:
 cwdIsPpath = False
 if os.getcwd() == project.ppath:
 os.chdir(os.path.dirname(project.ppath))
 cwdIsPpath = True
-tmpProjectDir = "%s_tmp" % project.ppath
+tmpProjectDir = "{0}_tmp".format(project.ppath)
 shutil.rmtree(tmpProjectDir, True)
 os.rename(project.ppath, tmpProjectDir)
 os.makedirs(project.ppath)
 self.vcsCheckout(vcsDataDict, project.ppath)
 if cwdIsPpath:
 if not msg:
 msg = '***'
 vcsDir = self.svnNormalizeURL(vcsDataDict["url"])
 if vcsDir.startswith('/'):
-vcsDir = 'file://%s' % vcsDir
+vcsDir = 'file://{0}'.format(vcsDir)
 elif vcsDir[1] in ['|', ':']:
-vcsDir = 'file:///%s' % vcsDir
+vcsDir = 'file:///{0}'.format(vcsDir)
 project = vcsDir[vcsDir.rfind('/') + 1:]
 # create the dir structure to be imported into the repository
-tmpDir = '%s_tmp' % projectDir
+tmpDir = '{0}_tmp'.format(projectDir)
 try:
 os.makedirs(tmpDir)
 if self.otherData["standardLayout"]:
 os.mkdir(os.path.join(tmpDir, project))
 os.mkdir(os.path.join(tmpDir, project, 'branches'))
 url = self.__svnURL(vcsDir)
 client = self.getClient()
 if not noDialog:
 dlg = \
 SvnDialog(self.trUtf8('Importing project into Subversion repository'),
-"import%s --message %s ." % \
+"import{0} --message {1} .".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 msg),
 client)
 QApplication.processEvents()
 try:
 rev = client.import_(".", url, msg, recurse, ignore = True)
 status = True
 tag = vcsDataDict["tag"]
 except KeyError:
 tag = None
 vcsDir = self.svnNormalizeURL(vcsDataDict["url"])
 if vcsDir.startswith('/'):
-vcsDir = 'file://%s' % vcsDir
+vcsDir = 'file://{0}'.format(vcsDir)
 elif vcsDir[1] in ['|', ':']:
-vcsDir = 'file:///%s' % vcsDir
+vcsDir = 'file:///{0}'.format(vcsDir)
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
-svnUrl = '%s/trunk' % vcsDir
+svnUrl = '{0}/trunk'.format(vcsDir)
 else:
 if not tag.startswith('tags') and not tag.startswith('branches'):
 type_, ok = QInputDialog.getItem(\
 None,
 self.trUtf8("Subversion Checkout"),
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 if not ok:
 return False
-tag = '%s/%s' % (type_, tag)
+tag = '{0}/{1}'.format(type_, tag)
-svnUrl = '%s/%s' % (vcsDir, tag)
+svnUrl = '{0}/{1}'.format(vcsDir, tag)
 else:
 svnUrl = vcsDir
 opts = self.options['global'] + self.options['checkout']
 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'),
-"checkout%s %s %s" % \
+"checkout{0} {1} {2}".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.checkout(url, projectDir, recurse)
 tag = vcsDataDict["tag"]
 except KeyError:
 tag = None
 vcsDir = self.svnNormalizeURL(vcsDataDict["url"])
 if vcsDir.startswith('/') or vcsDir[1] == '|':
-vcsDir = 'file://%s' % vcsDir
+vcsDir = 'file://{0}'.format(vcsDir)
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
-svnUrl = '%s/trunk' % vcsDir
+svnUrl = '{0}/trunk'.format(vcsDir)
 else:
 if not tag.startswith('tags') and not tag.startswith('branches'):
 type_, ok = QInputDialog.getItem(\
 None,
 self.trUtf8("Subversion Export"),
 " Please select from the list."),
 self.tagTypeList,
 0, False)
 if not ok:
 return False
-tag = '%s/%s' % (type_, tag)
+tag = '{0}/{1}'.format(type_, tag)
-svnUrl = '%s/%s' % (vcsDir, tag)
+svnUrl = '{0}/{1}'.format(vcsDir, tag)
 else:
 svnUrl = vcsDir
 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'),
-"export --force%s %s %s" % \
+"export --force{0} {1} {2}".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.export(url, projectDir, force = True, recurse = recurse)
 keeplocks = "--keep-locks" in opts
 client = self.getClient()
 if not noDialog:
 dlg = \
 SvnDialog(self.trUtf8('Commiting changes to Subversion repository'),
-"commit%s%s%s%s --message %s %s" % \
+"commit{0}{1}{2}{3} --message {4} {5}".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 keeplocks and " --keep-locks" or "",
 keepChangelists and " --keep-changelists" or "",
 changelists and \
 " --changelist ".join([""] + changelists) or "",
 msg, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 if changelists:
 rev = client.checkin(fnames, msg,
 recurse = "--non-recursive" not in opts
 client = self.getClient()
 if not noDialog:
 dlg = \
 SvnDialog(self.trUtf8('Synchronizing with the Subversion repository'),
-"update%s %s" % ((not recurse) and " --non-recursive" or "",
+"update{0} {1}".format(
+(not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 client.update(fnames, recurse)
 client = self.getClient()
 if not noDialog:
 dlg = \
 SvnDialog(\
 self.trUtf8('Adding files/directories to the Subversion repository'),
-"add --non-recursive%s%s %s" % \
+"add --non-recursive{0}{1} {2}".format(
-(force and " --force" or "",
+force and " --force" or "",
 noignore and " --no-ignore" or "",
 " ".join(names)),
 client)
 QApplication.processEvents()
 try:
 client.add(names, recurse = recurse, force = force, ignore = not noignore)
 except pysvn.ClientError as e:
 ignore = "--ignore" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Adding directory trees to the Subversion repository'),
-"add%s%s %s" % \
+"add{0}{1} {2}".format(
-(force and " --force" or "",
+force and " --force" or "",
 ignore and " --ignore" or "",
 " ".join(names)),
 client)
 QApplication.processEvents()
 try:
 client.add(names, recurse = recurse, force = force, ignore = ignore)
 except pysvn.ClientError as e:
 client = self.getClient()
 if not noDialog:
 dlg = \
 SvnDialog(\
 self.trUtf8('Removing files/directories from the Subversion repository'),
-"remove%s %s" % \
+"remove{0} {1}".format(
-(force and " --force" or "",
+force and " --force" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.remove(name, force = force)
 if accepted:
 client = self.getClient()
 if rx_prot.exactMatch(target):
 target = self.__svnURL(target)
-log = "Moving %s to %s" % (name, target)
+log = "Moving {0} to {1}".format(name, target)
 else:
 log = ""
 target = target
 if not noDialog:
 dlg = \
 SvnDialog(\
 self.trUtf8('Moving {0}').format(name),
-"move%s%s %s %s" % \
+"move{0}{1} {2} {3}".format(
-(force and " --force" or "",
+force and " --force" or "",
-log and (" --message %s" % log) or "",
+log and (" --message {0}".format(log)) or "",
 name, target),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 """ be aborted"""))
 return
 reposRoot = rx_base.cap(1)
 if tagOp in [1, 4]:
-url = '%s/tags/%s' % (reposRoot, urllib.parse.quote(tag))
+url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag))
 elif tagOp in [2, 8]:
-url = '%s/branches/%s' % (reposRoot, urllib.parse.quote(tag))
+url = '{0}/branches/{1}'.format(reposRoot, urllib.parse.quote(tag))
 else:
 url = self.__svnURL(tag)
 self.tagName = tag
 client = self.getClient()
 rev = None
 if tagOp in [1, 2]:
-log = 'Created tag <%s>' % self.tagName
+log = 'Created tag <{0}>'.format(self.tagName)
 dlg = \
 SvnDialog(\
 self.trUtf8('Tagging {0} in the Subversion repository').format(name),
-"copy --message %s %s %s" % (log, reposURL, url),
+"copy --message {0} {1} {2}".format(log, reposURL, url),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.copy(reposURL, url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 else:
-log = 'Deleted tag <%s>' % self.tagName
+log = 'Deleted tag <{0}>'.format(self.tagName)
 dlg = \
 SvnDialog(\
 self.trUtf8('Tagging {0} in the Subversion repository').format(name),
-"remove --message %s %s" % (log, url),
+"remove --message {0} {1}".format(log, url),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.remove(url)
 if os.path.isdir(name[0]):
 recurse = True
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Reverting changes'),
-"revert %s %s" % ((not recurse) and " --non-recursive" or "",
+"revert {0} {1}".format((not recurse) and " --non-recursive" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 return
 reposRoot = rx_base.cap(1)
 tn = tag
 if tagType == 1:
-url = '%s/tags/%s' % (reposRoot, urllib.parse.quote(tag))
+url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag))
 elif tagType == 2:
-url = '%s/branches/%s' % (reposRoot, urllib.parse.quote(tag))
+url = '{0}/branches/{1}'.format(reposRoot, urllib.parse.quote(tag))
 elif tagType == 4:
-url = '%s/trunk' % (reposRoot)
+url = '{0}/trunk'.format(reposRoot)
 tn = 'HEAD'
 else:
 url = self.__svnURL(tag)
 tn = url
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Switching to {0}').format(tn),
-"switch %s %s" % (url, name),
+"switch {0} {1}".format(url, name),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.switch(name, url)
 rev2 = ""
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Merging {0}').format(name),
-"merge%s%s %s %s %s" % \
+"merge{0}{1} {2} {3} {4}".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 force and " --force" or "",
-"%s%s" % (url1, rev1 and ("@"+rev1) or ""),
+"{0}{1}".format(url1, rev1 and ("@"+rev1) or ""),
-"%s%s" % (url2, rev2 and ("@"+rev2) or ""),
+"{0}{1}".format(url2, rev2 and ("@"+rev2) or ""),
 fname),
 client)
 QApplication.processEvents()
 try:
 client.merge(url1, revision1, url2, revision2, fname,
 recurse = recurse, force = force)
 @param name directory name to be cleaned up (string)
 """
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Cleaning up {0}').format(name),
-"cleanup %s" % name,
+"cleanup {0}".format(name),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.cleanup(name)
 entry = self.getClient().info(ppath)
 except pysvn.ClientError as e:
 return e.args[0]
 if hasattr(pysvn, 'svn_api_version'):
-apiVersion = "%s %s" % \
+apiVersion = "{0} {1}".format(
-(".".join([str(v) for v in pysvn.svn_api_version[:3]]),
+".".join([str(v) for v in pysvn.svn_api_version[:3]]),
 pysvn.svn_api_version[3])
 else:
 apiVersion = QApplication.translate('subversion', "unknown")
 return QApplication.translate('subversion',
 """<h3>Repository information</h3>"""
 """<table>"""
 opts = self.options['global']
 recurse = "--non-recursive" not in opts
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Resolving conficts'),
-"resolved%s %s" % \
+"resolved{0} {1}".format(
-((not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 for name in fnames:
 target, force = dlg.getData()
 client = self.getClient()
 if rx_prot.exactMatch(target):
 target = self.__svnURL(target)
-log = "Copying %s to %s" % (name, target)
+log = "Copying {0} to {1}".format(name, target)
 else:
 log = ""
 target = target
 dlg = \
 SvnDialog(\
 self.trUtf8('Copying {0}').format(name),
-"copy%s %s %s" % \
+"copy{0} {1} {2}".format(
-(log and (" --message %s" % log) or "",
+log and (" --message {0}".format(log)) or "",
 name, target),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Subversion Set Property'),
-"propset%s%s %s %s %s" % \
+"propset{0}{1} {2} {3} {4}".format(
-(recurse and " --recurse" or "",
+recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, propValue,
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propset(propName, propValue, name,
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Subversion Delete Property'),
-"propdel%s%s %s %s" % \
+"propdel{0}{1} {2} {3}".format(
-(recurse and " --recurse" or "",
+recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propdel(propName, name,
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Locking in the Subversion repository'),
-"lock%s%s %s" % \
+"lock{0}{1} {2}".format(
-(stealIt and " --force" or "",
+stealIt and " --force" or "",
-comment and (" --message %s" % comment) or "",
+comment and (" --message {0}".format(comment)) or "",
 " ".join(fnames)),
 client, parent = parent)
 QApplication.processEvents()
 try:
 client.lock(fnames, comment, force = stealIt)
 except pysvn.ClientError as e:
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(\
 self.trUtf8('Unlocking in the Subversion repository'),
-"unlock%s %s" % \
+"unlock{0} {1}".format(
-(breakIt and " --force" or "",
+breakIt and " --force" or "",
 " ".join(fnames)),
 client, parent = parent)
 QApplication.processEvents()
 try:
 client.unlock(fnames, force = breakIt)
 except pysvn.ClientError as e:
 currUrl = self.svnGetReposName(projectPath)
 dlg = SvnRelocateDialog(currUrl)
 if dlg.exec_() == QDialog.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
-msg = "switch %s %s" % (newUrl, projectPath)
+msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
-msg = "relocate %s %s %s" % (currUrl, newUrl, projectPath)
+msg = "relocate {0} {1} {2}".format(currUrl, newUrl, projectPath)
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Relocating'), msg, client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 if not isinstance(names, list):
 names = [names]
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Remove from changelist'),
-"changelist --remove %s" % " ".join(names),
+"changelist --remove {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 for name in names:
 return
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Add to changelist'),
-"changelist %s" % " ".join(names),
+"changelist {0}".format(" ".join(names)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 for name in names:
 url = url.split(':', 2)
 if len(url) == 3:
 scheme = url[0]
 host = url[1]
 port, path = url[2].split("/",1)
-return "%s:%s:%s/%s" % (scheme, host, port, urllib.parse.quote(path))
+return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path))
 else:
 scheme = url[0]
 if scheme == "file":
-return "%s:%s" % (scheme, urllib.parse.quote(url[1]))
+return "{0}:{1}".format(scheme, urllib.parse.quote(url[1]))
 else:
 host, path = url[1][2:].split("/",1)
-return "%s://%s/%s" % (scheme, host, urllib.parse.quote(path))
+return "{0}://{1}/{2}".format(scheme, host, urllib.parse.quote(path))
 def svnNormalizeURL(self, url):
 """
 Public method to normalize a url for subversion.
 """
 url = url.replace('\\', '/')
 if url.endswith('/'):
 url = url[:-1]
 urll = url.split('//')
-return "%s//%s" % (urll[0], '/'.join(urll[1:]))
+return "{0}//{1}".format(urll[0], '/'.join(urll[1:]))
 ############################################################################
 ## Methods to get the helper objects are below.
 ############################################################################

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py