Commits
- Commit:
601f05cdbeb8a43249702cafae41b9dee4811bd6
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add missed `size' initialization for use with getline(3)
ok tb@
- Commit:
98670ba726486c39efff220ab1e074c62023aae7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: rework SHA detection
Simply the SHA detection by not predicating on libcrypto, but instead
checking individual header files.
- Commit:
4680f704353811c8bb6ce65eac3714d1bd200c26
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove sha1.h; found portably
Remove sha1.h as this is found portably across systems.
- Commit:
588a8092bc282294ee23585991e81586905a8fd4
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
include sha2.h too where sha1.h is included
In preparation for wide sha256 support; stsp@ agrees. Change done
mechanically with
find . -iname \*.[cy] -exec sam {} +
X ,x/<sha1\.h>/i/\n#include <sha2.h>
- Commit:
fc2a50f28951c340fb573e7fcb0646ddf93fde8f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use mkstemps(3) instead of mkstemp(3) for opening named temporary files
Allows 'got commit' to use a ".diff" suffix for temporary diff files.
ok op@
- Commit:
a42e5f4ff97c315089711cf82a4ac526215f7af1
- From:
- Tom Jones <thj@freebsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch diff output mode from "edscript" to "plain" for diff3
getchange() in diff3.c takes any line that starts with an integer
and treats it as a hunk header. It doesn't actually require ed script
instructions, and traditional ed script diff output would break it.
Thus, changing Got's diff3 to rely on plain diff output mode paves the
way for implementing traditional ed-script style output in diff.git.
Patch by Tom Jones
- Commit:
8b925c6ccd3968917253ea191906a1710c40ed2d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add back sys/queue.h
Now that the handling of including sys/queue.h is better, there's no
need to remove those lines from the source. Copy the location of those
original sys/queue.h lines from upstream at the same line number, so as
to avoid any conflicts in the future.
- Commit:
25ec70067dea51a3c3ffd3c5f989853d80b847f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch 'tog diff' and 'tog blame' to Myers diff for speed
Make the choice of diff algorithm configurable by diff API users.
The got and gotweb programs keep using Patience diffs which are
prettier than Myers. But tog should be as fast as possible since
it is being used interactively. If performance of Patience diff
gets improved later we can consider switching tog back over to it.
ok tracey jamsek
- Commit:
89fe1c42b34d471ab9756eb05231a5d72339e8c8
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: fix-up sha1.h include
-portable doesn't need this directly.
- Commit:
9a267125aa0f9487f325eea3e3c551ad9a19ca51
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
82f9484cc55a71e0bce201220c989e5058da6b9d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: include sha1.h portably
Don't directly include sha1.h as this isn't always in the same location
across systems.
- Commit:
c17f3d0c7b2d780dbb8117b66d797c92c1f4add3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
b0e25f642db7b3e726f2827eb39b61bfea3e9c50
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: freebsd: portably include sha1
The SHA implementation is found portably across systems, so don't
include sha1.h directly.
- Commit:
ec242592d329728975bf10a1196907167de7fed0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
48b4f239031ad66225f64bd6745f4a57a35c3a0f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
wrap overlong lines
- Commit:
c56c5d8a20e8209334b5357111eddee0861cddae
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
- Commit:
24f136e0f955e179395f9d081b45fbea32f02325
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
preverse binary files during updates and merges
- Commit:
d27f86179a20035dda9a5eb0d74dda269dae671c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
set oldo.to in diff3.c's duplicate() even if the file contains no newlines
- Commit:
8e831ff19c364e7b4a4d77885cd3421502daeed3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always initialize output parameter "n" of get_line() in diff3.c
- Commit:
3c7939fe2bc71876feb1b5c144e95c69f60d2763
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix another segfault in edscript()
Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1.
ok stsp
- Commit:
b6c8e5e0edc57f309ae866114527e614ad0cd76d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix a segfault in edscript() introduced by my previous commit
Found by our cherrypick regression tests.
- Commit:
461f6aedbd48fa1a352a579c70013ff02d50a6c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix merging of files which contain a dot on a line by itself
Annoying bug which we inherited from OpenRCS which inherited
it from OpenBSD's diff3 program.
ok tracey millert
- Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
- From:
- Thomas Adam <thomas@xteddy.org>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under
linux.
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use Patience diff for merging during cherrypick/backout/histedit/rebase
This has been shown to prevent mis-merges in some cases. It's probably
not a final solution. We should look at what Git's "recursive merge"
is doing and implement something similar.
Keep using Myers during update/unstage. The advantage of Myers is that
it produces smaller conflict chunks, and there are no known cases of
mis-merges which affect update/unstage.