# HG changeset patch # User Matt Mackall # Date 1282767625 18000 # Node ID 529e712cb1ba6d17a93ded54da919a06b3befb8c # Parent aaf9968bd8b706fb461f7674ffcc8b76b5a298ee# Parent 18e1e7520b67bd233c16e952749c8e2f13006f19 merge with stable diff -r aaf9968bd8b7 -r 529e712cb1ba mercurial/dispatch.py --- a/mercurial/dispatch.py Tue Aug 24 13:13:35 2010 -0500 +++ b/mercurial/dispatch.py Wed Aug 25 15:20:25 2010 -0500 @@ -189,7 +189,7 @@ class cmdalias(object): def __init__(self, name, definition, cmdtable): - self.name = name + self.name = self.cmd = name self.definition = definition self.args = [] self.opts = [] @@ -198,7 +198,11 @@ self.badalias = False try: - cmdutil.findcmd(self.name, cmdtable, True) + aliases, entry = cmdutil.findcmd(self.name, cmdtable) + for alias, e in cmdtable.iteritems(): + if e is entry: + self.cmd = alias + break self.shadows = True except error.UnknownCommand: self.shadows = False @@ -295,7 +299,7 @@ # but only if they have been defined prior to the current definition. for alias, definition in ui.configitems('alias'): aliasdef = cmdalias(alias, definition, cmdtable) - cmdtable[alias] = (aliasdef, aliasdef.opts, aliasdef.help) + cmdtable[aliasdef.cmd] = (aliasdef, aliasdef.opts, aliasdef.help) if aliasdef.norepo: commands.norepo += ' %s' % alias diff -r aaf9968bd8b7 -r 529e712cb1ba mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py Tue Aug 24 13:13:35 2010 -0500 +++ b/mercurial/hgweb/hgwebdir_mod.py Wed Aug 25 15:20:25 2010 -0500 @@ -233,6 +233,10 @@ # update time with local timezone try: r = hg.repository(self.ui, path) + except error.RepoError: + u.warn(_('error accessing repository at %s\n') % path) + continue + try: d = (get_mtime(r.spath), util.makedate()[1]) except OSError: continue diff -r aaf9968bd8b7 -r 529e712cb1ba tests/test-hgwebdir --- a/tests/test-hgwebdir Tue Aug 24 13:13:35 2010 -0500 +++ b/tests/test-hgwebdir Wed Aug 25 15:20:25 2010 -0500 @@ -26,6 +26,10 @@ echo c > c/c hg --cwd c ci -Amc -d'3 0' +# create repository without .hg/store +hg init nostore +rm -R nostore/.hg/store + root=`pwd` cd .. @@ -112,6 +116,20 @@ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw' +"$TESTDIR/killdaemons.py" +cat > paths.conf <> $DAEMON_PIDS +echo % test inexistent and inaccessible repo should be ignored silently +"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/' + + cat > collections.conf < + + + + + + +Mercurial repositories index + + + +
+
+ +mercurial +
+
+

Mercurial Repositories

+ + + + + + + + + + +
NameDescriptionContactLast modified 
+
+
+ + + + + % collections: should succeed 200 Script output follows