mercurial-scm/hg: comparison mercurial/hgweb/hgwebdir

equal deleted inserted replaced

-:57875cf423c9
+:2372284d9457
 webutil,
 wsgicgi,
 )
 from ..utils import dateutil
 def cleannames(items):
 return [(util.pconvert(name).strip('/'), path) for name, path in items]
 def findrepos(paths):
 repos = []
 for prefix, root in cleannames(paths):
 roothead, roottail = os.path.split(root)
 roothead = os.path.normpath(os.path.abspath(roothead))
 paths = scmutil.walkrepos(roothead, followsym=True, recurse=recurse)
 repos.extend(urlrepos(prefix, roothead, paths))
 return repos
 def urlrepos(prefix, roothead, paths):
 """yield url paths and filesystem paths from a list of repo paths
 >>> conv = lambda seq: [(v, util.pconvert(p)) for v,p in seq]
 >>> conv(urlrepos(b'hg', b'/opt', [b'/opt/r', b'/opt/r/r', b'/opt']))
 >>> conv(urlrepos(b'', b'/opt', [b'/opt/r', b'/opt/r/r', b'/opt']))
 [('r', '/opt/r'), ('r/r', '/opt/r/r'), ('', '/opt')]
 """
 for path in paths:
 path = os.path.normpath(path)
-yield (prefix + '/' +
+yield (
-util.pconvert(path[len(roothead):]).lstrip('/')).strip('/'), path
+prefix + '/' + util.pconvert(path[len(roothead) :]).lstrip('/')
+).strip('/'), path
 def readallowed(ui, req):
 """Check allow_read and deny_read config options of a repo's ui object
 to determine user permissions.  By default, with neither option set (or
 both empty), allow all users to read the repo.  There are two ways a
 if not allow_read or ismember(ui, user, allow_read):
 return True
 return False
 def rawindexentries(ui, repos, req, subdir=''):
 descend = ui.configbool('web', 'descend')
 collapse = ui.configbool('web', 'collapse')
 seenrepos = set()
 seendirs = set()
 for name, path in repos:
 if not name.startswith(subdir):
 continue
-name = name[len(subdir):]
+name = name[len(subdir) :]
 directory = False
 if '/' in name:
 if not descend:
 continue
 # redefine the path to refer to the directory
 discarded = '/'.join(nameparts[1:])
 # remove name parts plus accompanying slash
-path = path[:-len(discarded) - 1]
+path = path[: -len(discarded) - 1]
 try:
 hg.repository(ui, path)
 directory = False
 except (IOError, error.RepoError):
 except OSError:
 continue
 # add '/' to the name to make it obvious that
 # the entry is a directory, not a regular repository
-row = {'contact': "",
+row = {
-'contact_sort': "",
+'contact': "",
-'name': name + '/',
+'contact_sort': "",
-'name_sort': name,
+'name': name + '/',
-'url': url,
+'name_sort': name,
-'description': "",
+'url': url,
-'description_sort': "",
+'description': "",
-'lastchange': d,
+'description_sort': "",
-'lastchange_sort': d[1] - d[0],
+'lastchange': d,
-'archives': templateutil.mappinglist([]),
+'lastchange_sort': d[1] - d[0],
-'isdirectory': True,
+'archives': templateutil.mappinglist([]),
-'labels': templateutil.hybridlist([], name='label'),
+'isdirectory': True,
-}
+'labels': templateutil.hybridlist([], name='label'),
+}
 seendirs.add(name)
 yield row
 continue
 contact = get_contact(get)
 description = get("web", "description")
 seenrepos.add(name)
 name = get("web", "name", name)
 labels = u.configlist('web', 'labels', untrusted=True)
-row = {'contact': contact or "unknown",
+row = {
-'contact_sort': contact.upper() or "unknown",
+'contact': contact or "unknown",
-'name': name,
+'contact_sort': contact.upper() or "unknown",
-'name_sort': name,
+'name': name,
-'url': url,
+'name_sort': name,
-'description': description or "unknown",
+'url': url,
-'description_sort': description.upper() or "unknown",
+'description': description or "unknown",
-'lastchange': d,
+'description_sort': description.upper() or "unknown",
-'lastchange_sort': d[1] - d[0],
+'lastchange': d,
-'archives': webutil.archivelist(u, "tip", url),
+'lastchange_sort': d[1] - d[0],
-'isdirectory': None,
+'archives': webutil.archivelist(u, "tip", url),
-'labels': templateutil.hybridlist(labels, name='label'),
+'isdirectory': None,
-}
+'labels': templateutil.hybridlist(labels, name='label'),
+}
 yield row
-def _indexentriesgen(context, ui, repos, req, stripecount, sortcolumn,
-descending, subdir):
+def _indexentriesgen(
+context, ui, repos, req, stripecount, sortcolumn, descending, subdir
+):
 rows = rawindexentries(ui, repos, req, subdir=subdir)
 sortdefault = None, False
 if sortcolumn and sortdefault != (sortcolumn, descending):
 sortkey = '%s_sort' % sortcolumn
-rows = sorted(rows, key=lambda x: x[sortkey],
+rows = sorted(rows, key=lambda x: x[sortkey], reverse=descending)
-reverse=descending)
 for row, parity in zip(rows, paritygen(stripecount)):
 row['parity'] = parity
 yield row
-def indexentries(ui, repos, req, stripecount, sortcolumn='',
-descending=False, subdir=''):
+def indexentries(
+ui, repos, req, stripecount, sortcolumn='', descending=False, subdir=''
+):
 args = (ui, repos, req, stripecount, sortcolumn, descending, subdir)
 return templateutil.mappinggenerator(_indexentriesgen, args=args)
 class hgwebdir(object):
 """HTTP server for multiple repositories.
 Given a configuration, different repositories will be served depending
 on the request path.
 Instances are typically used as WSGI applications.
 """
 def __init__(self, conf, baseui=None):
 self.conf = conf
 self.baseui = baseui
 self.ui = None
 self.lastrefresh = 0
 else:
 item = configitems.coreitems['web']['refreshinterval']
 refreshinterval = item.default
 # refreshinterval <= 0 means to always refresh.
-if (refreshinterval > 0 and
+if (
-self.lastrefresh + refreshinterval > time.time()):
+refreshinterval > 0
+and self.lastrefresh + refreshinterval > time.time()
+):
 return
 if self.baseui:
 u = self.baseui.copy()
 else:
 prefix = util.pconvert(prefix)
 for path in scmutil.walkrepos(root, followsym=True):
 repo = os.path.normpath(path)
 name = util.pconvert(repo)
 if name.startswith(prefix):
-name = name[len(prefix):]
+name = name[len(prefix) :]
 repos.append((name.lstrip('/'), repo))
 self.repos = repos
 self.ui = u
 encoding.encoding = self.ui.config('web', 'encoding')
 prefix = prefix[:-1]
 self.prefix = prefix
 self.lastrefresh = time.time()
 def run(self):
-if not encoding.environ.get('GATEWAY_INTERFACE',
+if not encoding.environ.get('GATEWAY_INTERFACE', '').startswith(
-'').startswith("CGI/1."):
+"CGI/1."
-raise RuntimeError("This function is only intended to be "
+):
-"called while running as a CGI script.")
+raise RuntimeError(
+"This function is only intended to be "
+"called while running as a CGI script."
+)
 wsgicgi.launch(self)
 def __call__(self, env, respond):
 baseurl = self.ui.config('web', 'baseurl')
 req = requestmod.parserequestfromenv(env, altbaseurl=baseurl)
 return self.makeindex(req, res, tmpl)
 # nested indexes and hgwebs
 if virtual.endswith('/index') and virtual not in repos:
-subdir = virtual[:-len('index')]
+subdir = virtual[: -len('index')]
 if any(r.startswith(subdir) for r in repos):
 return self.makeindex(req, res, tmpl, subdir)
 def _virtualdirs():
 # Check the full virtual path, and each parent
 if real:
 # Re-parse the WSGI environment to take into account our
 # repository path component.
 uenv = req.rawenv
 if pycompat.ispy3:
-uenv = {k.decode('latin1'): v for k, v in
+uenv = {
-uenv.iteritems()}
+k.decode('latin1'): v for k, v in uenv.iteritems()
+}
 req = requestmod.parserequestfromenv(
-uenv, reponame=virtualrepo,
+uenv,
+reponame=virtualrepo,
 altbaseurl=self.ui.config('web', 'baseurl'),
 # Reuse wrapped body file object otherwise state
 # tracking can get confused.
-bodyfh=req.bodyfh)
+bodyfh=req.bodyfh,
+)
 try:
 # ensure caller gets private copy of ui
 repo = hg.repository(self.ui.copy(), real)
 return hgweb_mod.hgweb(repo).run_wsgi(req, res)
 except IOError as inst:
 if descending:
 sortcolumn = sortcolumn[1:]
 if sortcolumn not in sortable:
 sortcolumn = ""
-sort = [("sort_%s" % column,
+sort = [
-"%s%s" % ((not descending and column == sortcolumn)
+(
-and "-" or "", column))
+"sort_%s" % column,
-for column in sortable]
+"%s%s"
+% (
+(not descending and column == sortcolumn) and "-" or "",
+column,
+),
+)
+for column in sortable
+]
 self.refresh()
-entries = indexentries(self.ui, self.repos, req,
+entries = indexentries(
-self.stripecount, sortcolumn=sortcolumn,
+self.ui,
-descending=descending, subdir=subdir)
+self.repos,
+req,
+self.stripecount,
+sortcolumn=sortcolumn,
+descending=descending,
+subdir=subdir,
+)
 mapping = {
 'entries': entries,
 'subdir': subdir,
 'pathdef': hgweb_mod.makebreadcrumb('/' + subdir, self.prefix),
 mapping.update(sort)
 res.setbodygen(tmpl.generate('index', mapping))
 return res.sendresponse()
 def templater(self, req, nonce):
 def config(section, name, default=uimod._unset, untrusted=True):
 return self.ui.config(section, name, default, untrusted)
 vars = {}
-styles, (style, mapfile) = hgweb_mod.getstyle(req, config,
+styles, (style, mapfile) = hgweb_mod.getstyle(
-self.templatepath)
+req, config, self.templatepath
+)
 if style == styles[0]:
 vars['style'] = style
 sessionvars = webutil.sessionvars(vars, '?')
 logourl = config('web', 'logourl')
 logoimg = config('web', 'logoimg')
-staticurl = (config('web', 'staticurl')
+staticurl = (
-or req.apppath.rstrip('/') + '/static/')
+config('web', 'staticurl') or req.apppath.rstrip('/') + '/static/'
+)
 if not staticurl.endswith('/'):
 staticurl += '/'
 defaults = {
 "encoding": encoding.encoding,
 "sessionvars": sessionvars,
 "style": style,
 "nonce": nonce,
 }
 templatekeyword = registrar.templatekeyword(defaults)
 @templatekeyword('motd', requires=())
 def motd(context, mapping):
 if self.motd is not None:
 yield self.motd
 else:

changeset 43076	2372284d9457
parent 42343	d8e55c0c642c
child 43077	687b865b95ad