Commit Briefs

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@


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@


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.


bfc912128c Thomas Adam

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!


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.


f89c34e12a Thomas Adam

make got log, diff, blame, tree, and cat unlock the work tree earlier

These commands perform potentially long-running operations on the repository after reading information from the work tree. There is no need for them to keep the work tree locked until the end. Doing so blocks other commands the user may want to run concurrently. For example, the user may want to be able to run 'got diff' in the work tree while browsing 'got log' output in less(1). Pointed out by Misha on gameoftrees IRC.


edb9a1809d Thomas Adam

got patch: re-add forgotten lseek

otherwise got-read-patch can't parse any patch because the position indicator is at the end of file. While here fix the return too and set patchfd to -1 on error (stsp suggestion.) ok thomas, stsp


2d0f364c3c Thomas Adam

make "got cherrypick/backout" match argument against refs before object IDs

Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp


f111bd6ad4 Thomas Adam

make "got ref" match argument against references before object IDs

Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp



069bbb862c Thomas Adam

add `got patch' command for applying unified diffs


641a8ee636 Thomas Adam

const-ify command and option tables

ok stsp


b0ca001af3 Thomas Adam

remove stray tab that snuck in


d356bf7597 Thomas Adam

display GMT offset in cat command

ok stsp


d2f35ef7f7 Thomas Adam

shrink the width of formatted output fields to their expected size

Replace FMT_SCALED_STRSIZE with (FMT_SCALED_STRSIZE - 2) as field width when formatting output for printing. FMT_SCALED_STRSIZE includes space for a nul byte and a minus sign. Output values are expected to be always positive here. ok stsp


8f666e6727 Thomas Adam

tweak error reporting due to invalid numbers

Use the same idiom as in the strtonum(3) manpage which produces a more readable error message. OK kn, stsp


17431c138a Thomas Adam

improve error message due to malformed `author' in got.conf

tweak and ok stsp@


d64cc78a32 Thomas Adam

make 'got rm' behave like rm(1) for paths found missing on disk

ok millert@


48b4f23903 Thomas Adam

wrap overlong lines


fc63f50d9b Thomas Adam

add O_CLOEXEC (close-on-exec) to openat(2) calls

suggested by millert ok thomas_adam


0634062147 Thomas Adam

add O_CLOEXEC (close-on-exec) flag to open(2) calls

suggested by millert ok thomas_adam


c56c5d8a20 Thomas Adam

add "e" (close-on-exec) flag to fopen(3) calls

suggested by millert ok thomas_adam