Commits
- Commit:
57b1c3f23ff1e0399a97ed8d7a57fef8471e188f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
patch regress: unify some tests
- Commit:
5f56d41e1acd9cce7202960acad0cab3516e9c26
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: add -c flag to apply at a specified commit
it's useful for e.g. to apply old patches that weren't generated by `got
diff' or git-diff(1) and so lacks the metadata needed for the 3-way
merge.
manpage improvements from and ok stsp@
- Commit:
38d61ead4d6e9ff3f44b8d6e0e7ff3d02ffcec26
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix `got patch -R' when using diff3 merge
`got patch -R' fails spectacularly when applied on a diff that contains
the info of the original blob for the diff3 merge machinery since it
tries to apply the reverse of the patch to the old blob.
change it to run the patch (_not_ reversed) on the old blob and then
swap the arguments to got_diff3_merge which gives us the correct reverse
merge of the diff. while here add a test case too.
reported by naddy, discussed with and ok stsp@
- Commit:
a92a20426c3078772e9cc8671b4c58ed9a07b9bf
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle mangled whitespaces
This makes 'got patch' try to ignore whitespaces when trying to match a
hunk.
Discused with and ok stsp@
- Commit:
5dffb1a14a4e706b322f648797d0fea44e684aa8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: don't loose the x bit when merging with diff3
This fixes a regression introduced with the diff3 merge: files merged
this way have their permissions resetted after patch.
The issue is due the fact that patch_file looks at a temporary files
and not at the original "old file".
Reported by and ok stsp@
- Commit:
f5b0315f0e07bfd36a4eb37d91884fcd8614745a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
aesthetic: rename regress to test_patch_rm_file
drop the "simple" part, there's no "complex" way of removing files.
- Commit:
ed2ff8b9f919f8d0e18e69b038e965924454da58
- From:
- Omar Polo <op@omarpolo.com>
- Date:
augment test_patch_add_line
Try to create a file with more than one line, it would have catched an
issue with my wip diff for ignore whitespaces in got patch.
While here rename the function to drop "simple".
- Commit:
acf749fc600a43d8e276321e8a63cd97484f30bb
- From:
- Omar Polo <op@omarpolo.com>
- Date:
refactor the patch parser
Introduce a patch_start routine that finds the next "diff" header (if
there is one); the idea is to persist some state (commit id and wether
it's a "git diff") while processing the content of the diff. It's
needed because in the case of 'got diff' some information like the
commit id are only present once at the beginning.
As a consequence, the patch parser becomes slightly more robust
(concatenating diffs produced by different means shouldn't confuse it
anymore) and drops the support for "old" got diffs, the ones previous
the introduction of the "commit -/+" header.
ok tracey@
- Commit:
db0dfdd7e5c2c5a38ed7c3291a0615132bcb5945
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle git-style diffs for the 3-way merge too
tweak and 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:
a19f439c4e07de5c812f1771b37cecbba6e631c4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
don't pass $ret to test_done on failure when it's known to be zero
Otherwise the test directory it's not left in place; ok tracey@
- Commit:
be33dff7fa389c620154dc06efbeae69bd002950
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: fail when reading empty hunks
- Commit:
4379a9aae9e70b9b2beaa7c7b31c4033b302069b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle git-style rename diffs
extend the support for git-style diffs to include the "pure rename"
case, i.e. when a file is renamed without any edits.
ok stsp@
- 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:
15e1bda6b8ce20b9acfeeefabf9d3aee2589d0d4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
test `got patch' vs path-prefixes, relative paths and strip
reminded by and 'looks fine' to stsp@
- Commit:
f1d6cebb430d7e76b19eca4fede3ca1d4daa412e
- From:
- Omar Polo <op@omarpolo.com>
- Date:
typos
- 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:
3313bcd840cd85a1b349abf664992608a42bbbde
- From:
- Omar Polo <op@omarpolo.com>
- Date:
delete trailing whitespaces
- 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@
- Commit:
b3c57ab2fb7857f055b840d29c425370effc8f9c
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle "\ No newline at end of file"
- Commit:
7a30b5cb05817b97fcb91183049b629a948e3ba6
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: prefer new name if not /dev/null and not a git-style diff
This fixes a common issue when for e.g. generating patches with
$ diff -u foo.orig foo
where 'got patch' failed because 'foo.orig' has an 'unexpected status'.
prodded by naddy, ok stsp
- Commit:
78f5ac2436c8d17d1dd687d69e51354707275988
- From:
- Omar Polo <op@omarpolo.com>
- Date:
move got_patch file status checking in worktree.c
check_file_status used got_worktree_status to check if the file was in
an allowed state, but it's wrong since the callback is not invoked on
unchanged files.
While here also fix a relate bug: unlink(newpath) is in the wrong spot
and ends up removing files even when it shouldn't, so move it early in
the got_worktree_schedule_* error handling.
Finally, update the appropriate test case. It was passing before
because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not
because check_file_status failed.
ok stsp@