Commits
- Commit:
17d6446ae871d15954803d493cdcc3e9dd968e2c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
style
- Commit:
49114f01f4c397e460d9d2d27619e841184b217a
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
e0c1f81cefbe08717151cdf484f780b2de377eb0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: create missing directories when adding files
ok stsp@
- Commit:
da09d8ed3bab86a28b37ed49300aad928922ede7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: keep permissions after patching a file
ok stsp@
- Commit:
c71da4f733c5d4c5d25de860ff717363522a105b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
eaf99875e8a296a7a1128d804339ed1935f8d2a0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a dry-run/nop mode for got patch
with lots of help from stsp for the manpage bits!
- Commit:
10e55613cb8d8b5d1829a732694d6259647d7821
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
46e6bdd46c729dfc7e89384a8df8f9153ada0557
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
122e16119c68804932abae9efbce7cad48a85a24
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
save `pos' in locate_hunk instead of calling ftello again
ok thomas, stsp
- Commit:
bfc912128ca404176d8aebc46b2c89ee4926e1d2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a dry-run/nop mode for got patch
with lots of help from stsp for the manpage bits!
- Commit:
7dd42450fb28f64d7fab8fb244760da303664e7e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: require exact match when removing files
- Commit:
42d9d68e7b6919ea8e3bbb80057c2c11fe5594b2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
bb2ad8ff07ba26d01c541025d8daaa04723bd280
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
64c9e565c3e91b98b7047a34fd0b9094cfb09e74
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
apply_patch: move sanity check early in recv_patch
- Commit:
de3c84b6c8bbf16375d2e224b441bf38fece5b9c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
pass the callback data instead of hardcoding NULL, ok stsp
- Commit:
94af5a06f725ffeb02b8a53eb2010a094d0a8d14
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix path to the temp file used to accumulate the patch edits
ok stsp
- Commit:
973f3f6e968a6729bf43c2421b75db48ff4626b4
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: enable got-read-patch
Allow the libexec helper, `got-read-patch` to be compiled, portably.
- Commit:
069bbb862c310dff25056a8d02a59bded471478d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add `got patch' command for applying unified diffs