Commit Briefs

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

print additional progress information while packing

ok op@


Thomas Adam

don't `goto done' if calloc fails

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


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@


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

more 'got patch' man page tweaks


Thomas Adam

some man page tweaks for 'got patch'

ok op@



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.


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

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.


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

got-read-patch: plug memory leak



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


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


Thomas Adam

fix got_repo_match_object_id() docstring, it is not specific to commits

This was a leftover from got_repo_resolve_commit_arg() which was superseded in commit 71a276322e39e17baf5697b5daac8e8fe6ad2ae1


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