Commit Briefs


Thomas Adam

plug memory and fd leak in got patch


Thomas Adam

got patch: use ints for line offsets instead of longs

ints have the advantage that their size is more likely to be the same across the various architecture supported by OpenBSD, thus introducing less possible differences. INT_MAX is still (at least) a few order of magnitudes higher than the patches we dealt with (even abnormal ones.) suggested by stsp@


Thomas Adam

actually guarding against negative line offsets

previous commit looked at some pretty zeroes returned from calloc instead of the actual numbers received.


Thomas Adam

style; set datalen only once


Thomas Adam

got patch: guard against invalid (negative) line offsets

under normal circumstances got-read-patch can't send negative line offsets; that's not an excuse not to guard the main process from those as well. This makes sure we bail out early instead of trying to apply the diff.


Thomas Adam

free patch on error



Thomas Adam

refactor got_patch / got_worktree_patch_complete

let got_patch own fileindex_path and call got_worktree_patch_complete only if got_wokrtree_patch_prepare hasn't failed. suggested by stsp@


Thomas Adam

got patch: avoid open/sync/close the fileindex over and over again

Instead of flushing the fileindex after every patch in the patchfile just reuse the same fileindex and sync it only at the end of the patch operation. This speeds up 'got patch' on large repositories by quite a lot.




Thomas Adam

fix wrong path in error message


Thomas Adam

got patch: allow to reverse a patch

add a flag to got_patch to reverse a patch before applying and the -R flag for `got patch'. ok stsp@


Thomas Adam

got-read-patch: preserve all \ lines

as a cheap optimization got-read-patch was sending only the "\ No newline at end of file" lines that follows an addition (a "+" line). To be able to reverse patches in the future got_patch needs to know about all of these lines instead. No functional changes intended. ok stsp@


Thomas Adam

got patch: resolve paths from the current working directory

this allow to apply patches from subdirectories of the work tree root. Prodded by naddy@, ok stsp@.


Thomas Adam

got patch: allow to strip path components

Move some bits from the libexec helper to the main process so we know if the patch was generated by git or not and finally document the automatic stripping of a/ and b/ prefixes added by git-diff(1). ok stsp@


Thomas Adam

remove trailing whitespaces


Thomas Adam

portable: patch: remove unused code

Remove some code which was in a previous revision but isn't needed any more. It's unclear how this crept back in as there were no conflicts around this.


Thomas Adam

portable: remove system headers included portably

Remove direct included system headers which are included portably at ./configure time.




Thomas Adam

move got_patch file status checking in worktree.c

check_file_status used got_worktree_status to check if the file was in an allowed state, but it's wrong since the callback is not invoked on unchanged files. While here also fix a relate bug: unlink(newpath) is in the wrong spot and ends up removing files even when it shouldn't, so move it early in the got_worktree_schedule_* error handling. Finally, update the appropriate test case. It was passing before because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not because check_file_status failed. ok stsp@


Thomas Adam

style


Thomas Adam

augment patch progress callback with hunks info; recover from errors

Augment got_patch_progress_cb by providing the hunks that were applied with offset (or that failed) and the recoverable error encountered during the operation (bad status, missing file, ...) got_patch now proceeds when a file fails to be patched and exits with GOT_ERR_PATCH_FAILED if no other errors are encountered. While here, also add a test for the 'hunk applied with offset' case and shrink test_patch_dont_apply and illegal_status by taking advantage that 'got patch' doesn't stop at the first error. (And add some other cases to illegal_status too.) discussed with and ok stsp@