Show More
@@ -94,7 +94,7 b' def difftree(ui, repo, node1=None, node2' | |||||
94 | if opts['pretty']: |
|
94 | if opts['pretty']: | |
95 | catcommit(ui, repo, node2, "") |
|
95 | catcommit(ui, repo, node2, "") | |
96 | m = cmdutil.matchfiles(repo, files) |
|
96 | m = cmdutil.matchfiles(repo, files) | |
97 |
patch.diff(repo, node1, node2, |
|
97 | patch.diff(repo, node1, node2, match=m, | |
98 | opts=patch.diffopts(ui, {'git': True})) |
|
98 | opts=patch.diffopts(ui, {'git': True})) | |
99 | else: |
|
99 | else: | |
100 | __difftree(repo, node1, node2, files=files) |
|
100 | __difftree(repo, node1, node2, files=files) |
@@ -503,7 +503,7 b' def reposetup(ui, repo):' | |||||
503 | # shrink keywords read from working dir |
|
503 | # shrink keywords read from working dir | |
504 | self.lines = kwt.shrinklines(self.fname, self.lines) |
|
504 | self.lines = kwt.shrinklines(self.fname, self.lines) | |
505 |
|
505 | |||
506 |
def kw_diff(repo, node1=None, node2=None, |
|
506 | def kw_diff(repo, node1=None, node2=None, match=None, | |
507 | fp=None, changes=None, opts=None): |
|
507 | fp=None, changes=None, opts=None): | |
508 | '''Monkeypatch patch.diff to avoid expansion except when |
|
508 | '''Monkeypatch patch.diff to avoid expansion except when | |
509 | comparing against working dir.''' |
|
509 | comparing against working dir.''' | |
@@ -511,7 +511,7 b' def reposetup(ui, repo):' | |||||
511 | kwt.matcher = util.never |
|
511 | kwt.matcher = util.never | |
512 | elif node1 is not None and node1 != repo.changectx().node(): |
|
512 | elif node1 is not None and node1 != repo.changectx().node(): | |
513 | kwt.restrict = True |
|
513 | kwt.restrict = True | |
514 |
patch_diff(repo, node1, node2 |
|
514 | patch_diff(repo, node1, node2, match, fp, changes, opts) | |
515 |
|
515 | |||
516 | def kwweb_changeset(web, req, tmpl): |
|
516 | def kwweb_changeset(web, req, tmpl): | |
517 | '''Wraps webcommands.changeset turning off keyword expansion.''' |
|
517 | '''Wraps webcommands.changeset turning off keyword expansion.''' |
@@ -321,8 +321,7 b' class queue:' | |||||
321 | def printdiff(self, repo, node1, node2=None, files=None, |
|
321 | def printdiff(self, repo, node1, node2=None, files=None, | |
322 | fp=None, changes=None, opts={}): |
|
322 | fp=None, changes=None, opts={}): | |
323 | m = cmdutil.match(repo, files, opts) |
|
323 | m = cmdutil.match(repo, files, opts) | |
324 |
patch.diff(repo, node1, node2, m. |
|
324 | patch.diff(repo, node1, node2, m, fp, changes, self.diffopts()) | |
325 | fp=fp, changes=changes, opts=self.diffopts()) |
|
|||
326 |
|
325 | |||
327 | def mergeone(self, repo, mergeq, head, patch, rev): |
|
326 | def mergeone(self, repo, mergeq, head, patch, rev): | |
328 | # first try just applying the patch |
|
327 | # first try just applying the patch | |
@@ -1083,7 +1082,7 b' class queue:' | |||||
1083 | a = util.unique(aa) |
|
1082 | a = util.unique(aa) | |
1084 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] |
|
1083 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] | |
1085 | match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) |
|
1084 | match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) | |
1086 |
patch.diff(repo, patchparent, |
|
1085 | patch.diff(repo, patchparent, match=match, | |
1087 | fp=patchf, changes=c, opts=self.diffopts()) |
|
1086 | fp=patchf, changes=c, opts=self.diffopts()) | |
1088 | patchf.close() |
|
1087 | patchf.close() | |
1089 |
|
1088 |
@@ -410,8 +410,8 b' def dorecord(ui, repo, committer, *pats,' | |||||
410 | match = cmdutil.matchfiles(repo, modified + added + removed) |
|
410 | match = cmdutil.matchfiles(repo, modified + added + removed) | |
411 | diffopts = mdiff.diffopts(git=True, nodates=True) |
|
411 | diffopts = mdiff.diffopts(git=True, nodates=True) | |
412 | fp = cStringIO.StringIO() |
|
412 | fp = cStringIO.StringIO() | |
413 |
patch.diff(repo, repo.dirstate.parents()[0], |
|
413 | patch.diff(repo, repo.dirstate.parents()[0], match=match, | |
414 |
|
|
414 | changes=changes, opts=diffopts, fp=fp) | |
415 | fp.seek(0) |
|
415 | fp.seek(0) | |
416 |
|
416 | |||
417 | # 1. filter patch, so we have intending-to apply subset of it |
|
417 | # 1. filter patch, so we have intending-to apply subset of it |
@@ -961,8 +961,7 b' def diff(ui, repo, *pats, **opts):' | |||||
961 | node1, node2 = cmdutil.revpair(repo, opts['rev']) |
|
961 | node1, node2 = cmdutil.revpair(repo, opts['rev']) | |
962 |
|
962 | |||
963 | m = cmdutil.match(repo, pats, opts) |
|
963 | m = cmdutil.match(repo, pats, opts) | |
964 |
patch.diff(repo, node1, node2, |
|
964 | patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts)) | |
965 | opts=patch.diffopts(ui, opts)) |
|
|||
966 |
|
965 | |||
967 | def export(ui, repo, *changesets, **opts): |
|
966 | def export(ui, repo, *changesets, **opts): | |
968 | """dump the header and diffs for one or more changesets |
|
967 | """dump the header and diffs for one or more changesets |
@@ -1152,7 +1152,7 b' def b85diff(to, tn):' | |||||
1152 | ret.append('\n') |
|
1152 | ret.append('\n') | |
1153 | return ''.join(ret) |
|
1153 | return ''.join(ret) | |
1154 |
|
1154 | |||
1155 |
def diff(repo, node1=None, node2=None, |
|
1155 | def diff(repo, node1=None, node2=None, match=None, | |
1156 | fp=None, changes=None, opts=None): |
|
1156 | fp=None, changes=None, opts=None): | |
1157 | '''print diff of changes to files between two nodes, or node and |
|
1157 | '''print diff of changes to files between two nodes, or node and | |
1158 | working directory. |
|
1158 | working directory. | |
@@ -1160,6 +1160,9 b' def diff(repo, node1=None, node2=None, f' | |||||
1160 | if node1 is None, use first dirstate parent instead. |
|
1160 | if node1 is None, use first dirstate parent instead. | |
1161 | if node2 is None, compare node1 with working directory.''' |
|
1161 | if node2 is None, compare node1 with working directory.''' | |
1162 |
|
1162 | |||
|
1163 | if not match: | |||
|
1164 | match = cmdutil.matchall(repo) | |||
|
1165 | ||||
1163 | if opts is None: |
|
1166 | if opts is None: | |
1164 | opts = mdiff.defaultopts |
|
1167 | opts = mdiff.defaultopts | |
1165 | if fp is None: |
|
1168 | if fp is None: | |
@@ -1183,7 +1186,7 b' def diff(repo, node1=None, node2=None, f' | |||||
1183 | date1 = util.datestr(ctx1.date()) |
|
1186 | date1 = util.datestr(ctx1.date()) | |
1184 |
|
1187 | |||
1185 | if not changes: |
|
1188 | if not changes: | |
1186 | changes = repo.status(node1, node2, files, match=match)[:5] |
|
1189 | changes = repo.status(node1, node2, files=match.files(), match=match)[:5] | |
1187 | modified, added, removed, deleted, unknown = changes |
|
1190 | modified, added, removed, deleted, unknown = changes | |
1188 |
|
1191 | |||
1189 | if not modified and not added and not removed: |
|
1192 | if not modified and not added and not removed: |
General Comments 0
You need to be logged in to leave comments.
Login now