diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -78,12 +78,12 @@ class hgwebdir(object): self.repos.append((name, path)) for prefix, root in self.ui.configitems('collections'): - for path in util.walkrepos(root, followsym=True): - repo = os.path.normpath(path) - name = repo - if name.startswith(prefix): - name = name[len(prefix):] - self.repos.append((name.lstrip(os.sep), repo)) + for path in util.walkrepos(root, followsym=True): + repo = os.path.normpath(path) + name = repo + if name.startswith(prefix): + name = name[len(prefix):] + self.repos.append((name.lstrip(os.sep), repo)) self.repos.sort() self.lastrefresh = time.time() diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- a/mercurial/templatefilters.py +++ b/mercurial/templatefilters.py @@ -172,7 +172,7 @@ def stripdir(text): return dir def nonempty(str): - return str or "(none)" + return str or "(none)" filters = { "addbreaks": nl2br,