Commits
- Commit:
c87842d5aed77e4f15bab3980e8cb22f18e954f8
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
show file mode for new added files in work tree diffs
Make work tree diffs of local changes on disk display the file mode of new
added files like other versions of `got diff` currently do.
ok stsp@
- Commit:
611e5fc2074d428e17f920dc595496af4dd0dc77
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
ensure got patch respects x-bit perms for new files
Reported by stsp on IRC: got patch failed to set the x-bit for a new file
despite got diff recording mode 755. Parse got and git diffs for this data
and set file modes accordingly. Tweaked with hint from op.
ok stsp@
- Commit:
08f4478902d4357c8ded641e250d50abadea27c1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use got_privsep_flush_imsg instead of reinventing it
ok stsp@
- 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:
497a59156be73918988396d3f7378fb8c7b6da8d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
8469d82143a591d423c000c47c63bababe6f5716
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- 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:
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:
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:
6b7665acf3ac9dd7d0c30372df5a4fa09b1b47fa
- From:
- Omar Polo <op@omarpolo.com>
- Date:
s/empty/done forgot in previous commit
- Commit:
d75b95736e173f91a380719d1d974cf326335c06
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-read-patch: rename `ok' variable and simplify the parsing a bit
- Commit:
f90b7a8ce92037f39d85e51dc6439e1aee606a5a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
trailing whitespaces