Mercurial > hg
changeset 6601:cab3ad865444
match: use match.files() for patch.diff
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 12 May 2008 11:37:08 -0500 |
| parents | b822a379860b |
| children | a57a27b12965 |
| files | hgext/hgk.py hgext/mq.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/hgk.py Mon May 12 11:37:08 2008 -0500 +++ b/hgext/hgk.py Mon May 12 11:37:08 2008 -0500 @@ -93,8 +93,8 @@ if opts['patch']: if opts['pretty']: catcommit(ui, repo, node2, "") - patch.diff(repo, node1, node2, - files=files, + m = cmdutil.matchfiles(repo, files) + patch.diff(repo, node1, node2, files=m.files(), match=m, opts=patch.diffopts(ui, {'git': True})) else: __difftree(repo, node1, node2, files=files)
--- a/hgext/mq.py Mon May 12 11:37:08 2008 -0500 +++ b/hgext/mq.py Mon May 12 11:37:08 2008 -0500 @@ -1082,8 +1082,8 @@ r = util.unique(dd) a = util.unique(aa) c = [filter(matchfn, l) for l in (m, a, r, [], u)] - filelist = util.unique(c[0] + c[1] + c[2]) - patch.diff(repo, patchparent, files=filelist, match=matchfn, + match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) + patch.diff(repo, patchparent, files=match.files(), match=match, fp=patchf, changes=c, opts=self.diffopts()) patchf.close() @@ -1141,7 +1141,7 @@ self.applied_dirty = 1 self.strip(repo, top, update=False, backup='strip') - n = repo.commit(filelist, message, user, date, match=matchfn, + n = repo.commit(match.files(), message, user, date, match=match, force=1) self.applied.append(statusentry(revlog.hex(n), patchfn)) self.removeundo(repo)