# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1126941838 25200
# Node ID 5e9816decbb74f869518df583de257dd60595066
# Parent  c631f26346ca1a6beabfbd0730cc285108e2d720# Parent  b0633406c07a7ae53bcd7d235fd9e14e2043f677
Merge with myself.



diff -r c631f26346ca -r 5e9816decbb7 mercurial/commands.py
--- a/mercurial/commands.py	Sat Sep 17 00:23:19 2005 -0700
+++ b/mercurial/commands.py	Sat Sep 17 00:23:58 2005 -0700
@@ -920,14 +920,9 @@
     if len(revs) > 2:
         raise util.Abort("too many revisions to diff")
 
-    files = []
-    match = util.always
-    if pats:
-        roots, match, results = makewalk(repo, pats, opts)
-        for src, abs, rel, exact in results:
-            files.append(abs)
+    fns, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts)
 
-    dodiff(sys.stdout, ui, repo, node1, node2, files, match=match,
+    dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
            text=opts['text'])
 
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):