Commits
- Commit:
336075a42a5ae0fa322db734c481d21998e82bb8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
build with -Wmissing-prototypes
ok stsp@
- Commit:
640cd7ff31ef05df4f6394c8792925b7dd0b8c7c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: prefix mvmt keymaps with count modifier like vi(1)
Enable compound commands for all movement keymaps (e.g., hjkl, bfdu). The
optional prefixed count determines how many times the movement is performed;
for example, '123j' (move 123 lines down) or '4f' (scroll 4 pages down).
Counts are ignored if preceding non-movement and some singular movement
operations (e.g., 't', 'r', 'ret', '/', '$', 'G', 'g').
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:
63ba1a3a6f40953d1636e718c0e0000a3d626159
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix `limit' accounting in draw_commit
if the child view is fullscreen we don't need to subtract one, because
no vborder is drawn.
ok Mark Jamsek
- Commit:
48bb96f04b6f67bbc78ae9526830dbf20e84ef7d
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
tog: make SPACE page down in all views
ok op@, Mark Jamsek
- Commit:
6131ff18e81056001a823f913094a92c10580cba
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix fullscreen view regression introduced in 0dbbbe90fd
When cycling from a child view in fullscreen, the parent view is opened in
a splitscreen with no border instead of fullscreen. Check the view mode when
cycling between views and resize parent dimensions accordingly.
ok op@
- Commit:
6141756554c6ee1a8a23728658279ef5e16262a0
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
alias C-b/C-f to scroll page back/forward with b/f
Suggested by naddy. Remap 'f'ullscreen to 'F', and blame view key maps 'b' and
'B' to 'c' and 'C', respectively, per stsp's and naddy's suggestion. While
here, remove trailing whitespace.
ok naddy@
- 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:
c662152851a8f7f0fa0ce65768cd9119ff826481
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
c57e65c96966b9264b0e84ce5b5c4951dfd43c1e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.72
- Commit:
f704b35c7dbaaf8f3d4c7ee8b219e027d00816f2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
small grammar and accuracy fixes in a comment
- Commit:
4bfe9f0a4671fffd9de9bcb1048c5fdec8a3b9c1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing braces around multi-line if-statement body; pointed out by op@
- Commit:
364ac6fd6d8e9ecf616ce569d655cbc3ad8f7680
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
take tog selection cursor position into account when searching for next match
Patch by Mikhail
ok op@ jamsek
- Commit:
89a34d6e53b40dde314248e45b8f3b626fbf85c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
wrap an overlong line in enumeration_request()
- Commit:
80f51a9eb717ad2fcb3df8870e03767bcf82d845
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix unexpected imsg error after incomplete enumeration in got-read-pack
reported by jrick and op@
ok op@
- Commit:
dfee752e56872f1c60240f72c9cf845415488bcc
- From:
- Omar Polo <op@omarpolo.com>
- Date:
tog: reset matched and search data after C-l
otherwise they point to free'd data. ok stsp@
- Commit:
031611fc2bfa569627e4bc9f8f6092e6d47c2503
- From:
- Omar Polo <op@omarpolo.com>
- Date:
memset all stack-allocated structs used to send messages; ok stsp@
- Commit:
1a69d37faef36a64fd4252e75b9149b2b453752d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
zero the whole struct got_imsg_object before sending it
otherwise some fields may be unitialized and fail the validation done on
the receiving side.
ok stsp@
- Commit:
b4998ee22e6c4f0556359a5177852e33f021184d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
6de537c079cc0dfd725895ee6c0714ff17d15047
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.71
- Commit:
a00719e9ec7fca4511eb77a8aee31bd098f52c68
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a segfault in tog diff
The f1 tempfile must always be created. Even if the initial diff has no
objects on the left side, the view can be switched to a different diff
which does have objects on both sides. When that happened, tog crashed.
(To reproduce: open tog in got.git, hit G, hit Enter, hit <)