comparison mercurial/hgweb/hgwebdir_mod.py @ 25427:d0c7ffc4c8bc

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Jun 2015 17:51:19 -0500
parents 724d7982b790 5f3666da6910
children 89ce95f907bd
comparison
equal deleted inserted replaced
25424:69609f43c752 25427:d0c7ffc4c8bc
289 discarded = '/'.join(nameparts[1:]) 289 discarded = '/'.join(nameparts[1:])
290 290
291 # remove name parts plus accompanying slash 291 # remove name parts plus accompanying slash
292 path = path[:-len(discarded) - 1] 292 path = path[:-len(discarded) - 1]
293 293
294 try:
295 r = hg.repository(self.ui, path)
296 directory = False
297 except (IOError, error.RepoError):
298 pass
299
294 parts = [name] 300 parts = [name]
295 if 'PATH_INFO' in req.env: 301 if 'PATH_INFO' in req.env:
296 parts.insert(0, req.env['PATH_INFO'].rstrip('/')) 302 parts.insert(0, req.env['PATH_INFO'].rstrip('/'))
297 if req.env['SCRIPT_NAME']: 303 if req.env['SCRIPT_NAME']:
298 parts.insert(0, req.env['SCRIPT_NAME']) 304 parts.insert(0, req.env['SCRIPT_NAME'])