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:
85220b0e5b67f98aad2ec495f80d6c31f7abfc81
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
print additional progress information while packing
ok op@
- Commit:
58cbcd83c93f2636813f4f8064caefd2f838a24c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
don't `goto done' if calloc fails
otherwise we call got_repo_close with repo being NULL and segfault
there.
ok stsp
- Commit:
de47d040c7458d8bddac77ba76a8a5e61aa8eb44
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- 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:
443c08c91d6addcbfcb729b36d52896d6336fa14
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix weird paragraph breaks in 'got patch' man page section
- Commit:
4929098b50991a6640f81e8bfe7c0bf7b103b9a4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
more 'got patch' man page tweaks
- Commit:
07f74738a18008a5dc7571048fef967a248670eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
some man page tweaks for 'got patch'
ok op@
- Commit:
7dd42450fb28f64d7fab8fb244760da303664e7e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: require exact match when removing files
- Commit:
2cfc25ace6abf08ff748259dc6687da834614ad5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- 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:
a78810f8f51f2a0e721f8a34d621802607fc49ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got status' with an obstructed file given as argument; found by Omar
- Commit:
f89c34e12a475ce35580b05957d2abebeff66b23
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- 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:
19f1a2acab41c8b9bb0860811443c055567afb5b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got-read-patch: plug memory leak
- 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:
edb9a1809d3b83a6eb573160c0c60b19a65a383d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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