equal
deleted
inserted
replaced
274 force_editor=force_editor, p1=p1, p2=p2, extra=extra) |
274 force_editor=force_editor, p1=p1, p2=p2, extra=extra) |
275 if node is None: |
275 if node is None: |
276 return node |
276 return node |
277 |
277 |
278 candidates = self.changelog.read(node)[3] |
278 candidates = self.changelog.read(node)[3] |
279 candidates = [f for f in candidates if f not in removed |
279 candidates = [f for f in candidates if self.kwfmatcher(f) |
280 and not os.path.islink(self.wjoin(f)) |
280 and f not in removed |
281 and self.kwfmatcher(f)] |
281 and not os.path.islink(self.wjoin(f))] |
282 if not candidates: |
282 if not candidates: |
283 return node |
283 return node |
284 |
284 |
285 kwt = kwtemplater(self.ui, self) |
285 kwt = kwtemplater(self.ui, self) |
286 kwt.overwrite(candidates, node) |
286 kwt.overwrite(candidates, node) |