Show More
@@ -527,13 +527,6 b' class patchfile(object):' | |||||
527 |
|
527 | |||
528 | self.writelines(fname, rejlines()) |
|
528 | self.writelines(fname, rejlines()) | |
529 |
|
529 | |||
530 | def write(self, dest=None): |
|
|||
531 | if not self.dirty: |
|
|||
532 | return |
|
|||
533 | if not dest: |
|
|||
534 | dest = self.fname |
|
|||
535 | self.writelines(dest, self.lines) |
|
|||
536 |
|
||||
537 | def apply(self, h): |
|
530 | def apply(self, h): | |
538 | if not h.complete(): |
|
531 | if not h.complete(): | |
539 | raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % |
|
532 | raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % | |
@@ -1155,7 +1148,8 b' def _applydiff(ui, fp, patcher, copyfn, ' | |||||
1155 | def closefile(): |
|
1148 | def closefile(): | |
1156 | if not current_file: |
|
1149 | if not current_file: | |
1157 | return 0 |
|
1150 | return 0 | |
1158 |
current_file. |
|
1151 | if current_file.dirty: | |
|
1152 | current_file.writelines(current_file.fname, current_file.lines) | |||
1159 | current_file.write_rej() |
|
1153 | current_file.write_rej() | |
1160 | return len(current_file.rej) |
|
1154 | return len(current_file.rej) | |
1161 |
|
1155 |
General Comments 0
You need to be logged in to leave comments.
Login now