| durin42 |
| hg-reviewers |
It was only accessing a few variables from the outer scope. Let's
make it standalone so there is better clarity about what the inputs
are.
| 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 (253 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='', **map): | |||||
| 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):] | |||||
| directory = False | |||||
| if '/' in name: | |||||
| if not descend: | |||||
| continue | |||||
| nameparts = name.split('/') | |||||
| rootname = nameparts[0] | |||||
| if not collapse: | |||||
| pass | |||||
| elif rootname in seendirs: | |||||
| continue | |||||
| elif rootname in seenrepos: | |||||
| pass | |||||
| else: | |||||
| directory = True | |||||
| name = rootname | |||||
| # redefine the path to refer to the directory | |||||
| discarded = '/'.join(nameparts[1:]) | |||||
| # remove name parts plus accompanying slash | |||||
| path = path[:-len(discarded) - 1] | |||||
| try: | |||||
| r = hg.repository(ui, path) | |||||
| directory = False | |||||
| except (IOError, error.RepoError): | |||||
| pass | |||||
| parts = [name] | |||||
| parts.insert(0, '/' + subdir.rstrip('/')) | |||||
| if wsgireq.env['SCRIPT_NAME']: | |||||
| parts.insert(0, wsgireq.env['SCRIPT_NAME']) | |||||
| url = re.sub(r'/+', '/', '/'.join(parts) + '/') | |||||
| # show either a directory entry or a repository | |||||
| if directory: | |||||
| # get the directory's time information | |||||
| try: | |||||
| d = (get_mtime(path), dateutil.makedate()[1]) | |||||
| except OSError: | |||||
| continue | |||||
| # add '/' to the name to make it obvious that | |||||
| # the entry is a directory, not a regular repository | |||||
| row = {'contact': "", | |||||
| 'contact_sort': "", | |||||
| 'name': name + '/', | |||||
| 'name_sort': name, | |||||
| 'url': url, | |||||
| 'description': "", | |||||
| 'description_sort': "", | |||||
| 'lastchange': d, | |||||
| 'lastchange_sort': d[1] - d[0], | |||||
| 'archives': [], | |||||
| 'isdirectory': True, | |||||
| 'labels': [], | |||||
| } | |||||
| seendirs.add(name) | |||||
| yield row | |||||
| continue | |||||
| u = ui.copy() | |||||
| try: | |||||
| u.readconfig(os.path.join(path, '.hg', 'hgrc')) | |||||
| except Exception as e: | |||||
| u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | |||||
| continue | |||||
| def get(section, name, default=uimod._unset): | |||||
| return u.config(section, name, default, untrusted=True) | |||||
| if u.configbool("web", "hidden", untrusted=True): | |||||
| continue | |||||
| if not readallowed(u, req): | |||||
| continue | |||||
| # update time with local timezone | |||||
| try: | |||||
| r = hg.repository(ui, path) | |||||
| except IOError: | |||||
| u.warn(_('error accessing repository at %s\n') % path) | |||||
| continue | |||||
| except error.RepoError: | |||||
| u.warn(_('error accessing repository at %s\n') % path) | |||||
| continue | |||||
| try: | |||||
| d = (get_mtime(r.spath), dateutil.makedate()[1]) | |||||
| except OSError: | |||||
| continue | |||||
| contact = get_contact(get) | |||||
| description = get("web", "description") | |||||
| seenrepos.add(name) | |||||
| name = get("web", "name", name) | |||||
| row = {'contact': contact or "unknown", | |||||
| 'contact_sort': contact.upper() or "unknown", | |||||
| 'name': name, | |||||
| 'name_sort': name, | |||||
| 'url': url, | |||||
| 'description': description or "unknown", | |||||
| 'description_sort': description.upper() or "unknown", | |||||
| 'lastchange': d, | |||||
| 'lastchange_sort': d[1] - d[0], | |||||
| 'archives': archivelist(u, "tip", url), | |||||
| 'isdirectory': None, | |||||
| 'labels': u.configlist('web', 'labels', untrusted=True), | |||||
| } | |||||
| yield row | |||||
| class hgwebdir(object): | class hgwebdir(object): | ||||
| """HTTP server for multiple repositories. | """HTTP server for multiple repositories. | ||||
| Given a configuration, different repositories will be served depending | Given a configuration, different repositories will be served depending | ||||
| on the request path. | on the request path. | ||||
| Instances are typically used as WSGI applications. | Instances are typically used as WSGI applications. | ||||
| """ | """ | ||||
| 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, wsgireq, tmpl, subdir=""): | ||||
| req = wsgireq.req | req = wsgireq.req | ||||
| def rawentries(subdir="", **map): | |||||
| descend = self.ui.configbool('web', 'descend') | |||||
| collapse = self.ui.configbool('web', 'collapse') | |||||
| seenrepos = set() | |||||
| seendirs = set() | |||||
| for name, path in self.repos: | |||||
| if not name.startswith(subdir): | |||||
| continue | |||||
| name = name[len(subdir):] | |||||
| directory = False | |||||
| if '/' in name: | |||||
| if not descend: | |||||
| continue | |||||
| nameparts = name.split('/') | |||||
| rootname = nameparts[0] | |||||
| if not collapse: | |||||
| pass | |||||
| elif rootname in seendirs: | |||||
| continue | |||||
| elif rootname in seenrepos: | |||||
| pass | |||||
| else: | |||||
| directory = True | |||||
| name = rootname | |||||
| # redefine the path to refer to the directory | |||||
| discarded = '/'.join(nameparts[1:]) | |||||
| # remove name parts plus accompanying slash | |||||
| path = path[:-len(discarded) - 1] | |||||
| try: | |||||
| r = hg.repository(self.ui, path) | |||||
| directory = False | |||||
| except (IOError, error.RepoError): | |||||
| pass | |||||
| parts = [name] | |||||
| parts.insert(0, '/' + subdir.rstrip('/')) | |||||
| if wsgireq.env['SCRIPT_NAME']: | |||||
| parts.insert(0, wsgireq.env['SCRIPT_NAME']) | |||||
| url = re.sub(r'/+', '/', '/'.join(parts) + '/') | |||||
| # show either a directory entry or a repository | |||||
| if directory: | |||||
| # get the directory's time information | |||||
| try: | |||||
| d = (get_mtime(path), dateutil.makedate()[1]) | |||||
| except OSError: | |||||
| continue | |||||
| # add '/' to the name to make it obvious that | |||||
| # the entry is a directory, not a regular repository | |||||
| row = {'contact': "", | |||||
| 'contact_sort': "", | |||||
| 'name': name + '/', | |||||
| 'name_sort': name, | |||||
| 'url': url, | |||||
| 'description': "", | |||||
| 'description_sort': "", | |||||
| 'lastchange': d, | |||||
| 'lastchange_sort': d[1]-d[0], | |||||
| 'archives': [], | |||||
| 'isdirectory': True, | |||||
| 'labels': [], | |||||
| } | |||||
| seendirs.add(name) | |||||
| yield row | |||||
| continue | |||||
| u = self.ui.copy() | |||||
| try: | |||||
| u.readconfig(os.path.join(path, '.hg', 'hgrc')) | |||||
| except Exception as e: | |||||
| u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | |||||
| continue | |||||
| def get(section, name, default=uimod._unset): | |||||
| return u.config(section, name, default, untrusted=True) | |||||
| if u.configbool("web", "hidden", untrusted=True): | |||||
| continue | |||||
| if not readallowed(u, req): | |||||
| continue | |||||
| # update time with local timezone | |||||
| try: | |||||
| r = hg.repository(self.ui, path) | |||||
| except IOError: | |||||
| u.warn(_('error accessing repository at %s\n') % path) | |||||
| continue | |||||
| except error.RepoError: | |||||
| u.warn(_('error accessing repository at %s\n') % path) | |||||
| continue | |||||
| try: | |||||
| d = (get_mtime(r.spath), dateutil.makedate()[1]) | |||||
| except OSError: | |||||
| continue | |||||
| contact = get_contact(get) | |||||
| description = get("web", "description") | |||||
| seenrepos.add(name) | |||||
| name = get("web", "name", name) | |||||
| row = {'contact': contact or "unknown", | |||||
| 'contact_sort': contact.upper() or "unknown", | |||||
| 'name': name, | |||||
| 'name_sort': name, | |||||
| 'url': url, | |||||
| 'description': description or "unknown", | |||||
| 'description_sort': description.upper() or "unknown", | |||||
| 'lastchange': d, | |||||
| 'lastchange_sort': d[1]-d[0], | |||||
| 'archives': archivelist(u, "tip", url), | |||||
| 'isdirectory': None, | |||||
| 'labels': u.configlist('web', 'labels', untrusted=True), | |||||
| } | |||||
| yield row | |||||
| sortdefault = None, False | sortdefault = None, False | ||||
| def entries(sortcolumn="", descending=False, subdir="", **map): | def entries(sortcolumn="", descending=False, subdir="", **map): | ||||
| rows = rawentries(subdir=subdir, **map) | rows = rawindexentries(self.ui, self.repos, wsgireq, req, | ||||
| subdir=subdir, **map) | |||||
| 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) | ||||
| for row, parity in zip(rows, paritygen(self.stripecount)): | for row, parity in zip(rows, paritygen(self.stripecount)): | ||||
| row['parity'] = parity | row['parity'] = parity | ||||
| yield row | yield row | ||||