(self, patch_file)
| 510 | print("That was not 'LGTM'.") |
| 511 | |
| 512 | def WaitForResolvingConflicts(self, patch_file): |
| 513 | print("Applying the patch \"%s\" failed. Either type \"ABORT<Return>\", " |
| 514 | "or resolve the conflicts, stage *all* touched files with " |
| 515 | "'git add', and type \"RESOLVED<Return>\"" % (patch_file)) |
| 516 | self.DieNoManualMode() |
| 517 | answer = "" |
| 518 | while answer != "RESOLVED": |
| 519 | if answer == "ABORT": |
| 520 | self.Die("Applying the patch failed.") |
| 521 | if answer != "": |
| 522 | print("That was not 'RESOLVED' or 'ABORT'.") |
| 523 | print("> ", end=' ') |
| 524 | answer = self.ReadLine() |
| 525 | |
| 526 | # Takes a file containing the patch to apply as first argument. |
| 527 | def ApplyPatch(self, patch_file, revert=False): |
no test coverage detected