thodg/got/include/got_patch.h
Tag
-
Show log
Commit
-
Hash : 60aa1fa0
Author :
Date : 2022-03-17T16:38:43
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@
-
include/got_patch.h
-
/* * Copyright (c) 2022 Omar Polo <op@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* * A callback that gets invoked during the patch application. * * Receives the old and new path, a status code, if an error occurred while * applying the patch, and a hunk applied with offset or its error. */ typedef const struct got_error *(*got_patch_progress_cb)(void *, const char *, const char *, unsigned char, const struct got_error *, long, long, long, long, long, const struct got_error *); /* * Apply the (already opened) patch to the repository and register the * status of the added and removed files. * * The patch file descriptor *must* be seekable. */ const struct got_error * got_patch(int, struct got_worktree *, struct got_repository *, int, got_patch_progress_cb, void *, got_cancel_cb, void *);