Show More
@@ -534,10 +534,6 b' class patchfile(object):' | |||||
534 | dest = self.fname |
|
534 | dest = self.fname | |
535 | self.writelines(dest, self.lines) |
|
535 | self.writelines(dest, self.lines) | |
536 |
|
536 | |||
537 | def close(self): |
|
|||
538 | self.write() |
|
|||
539 | self.write_rej() |
|
|||
540 |
|
||||
541 | def apply(self, h): |
|
537 | def apply(self, h): | |
542 | if not h.complete(): |
|
538 | if not h.complete(): | |
543 | raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % |
|
539 | raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % | |
@@ -1159,7 +1155,8 b' def _applydiff(ui, fp, patcher, copyfn, ' | |||||
1159 | def closefile(): |
|
1155 | def closefile(): | |
1160 | if not current_file: |
|
1156 | if not current_file: | |
1161 | return 0 |
|
1157 | return 0 | |
1162 |
current_file. |
|
1158 | current_file.write() | |
|
1159 | current_file.write_rej() | |||
1163 | return len(current_file.rej) |
|
1160 | return len(current_file.rej) | |
1164 |
|
1161 | |||
1165 | for state, values in iterhunks(ui, fp, sourcefile): |
|
1162 | for state, values in iterhunks(ui, fp, sourcefile): |
General Comments 0
You need to be logged in to leave comments.
Login now