Show More
@@ -93,8 +93,8 b' def difftree(ui, repo, node1=None, node2' | |||||
93 | if opts['patch']: |
|
93 | if opts['patch']: | |
94 | if opts['pretty']: |
|
94 | if opts['pretty']: | |
95 | catcommit(ui, repo, node2, "") |
|
95 | catcommit(ui, repo, node2, "") | |
96 | patch.diff(repo, node1, node2, |
|
96 | m = cmdutil.matchfiles(repo, files) | |
97 | files=files, |
|
97 | patch.diff(repo, node1, node2, files=m.files(), 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) |
@@ -1082,8 +1082,8 b' class queue:' | |||||
1082 | r = util.unique(dd) |
|
1082 | r = util.unique(dd) | |
1083 | a = util.unique(aa) |
|
1083 | a = util.unique(aa) | |
1084 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] |
|
1084 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] | |
1085 |
|
|
1085 | match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) | |
1086 |
patch.diff(repo, patchparent, files= |
|
1086 | patch.diff(repo, patchparent, files=match.files(), match=match, | |
1087 | fp=patchf, changes=c, opts=self.diffopts()) |
|
1087 | fp=patchf, changes=c, opts=self.diffopts()) | |
1088 | patchf.close() |
|
1088 | patchf.close() | |
1089 |
|
1089 | |||
@@ -1141,7 +1141,7 b' class queue:' | |||||
1141 | self.applied_dirty = 1 |
|
1141 | self.applied_dirty = 1 | |
1142 | self.strip(repo, top, update=False, |
|
1142 | self.strip(repo, top, update=False, | |
1143 | backup='strip') |
|
1143 | backup='strip') | |
1144 |
n = repo.commit( |
|
1144 | n = repo.commit(match.files(), message, user, date, match=match, | |
1145 | force=1) |
|
1145 | force=1) | |
1146 | self.applied.append(statusentry(revlog.hex(n), patchfn)) |
|
1146 | self.applied.append(statusentry(revlog.hex(n), patchfn)) | |
1147 | self.removeundo(repo) |
|
1147 | self.removeundo(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now