Commits
- 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
- Commit:
2d0f364c3c7dcf075322c2a61665f8624e44bf0c
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
5f5d5a73a7cc577673dbe0358d961fecf40919b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
f111bd6ad40f24789055cc9fd2cfc398a54f79ed
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
d3830477eab7ce40f587d0a086dac840174c92bf
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document that 'gotadmin listpack' requires a pack index
- Commit:
c33dcdf16b96070979727a3aa0662fc70be252a0
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ref.sh: fix pastos and report the actual command that was run
- Commit:
70e6418ec50331f61e1c705e3c73a659b496bcdd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make got_repo_match_object_id_prefix() reject overlong input strings
suggested by + ok naddy
- Commit:
eb3a31e3f279ccfa3de3a8647ecb790e2342109d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: got-read-patch: use compat includes
Remove the global header #includes for those items which are detected
portably.
- Commit:
762ddcd8e63f22e481054b5046adb0f913f2bada
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add landlock to got-patch
Add the appropriate call to tje got-patch machinary to enable
landlock();
- Commit:
d5df63dab35a6063d2fa0b9abfdbd8fd9a50deb8
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: enable got-patch tests
Enable the got-patch tests.