Commits
- Commit:
497a59156be73918988396d3f7378fb8c7b6da8d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
9802c41ca727979975e9ee6fbd898dfec7f283c4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use status G for merged files (and document it)
Suggested by stsp@. This makes possible to tell if 'got patch' used a
merge-base from the repository for the 3-way merge or did a simple
search/replace operation.
While here update the tests to look for the 'G' status and the manpage,
which was also missing the documentation for the 'C' status in got
patch.
ok stsp@
- Commit:
dbc68eedb1de26bf5a444ecad5150b0a243d422b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: ignore blobs not found
since diffs are often enclosed in other formats (e.g. emails) we might
parse something and think it's a blob id when it's not. This should
already happens, but apply_patch is looking for the wrong error due to a
leftover from previous attempts. Reported by stsp@
while here tweak the test_patch_merge_unknown_blob to also try with a
dummy commit id, as now got-read-patch requires it in order to consider
a blob id.
ok stsp@
- Commit:
d8b5af438b16bcea5568b1d4bfc127567e35e2f6
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
- Commit:
55e9459f41acc72438ed2c9f75fdaeae8f5c41d8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use diff3 to merge the changes
Parse the "blob -" metadata in diffs produced by 'got diff' and use the
original file for patching. Then, use the diff3 with the current
version of the file to merge the differences.
This solves many failures automagically or at least turns them into a
conflict.
ok/improvements stsp@
- Commit:
05737d499ba523bccc36cbb584307259af88da88
- From:
- Omar Polo <op@omarpolo.com>
- Date:
patch_file: fill tmp with the patched file even in nop mode
future work with diff3 merge will need the fully patched file even in
the nop mode
ok stsp@
- Commit:
827bcd6cc3f70dfd7830fe13e687ce1885d5d670
- From:
- Omar Polo <op@omarpolo.com>
- Date:
patch_file: move file ownership to parent
ok stsp@
- Commit:
1b1b91abdb4cd380995e3542580daa8700d93f6f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
style: remove double semicolon
- Commit:
06c44edcbf03f02d1d7c07f9360de526dd4203d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check for errors from fclose() in patch_file()
- Commit:
11ce22a1a15a25df1218e6cd79c7c0ff7e951b63
- From:
- Omar Polo <op@omarpolo.com>
- Date:
plug memory and fd leak in got patch
- Commit:
35095610b1bb11a6c722f6d42f6609bd308531a8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use ints for line offsets instead of longs
ints have the advantage that their size is more likely to be the same
across the various architecture supported by OpenBSD, thus introducing
less possible differences.
INT_MAX is still (at least) a few order of magnitudes higher than the
patches we dealt with (even abnormal ones.)
suggested by stsp@
- Commit:
5b7126c502f8d046d0779dd2cb0558163c383819
- From:
- Omar Polo <op@omarpolo.com>
- Date:
actually guarding against negative line offsets
previous commit looked at some pretty zeroes returned from calloc
instead of the actual numbers received.
- Commit:
2399b53d3a5f7a784efc54b86027b4f50f65ac41
- From:
- Omar Polo <op@omarpolo.com>
- Date:
style; set datalen only once
- Commit:
71393b5c7fb0a8cff0c8fd7890c3954e3f3a9599
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: guard against invalid (negative) line offsets
under normal circumstances got-read-patch can't send negative line
offsets; that's not an excuse not to guard the main process from those
as well.
This makes sure we bail out early instead of trying to apply the diff.
- Commit:
0e07a2a181ad1663e726597758495e6b8010ba97
- From:
- Omar Polo <op@omarpolo.com>
- Date:
free patch on error
- Commit:
99b94ad7a7280ebcb23a103b28c81900bbe250ee
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: ensure new and old paths are NUL-terminated
- Commit:
4bcdc8959af14bcb2e50c7f303df6c055573bc7a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
refactor got_patch / got_worktree_patch_complete
let got_patch own fileindex_path and call got_worktree_patch_complete
only if got_wokrtree_patch_prepare hasn't failed.
suggested by stsp@
- Commit:
f2dd780737c47f6d92e6fe01cbd51bf93c91b3b3
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: avoid open/sync/close the fileindex over and over again
Instead of flushing the fileindex after every patch in the patchfile
just reuse the same fileindex and sync it only at the end of the patch
operation. This speeds up 'got patch' on large repositories by quite a
lot.
- Commit:
e45f7eba7c3fe929b6bd5852f390301aeace98aa
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
got patch: switch from fseek() to fseeko(), use unary minus while here
ok op
- Commit:
be33dff7fa389c620154dc06efbeae69bd002950
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: fail when reading empty hunks
- Commit:
bad961bf76d36ad6f3472c7ad80f648091f56019
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: allow to reverse a patch
add a flag to got_patch to reverse a patch before applying and the -R
flag for `got patch'.
ok stsp@
- Commit:
b28327780dc2e32f03051c7d18d57db2e27e2de6
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-read-patch: preserve all \ lines
as a cheap optimization got-read-patch was sending only the "\ No
newline at end of file" lines that follows an addition (a "+" line). To
be able to reverse patches in the future got_patch needs to know about
all of these lines instead. No functional changes intended.
ok stsp@
- Commit:
ed3bff83077bfa3c251eb87bc83f541d8cdaaa11
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: resolve paths from the current working directory
this allow to apply patches from subdirectories of the work tree root.
Prodded by naddy@, ok stsp@.
- Commit:
41a37a441444194d85c82d2046e402b55b159286
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix wrong path in error message
- Commit:
9d6cabd51222f7506db617ee8a7b282823dde999
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: allow to strip path components
Move some bits from the libexec helper to the main process so we know if
the patch was generated by git or not and finally document the automatic
stripping of a/ and b/ prefixes added by git-diff(1).
ok stsp@