Commit Briefs

Omar Polo

don't pass $ret to test_done on failure when it's known to be zero

Otherwise the test directory it's not left in place; ok tracey@



Omar Polo

got patch: handle git-style rename diffs

extend the support for git-style diffs to include the "pure rename" case, i.e. when a file is renamed without any edits. ok stsp@


Omar Polo

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@


Omar Polo

test `got patch' vs path-prefixes, relative paths and strip

reminded by and 'looks fine' to stsp@


Omar Polo

typos


Omar Polo

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@.


Omar Polo

delete trailing whitespaces


Omar Polo

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@



Omar Polo

got patch: prefer new name if not /dev/null and not a git-style diff

This fixes a common issue when for e.g. generating patches with $ diff -u foo.orig foo where 'got patch' failed because 'foo.orig' has an 'unexpected status'. prodded by naddy, ok stsp


Omar Polo

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@


Omar Polo

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@


Omar Polo

got patch: create missing directories when adding files

ok stsp@


Omar Polo

got patch: keep permissions after patching a file

ok stsp@