--- a/mercurial/commands.py	Thu Jul 01 13:26:08 2010 -0300
+++ b/mercurial/commands.py	Tue Jun 29 12:12:34 2010 +0200
@@ -2484,7 +2484,7 @@
     branches = opts.get('branch', []) + opts.get('only_branch', [])
     opts['branch'] = [repo.lookupbranch(b) for b in branches]
 
-    displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
+    displayer = cmdutil.show_changeset(ui, repo, opts, True)
     def prep(ctx, fns):
         rev = ctx.rev()
         parents = [p for p in repo.changelog.parentrevs(rev)
@@ -2517,7 +2517,11 @@
                 if rename:
                     copies.append((fn, rename[0]))
 
-        displayer.show(ctx, copies=copies)
+        revmatchfn = None
+        if opts.get('patch') or opts.get('stat'):
+            revmatchfn = cmdutil.match(repo, fns)
+
+        displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 
     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
         if count == limit: