diff -r 67add0f24f83 -r ad6a58581ecd mercurial/dispatch.py
--- a/mercurial/dispatch.py	Tue Jul 12 16:36:34 2011 -0500
+++ b/mercurial/dispatch.py	Wed Jul 13 16:29:28 2011 -0500
@@ -633,7 +633,7 @@
     cmdpats = args[:]
     if cmd not in commands.norepo.split():
         # use the repo from the request only if we don't have -R
-        if not rpath:
+        if not rpath and not cwd:
             repo = req.repo
 
         if repo: