equal
deleted
inserted
replaced
1080 |
1080 |
1081 m = util.unique(mm) |
1081 m = util.unique(mm) |
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 filelist = util.unique(c[0] + c[1] + c[2]) |
1085 match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) |
1086 patch.diff(repo, patchparent, files=filelist, match=matchfn, |
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 |
1090 repo.dirstate.setparents(*cparents) |
1090 repo.dirstate.setparents(*cparents) |
1091 copies = {} |
1091 copies = {} |
1139 |
1139 |
1140 self.applied.pop() |
1140 self.applied.pop() |
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(filelist, message, user, date, match=matchfn, |
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) |
1148 else: |
1148 else: |
1149 self.printdiff(repo, patchparent, fp=patchf) |
1149 self.printdiff(repo, patchparent, fp=patchf) |