Commit Briefs

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@


Thomas Adam

got patch: create missing directories when adding files

ok stsp@


Thomas Adam

got patch: keep permissions after patching a file

ok stsp@


Thomas Adam

introduce got_patch_progress_cb

This introduce a proper got_patch specific progress callback that is invoked after processing a patch. It also drops the hackish printf in the modified case and takes `nop' out of the struct got_patch. ok stsp


Thomas Adam

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!


Thomas Adam

check file status before applying the patch

Don't allow `got patch' to delete files that are not known, or add files that are already known and to edit files that are known, not obstructed and without conflicts.


Thomas Adam

refactor apply_patch to support renaming files

add two helper functions (schedule_add, schedule_del) and move the guts of apply_patch into a new function `patch_file'. This simplifies apply_patch and makes easier to figure out what happens. Then, drop GOT_ERR_PATCH_PATHS_DIFFER since we allow the to rename files.


Thomas Adam

save `pos' in locate_hunk instead of calling ftello again

ok thomas, stsp


Thomas Adam

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!



Thomas Adam

check file status before applying the patch

Don't allow `got patch' to delete files that are not known, or add files that are already known and to edit files that are known, not obstructed and without conflicts.


Thomas Adam

refactor apply_patch to support renaming files

add two helper functions (schedule_add, schedule_del) and move the guts of apply_patch into a new function `patch_file'. This simplifies apply_patch and makes easier to figure out what happens. Then, drop GOT_ERR_PATCH_PATHS_DIFFER since we allow the to rename files.




Thomas Adam

fix path to the temp file used to accumulate the patch edits

ok stsp


Thomas Adam

portable: enable got-read-patch

Allow the libexec helper, `got-read-patch` to be compiled, portably.