# HG changeset patch
# User mpm@selenic.com
# Date 1123191085 28800
# Node ID 9c918287d10b4018e27f9148e247e68ff5fe952c
# Parent  1fe3b14c704408d57e0b33efdaaf5adba6d87617# Parent  0fc4b1ab57e384a7db91505feb5d812b8f482bbe
Merge with BOS



diff --git a/doc/hg.1.txt b/doc/hg.1.txt
diff --git a/hgeditor b/hgeditor
diff --git a/hgmerge b/hgmerge
diff --git a/mercurial/bdiff.c b/mercurial/bdiff.c
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -53,11 +53,17 @@ def pathto(n1, n2):
     b.reverse()
     return os.sep.join((['..'] * len(a)) + b)
 
-def walk(repo, pats, opts, head = ''):
+def makewalk(repo, pats, opts, head = ''):
     cwd = repo.getcwd()
     files, matchfn = matchpats(cwd, pats, opts, head)
-    for src, fn in repo.walk(files = files, match = matchfn):
-        yield src, fn, pathto(cwd, fn)
+    def walk():
+        for src, fn in repo.walk(files = files, match = matchfn):
+            yield src, fn, pathto(cwd, fn)
+    return files, matchfn, walk()
+
+def walk(repo, pats, opts, head = ''):
+    files, matchfn, results = makewalk(repo, pats, opts, head)
+    for r in results: yield r
 
 revrangesep = ':'
 
@@ -153,11 +159,11 @@ def make_file(repo, r, pat, node=None,
     return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
                 mode)
 
-def dodiff(fp, ui, repo, files=None, node1=None, node2=None):
+def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always):
     def date(c):
         return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
 
-    (c, a, d, u) = repo.changes(node1, node2, files)
+    (c, a, d, u) = repo.changes(node1, node2, files, match = match)
     if files:
         c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
 
@@ -588,9 +594,10 @@ def diff(ui, repo, *pats, **opts):
         raise Abort("too many revisions to diff")
 
     files = []
-    for src, abs, rel in walk(repo, pats, opts):
+    roots, match, results = makewalk(repo, pats, opts)
+    for src, abs, rel in results:
         files.append(abs)
-    dodiff(sys.stdout, ui, repo, files, *revs)
+    dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})
 
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
     node = repo.lookup(changeset)
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
diff --git a/mercurial/util.py b/mercurial/util.py
diff --git a/tests/run-tests b/tests/run-tests
diff --git a/tests/test-clone b/tests/test-clone
diff --git a/tests/test-clone-failure b/tests/test-clone-failure
diff --git a/tests/test-merge-revert b/tests/test-merge-revert
diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out
diff --git a/tests/test-merge-revert2 b/tests/test-merge-revert2
diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out
diff --git a/tests/test-merge5.out b/tests/test-merge5.out
diff --git a/tests/test-push-warn b/tests/test-push-warn
diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out