Mercurial > public > mercurial-scm > hg
diff hgext/mq.py @ 6602:a57a27b12965
match: remove files argument from patch.diff
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 May 2008 11:37:08 -0500 |
parents | cab3ad865444 |
children | 41eb20cc1c02 |
line wrap: on
line diff
--- a/hgext/mq.py Mon May 12 11:37:08 2008 -0500 +++ b/hgext/mq.py Mon May 12 11:37:08 2008 -0500 @@ -321,8 +321,7 @@ def printdiff(self, repo, node1, node2=None, files=None, fp=None, changes=None, opts={}): m = cmdutil.match(repo, files, opts) - patch.diff(repo, node1, node2, m.files(), match=m, - fp=fp, changes=changes, opts=self.diffopts()) + patch.diff(repo, node1, node2, m, fp, changes, self.diffopts()) def mergeone(self, repo, mergeq, head, patch, rev): # first try just applying the patch @@ -1083,7 +1082,7 @@ a = util.unique(aa) c = [filter(matchfn, l) for l in (m, a, r, [], u)] match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) - patch.diff(repo, patchparent, files=match.files(), match=match, + patch.diff(repo, patchparent, match=match, fp=patchf, changes=c, opts=self.diffopts()) patchf.close()