| durin42 |
| hg-reviewers |
I think this code is easier to read. But the real reason to do this
is to eliminate a consumer of wsgirequest.
| 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 (12 lines) |
| # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. | # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. | ||||
| # | # | ||||
| # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | ||||
| # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import os | import os | ||||
| import re | |||||
| import time | import time | ||||
| from ..i18n import _ | from ..i18n import _ | ||||
| from .common import ( | from .common import ( | ||||
| ErrorResponse, | ErrorResponse, | ||||
| HTTP_NOT_FOUND, | HTTP_NOT_FOUND, | ||||
| HTTP_OK, | HTTP_OK, | ||||
| path = path[:-len(discarded) - 1] | path = path[:-len(discarded) - 1] | ||||
| 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 = [name] | parts = [ | ||||
| parts.insert(0, '/' + subdir.rstrip('/')) | wsgireq.req.apppath.strip('/'), | ||||
| if wsgireq.env['SCRIPT_NAME']: | subdir.strip('/'), | ||||
| parts.insert(0, wsgireq.env['SCRIPT_NAME']) | name.strip('/'), | ||||
| url = re.sub(r'/+', '/', '/'.join(parts) + '/') | ] | ||||
| 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 | ||||
| try: | try: | ||||
| d = (get_mtime(path), dateutil.makedate()[1]) | d = (get_mtime(path), dateutil.makedate()[1]) | ||||
| except OSError: | except OSError: | ||||
| continue | continue | ||||