| durin42 |
| hg-reviewers |
We only ever access attributes that are available on our newer
request type. So we no longer need this argument.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgwebdir_mod.py (20 lines) |
| 'type': typ, | 'type': typ, | ||||
| 'extension': spec[2], | 'extension': spec[2], | ||||
| 'node': nodeid, | 'node': nodeid, | ||||
| 'url': url, | 'url': url, | ||||
| }) | }) | ||||
| return archives | return archives | ||||
| def rawindexentries(ui, repos, wsgireq, req, subdir=''): | def rawindexentries(ui, repos, req, subdir=''): | ||||
| descend = ui.configbool('web', 'descend') | descend = ui.configbool('web', 'descend') | ||||
| collapse = ui.configbool('web', 'collapse') | collapse = ui.configbool('web', 'collapse') | ||||
| seenrepos = set() | seenrepos = set() | ||||
| seendirs = set() | seendirs = set() | ||||
| for name, path in repos: | for name, path in repos: | ||||
| if not name.startswith(subdir): | if not name.startswith(subdir): | ||||
| continue | continue | ||||
| try: | try: | ||||
| r = hg.repository(ui, path) | r = hg.repository(ui, path) | ||||
| directory = False | directory = False | ||||
| except (IOError, error.RepoError): | except (IOError, error.RepoError): | ||||
| pass | pass | ||||
| parts = [ | parts = [ | ||||
| wsgireq.req.apppath.strip('/'), | req.apppath.strip('/'), | ||||
| subdir.strip('/'), | subdir.strip('/'), | ||||
| name.strip('/'), | name.strip('/'), | ||||
| ] | ] | ||||
| url = '/' + '/'.join(p for p in parts if p) + '/' | url = '/' + '/'.join(p for p in parts if p) + '/' | ||||
| # show either a directory entry or a repository | # show either a directory entry or a repository | ||||
| if directory: | if directory: | ||||
| # get the directory's time information | # get the directory's time information | ||||
| 'lastchange_sort': d[1] - d[0], | 'lastchange_sort': d[1] - d[0], | ||||
| 'archives': archivelist(u, "tip", url), | 'archives': archivelist(u, "tip", url), | ||||
| 'isdirectory': None, | 'isdirectory': None, | ||||
| 'labels': u.configlist('web', 'labels', untrusted=True), | 'labels': u.configlist('web', 'labels', untrusted=True), | ||||
| } | } | ||||
| yield row | yield row | ||||
| def indexentries(ui, repos, wsgireq, req, stripecount, sortcolumn='', | def indexentries(ui, repos, req, stripecount, sortcolumn='', | ||||
| descending=False, subdir=''): | descending=False, subdir=''): | ||||
| rows = rawindexentries(ui, repos, wsgireq, req, subdir=subdir) | rows = rawindexentries(ui, repos, req, subdir=subdir) | ||||
| sortdefault = None, False | sortdefault = None, False | ||||
| if sortcolumn and sortdefault != (sortcolumn, descending): | if sortcolumn and sortdefault != (sortcolumn, descending): | ||||
| sortkey = '%s_sort' % sortcolumn | sortkey = '%s_sort' % sortcolumn | ||||
| rows = sorted(rows, key=lambda x: x[sortkey], | rows = sorted(rows, key=lambda x: x[sortkey], | ||||
| reverse=descending) | reverse=descending) | ||||
| return res.sendresponse() | return res.sendresponse() | ||||
| # top-level index | # top-level index | ||||
| repos = dict(self.repos) | repos = dict(self.repos) | ||||
| if (not virtual or virtual == 'index') and virtual not in repos: | if (not virtual or virtual == 'index') and virtual not in repos: | ||||
| wsgireq.respond(HTTP_OK, ctype) | wsgireq.respond(HTTP_OK, ctype) | ||||
| return self.makeindex(wsgireq, tmpl) | return self.makeindex(req, tmpl) | ||||
| # nested indexes and hgwebs | # nested indexes and hgwebs | ||||
| if virtual.endswith('/index') and virtual not in repos: | 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): | if any(r.startswith(subdir) for r in repos): | ||||
| wsgireq.respond(HTTP_OK, ctype) | wsgireq.respond(HTTP_OK, ctype) | ||||
| return self.makeindex(wsgireq, tmpl, subdir) | return self.makeindex(req, tmpl, subdir) | ||||
| def _virtualdirs(): | def _virtualdirs(): | ||||
| # Check the full virtual path, each parent, and the root ('') | # Check the full virtual path, each parent, and the root ('') | ||||
| if virtual != '': | if virtual != '': | ||||
| yield virtual | yield virtual | ||||
| for p in util.finddirs(virtual): | for p in util.finddirs(virtual): | ||||
| yield p | yield p | ||||
| raise ErrorResponse(HTTP_SERVER_ERROR, msg) | raise ErrorResponse(HTTP_SERVER_ERROR, msg) | ||||
| except error.RepoError as inst: | except error.RepoError as inst: | ||||
| raise ErrorResponse(HTTP_SERVER_ERROR, bytes(inst)) | raise ErrorResponse(HTTP_SERVER_ERROR, bytes(inst)) | ||||
| # browse subdirectories | # browse subdirectories | ||||
| subdir = virtual + '/' | subdir = virtual + '/' | ||||
| if [r for r in repos if r.startswith(subdir)]: | if [r for r in repos if r.startswith(subdir)]: | ||||
| wsgireq.respond(HTTP_OK, ctype) | wsgireq.respond(HTTP_OK, ctype) | ||||
| return self.makeindex(wsgireq, tmpl, subdir) | return self.makeindex(req, tmpl, subdir) | ||||
| # prefixes not found | # prefixes not found | ||||
| wsgireq.respond(HTTP_NOT_FOUND, ctype) | wsgireq.respond(HTTP_NOT_FOUND, ctype) | ||||
| return tmpl("notfound", repo=virtual) | return tmpl("notfound", repo=virtual) | ||||
| except ErrorResponse as err: | except ErrorResponse as err: | ||||
| wsgireq.respond(err, ctype) | wsgireq.respond(err, ctype) | ||||
| return tmpl('error', error=err.message or '') | return tmpl('error', error=err.message or '') | ||||
| finally: | finally: | ||||
| tmpl = None | tmpl = None | ||||
| def makeindex(self, wsgireq, tmpl, subdir=""): | def makeindex(self, req, tmpl, subdir=""): | ||||
| req = wsgireq.req | |||||
| self.refresh() | self.refresh() | ||||
| sortable = ["name", "description", "contact", "lastchange"] | sortable = ["name", "description", "contact", "lastchange"] | ||||
| sortcolumn, descending = None, False | sortcolumn, descending = None, False | ||||
| if 'sort' in req.qsparams: | if 'sort' in req.qsparams: | ||||
| sortcolumn = req.qsparams['sort'] | sortcolumn = req.qsparams['sort'] | ||||
| descending = sortcolumn.startswith('-') | descending = sortcolumn.startswith('-') | ||||
| if descending: | if descending: | ||||
| sortcolumn = sortcolumn[1:] | sortcolumn = sortcolumn[1:] | ||||
| if sortcolumn not in sortable: | if sortcolumn not in sortable: | ||||
| sortcolumn = "" | sortcolumn = "" | ||||
| sort = [("sort_%s" % column, | sort = [("sort_%s" % column, | ||||
| "%s%s" % ((not descending and column == sortcolumn) | "%s%s" % ((not descending and column == sortcolumn) | ||||
| and "-" or "", column)) | and "-" or "", column)) | ||||
| for column in sortable] | for column in sortable] | ||||
| self.refresh() | self.refresh() | ||||
| entries = indexentries(self.ui, self.repos, wsgireq, req, | entries = indexentries(self.ui, self.repos, req, | ||||
| self.stripecount, sortcolumn=sortcolumn, | self.stripecount, sortcolumn=sortcolumn, | ||||
| descending=descending, subdir=subdir) | descending=descending, subdir=subdir) | ||||
| return tmpl("index", entries=entries, subdir=subdir, | return tmpl("index", entries=entries, subdir=subdir, | ||||
| pathdef=hgweb_mod.makebreadcrumb('/' + subdir, self.prefix), | pathdef=hgweb_mod.makebreadcrumb('/' + subdir, self.prefix), | ||||
| sortcolumn=sortcolumn, descending=descending, | sortcolumn=sortcolumn, descending=descending, | ||||
| **dict(sort)) | **dict(sort)) | ||||