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

-:d0915392cbd7
+:ca5e65413fc5
 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'))
 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
 args = []
 args.append('checkout')
 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
 args = []
 args.append('export')
 """ 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)
 args = []
 if tagOp in [1, 2]:
 args.append('copy')
 self.addArguments(args, self.options['global'])
 self.addArguments(args, self.options['tag'])
 args.append('--message')
-args.append('Created tag <%s>' % tag)
+args.append('Created tag <{0}>'.format(tag))
 args.append(reposURL)
 args.append(url)
 else:
 args.append('delete')
 self.addArguments(args, self.options['global'])
 self.addArguments(args, self.options['tag'])
 args.append('--message')
-args.append('Deleted tag <%s>' % tag)
+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)
 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
 line.replace('<author>', '').replace('</author>', '')
 elif line.startswith('<date>'):
 value = line.replace('<date>', '').replace('</date>', '')
 date, time = value.split('T')
 info['committed-date'] = date
-info['committed-time'] = "%s%s" % (time.split('.')[0], time[-1])
+info['committed-time'] = "{0}{1}".format(
+time.split('.')[0], time[-1])
 return QApplication.translate('subversion',
 """<h3>Repository information</h3>"""
 """<table>"""
 """<tr><td><b>Subversion V.</b></td><td>{0}</td></tr>"""
 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/vcsSubversion/subversion.py

Plugins/VcsPlugins/vcsSubversion/subversion.py