Mercurial > hg-stable
changeset 1269:5e9816decbb7
Merge with myself.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat, 17 Sep 2005 00:23:58 -0700 |
| parents | c631f26346ca (current diff) b0633406c07a (diff) |
| children | fc3b41570082 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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):