Commit Briefs

814624e72d 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@


db847d2c82 Thomas Adam

explicitly include <unistd.h> for close(2)


0349119bc8 Thomas Adam

move got_errors[] table into a single compilation unit (error.c)

ok stsp


85ff1015c5 Thomas Adam

rm unused vars


fa8129f71e Thomas Adam

const-ify tables

ok thomas_adam millert


17d6446ae8 Thomas Adam

style


49114f01f4 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@


e0c1f81cef Thomas Adam

got patch: create missing directories when adding files

ok stsp@


da09d8ed3b Thomas Adam

got patch: keep permissions after patching a file

ok stsp@


c71da4f733 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


85220b0e5b Thomas Adam

print additional progress information while packing

ok op@


58cbcd83c9 Thomas Adam

don't `goto done' if calloc fails

otherwise we call got_repo_close with repo being NULL and segfault there. ok stsp


de47d040c7 Thomas Adam

cache a list of known pack index files when the repository is opened

Avoids overhead due to readdir calls while searching a pack index. ok op@


eaf99875e8 Thomas Adam

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!


10e55613cb 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.


46e6bdd46c 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.


122e16119c Thomas Adam

save `pos' in locate_hunk instead of calling ftello again

ok thomas, stsp


bfc912128c Thomas Adam

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!



4929098b50 Thomas Adam

more 'got patch' man page tweaks


07f74738a1 Thomas Adam

some man page tweaks for 'got patch'

ok op@


7dd42450fb Thomas Adam

got patch: require exact match when removing files


2cfc25ace6 Thomas Adam

improve `got patch' section of the manpage

Simplify some phrasing, explain what preconditions `got patch' has and what happens to the work tree when an error occurs.


42d9d68e7b 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.