Mercurial > hg
comparison mercurial/hgweb/hgwebdir_mod.py @ 8537:b48a1e081f23
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 21 May 2009 22:41:18 +0200 |
parents | a767998f0a78 6796d41be421 |
children | 13613221caf1 |
comparison
equal
deleted
inserted
replaced
8535:5b6a6ed4f185 | 8537:b48a1e081f23 |
---|---|
77 elif isinstance(self.conf, dict): | 77 elif isinstance(self.conf, dict): |
78 paths = self.conf.items() | 78 paths = self.conf.items() |
79 | 79 |
80 self.repos = findrepos(paths) | 80 self.repos = findrepos(paths) |
81 for prefix, root in self.ui.configitems('collections'): | 81 for prefix, root in self.ui.configitems('collections'): |
82 prefix = util.pconvert(prefix) | |
82 for path in util.walkrepos(root, followsym=True): | 83 for path in util.walkrepos(root, followsym=True): |
83 repo = os.path.normpath(path) | 84 repo = os.path.normpath(path) |
84 name = repo | 85 name = util.pconvert(repo) |
85 if name.startswith(prefix): | 86 if name.startswith(prefix): |
86 name = name[len(prefix):] | 87 name = name[len(prefix):] |
87 self.repos.append((name.lstrip(os.sep), repo)) | 88 self.repos.append((name.lstrip('/'), repo)) |
88 | 89 |
89 self.repos.sort() | 90 self.repos.sort() |
90 self.lastrefresh = time.time() | 91 self.lastrefresh = time.time() |
91 | 92 |
92 def run(self): | 93 def run(self): |