equal
deleted
inserted
replaced
342 del fdict[ff] |
342 del fdict[ff] |
343 break |
343 break |
344 if not f in files and match(f) and _iskwfile(ui, man, f): |
344 if not f in files and match(f) and _iskwfile(ui, man, f): |
345 files.append(f) |
345 files.append(f) |
346 if files: |
346 if files: |
|
347 files.sort() |
347 kwt = kwtemplater(ui, repo, expand, node=ctx.node()) |
348 kwt = kwtemplater(ui, repo, expand, node=ctx.node()) |
348 # 3rd argument sets commit to False |
349 # 3rd argument sets commit to False |
349 kwt.overwrite(files, man, False) |
350 kwt.overwrite(files, man, False) |
350 finally: |
351 finally: |
351 del wlock, lock |
352 del wlock, lock |
551 cl = self.changelog.read(node) |
552 cl = self.changelog.read(node) |
552 mn = self.manifest.read(cl[0]) |
553 mn = self.manifest.read(cl[0]) |
553 candidates = [f for f in cl[3] if mn.has_key(f) |
554 candidates = [f for f in cl[3] if mn.has_key(f) |
554 and _iskwfile(ui, mn, f)] |
555 and _iskwfile(ui, mn, f)] |
555 if candidates: |
556 if candidates: |
|
557 candidates.sort() |
556 # 3rd argument sets expansion to True |
558 # 3rd argument sets expansion to True |
557 kwt = kwtemplater(ui, self, True, node=node) |
559 kwt = kwtemplater(ui, self, True, node=node) |
558 # 3rd argument sets commit to True |
560 # 3rd argument sets commit to True |
559 kwt.overwrite(candidates, mn, True) |
561 kwt.overwrite(candidates, mn, True) |
560 return node |
562 return node |