Commits
- Commit:
016bfe4bc2e2f43aea446f3c89e1539235c66fd2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
- Commit:
0f76ab831bc589bb34a4953cf60c8a05a4ed708c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
2d9b683740176cd3223b23ca8bed498f87c0ecbc
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
2249fadd87cf34f5a23846a876e1a846a82c5c79
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
patch_file: move file ownership to parent
ok stsp@
- Commit:
e16a78c2dd0580573c8bff15d225a65b3656cc3c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump version number
- Commit:
5328fb4f56aa32f852d1c88126fd5756bb9cec9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
CHANGES for 0.72
- Commit:
1f4d51624ce2a28d6cd8385d3ec7bef9975db99f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
small grammar and accuracy fixes in a comment
- Commit:
b74feda6c03e98dfcfc9b50c418817ee34ae4f51
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add missing braces around multi-line if-statement body; pointed out by op@
- Commit:
df5e841d09305f99fc2b172349b1caf24bf1e10b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
take tog selection cursor position into account when searching for next match
Patch by Mikhail
ok op@ jamsek
- Commit:
0f4feb58a3a8349d878d406fbd88a9774df62ddb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
wrap an overlong line in enumeration_request()
- Commit:
f3002810d8c237e4b60bcf6e41864dbb757c5075
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix unexpected imsg error after incomplete enumeration in got-read-pack
reported by jrick and op@
ok op@
- Commit:
e24d0f152ad6cb66adbe0efce357b73d9d719fe5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: reset matched and search data after C-l
otherwise they point to free'd data. ok stsp@
- Commit:
c26ee7add64b80ff74fa5d22df886393a52f9b41
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
memset all stack-allocated structs used to send messages; ok stsp@
- Commit:
1bb2bba217ad222aed1d79baf9d8025110130bd3
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
9ec06ae8011dfdee2d415e1a81635f63e1a68edc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump version number
- Commit:
6bb4d9ea9d9ab61d4b748b03c595bdabb1901ec4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
CHANGES for 0.71
- Commit:
9a1d7435894d96f76306bd47db368d52bc7096d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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 <)
- Commit:
c31666ae2d9d83148e3a726b077fb0756d807a4d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix build of tog on sparc64 with -Werror
error was tog/tog.c:636: warning: function declaration isn't a prototype
- Commit:
5c6cacf5ac35a34762aea020d9eba56b1b973c94
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
account for the vborder in draw_commit
the vborder is drawn on top of the window and that can cause issues with
double-width characters. Instead, account for it when computing the
space available for the log message.
ok stsp@
- Commit:
40236d7667cfdc2a4107c514b64f7f7bf6490f45
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: resize main view
drawing the child view on top of the main view when the layout is
split-screen can produce some ugly glitches when double-width
characters are involved. (issue found by stsp)
ok stsp@
- Commit:
8d208d3487a42414bcbbd542d3caca89e442fb33
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simplify scroll_wline (now span_wline) and format_line
generalize scroll_wline to start at a specified offset so that we can
reuse it to simplify format_line. While here, simplify scroll_wline
(now called span_wline) too.
ok and improvements by stsp@
- Commit:
1065461da75da76e9e55d79a8b1c74b7d1f75e00
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix wrong pointer in NULL check; found by tracey
- Commit:
666f7b101a108aff1b7d4ddf36521f55159db286
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix highlighting issues in tog diff/blame search on lines with tabs
- Commit:
78eecffc27a77c02d95f8ab9dffb7d8ec7dba733
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: fix crash in expand_tab while searching in diff/blame views
found by op@
ok op@ tracey@
- Commit:
cbea38000971f273e45bd6c97b6203daefbb8438
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix diff and blame view search for horizontal scrolling with unicode
ok op@