Commits
- 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:
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:
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:
069bbb862c310dff25056a8d02a59bded471478d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add `got patch' command for applying unified diffs
- Commit:
d64cc78a320df6e371662d50eba6332a7be001c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
053ccfc118036a493a587cbbe43b12c330d0011f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -t option to 'got branch' synopsis in got.1 man page
- Commit:
a0b48eaf75ca2f2a41f476012474a3d255c2e83d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
2bf0fa54a55e054ffe4c688f49ecbd6a28101fe0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
d912d1250c98cc9f95e6d51ebb86173911e17b81
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Fix mandoc HTML rendering for command aliases
Replace hand-rolled parentheses with the proper mdoc(7) macro,
otherwise the closing ")" ends up inside the command description.
Reported by Josh Rickmar, thanks!
- Commit:
d10218e7512ce57d66ac7ef9f7a3caeab7874e8a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document new 'got rebase' behaviour when commits do not need to be rebased
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
bea5ae74558ed1bc5c8372306ead95c29c5bc362
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document "mg" as alias for the "merge" command
- Commit:
30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- Commit:
ac93b2c5ff1f2b9d2c10aaf6b385b22b9da35056
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Fix "mandoc -T lint -W style got/got.1" nits
- Commit:
e8aa341a0a112d2660938b2e9aec7ff327865ec6
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Document command aliases in tmux(1) style, add tags for navigation
This has the advantage of tags being located right by the full command;
combined with tags ":tco" to search for the `co` alias will jump right
to the `checkout` line, neatly showing everything without needing
further navigation.
tmux hint from Thomas Adam, thanks.
OK stsp
- Commit:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
22a38a4331904c508c1782e5399680ba7069300f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists
- Commit:
dddbe150a21f404e9c42033d9b00b5561001df7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
bb494413b7b04767e20fc5a04378d517cda008ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
8cf2970b6c6851169342b56a57bfe72560170f1a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document all reasons why 'got merge' might be interrupted
- Commit:
ba34626bc13877c93836c8ee873acf1be8429ead
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
768705e331a0ff020ecc806142aecdecdbfb2e89
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to merge vendor branches with 'got merge'