Gotweb

Commits

Commit:: ab378e1f5dfdd34727e7eb8a2ccb8c6d42bc6e89
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Nov 7 20:22:54 2020 UTC

fix patience diff assertion failure exposed by test122

diff | patch | tree

Commit:: d1085492979de6b79ca99fd96cbbb5799a83aa82
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Nov 7 11:57:04 2020 UTC

add a test case which triggers an assertion in diff -P

diff | patch | tree

Commit:: c285a1f8b9de1be75e044892c4c7af139e5156bc
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Nov 6 15:50:58 2020 UTC

add another test case where a context line appears as both - and + This line appears as a context line with regular diff(1) and git diff: crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; [[[ + crd->crd_alg = sd->mds.mdd_crypto.scr_alg; + crd->crd_klen = sd->mds.mdd_crypto.scr_klen; crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; - bcopy(&blk, crd->crd_iv, sizeof(blk)); + memcpy(crd->crd_iv, &blkno, sizeof(blkno)); ]]] Our diff produces a different result where this context line is both deleted and added: [[[ - crd->crd_alg = CRYPTO_AES_XTS; + crd->crd_alg = sd->mds.mdd_crypto.scr_alg; + crd->crd_klen = sd->mds.mdd_crypto.scr_klen; + crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; + memcpy(crd->crd_iv, &blkno, sizeof(blkno)); + } - switch (sd->mds.mdd_crypto.scr_meta->scm_alg) { - case SR_CRYPTOA_AES_XTS_128: - crd->crd_klen = 256; - break; - case SR_CRYPTOA_AES_XTS_256: - crd->crd_klen = 512; - break; - default: - goto unwind; - } - crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; - bcopy(&blk, crd->crd_iv, sizeof(blk)); - } - crwu->cr_wu = wu; - crwu->cr_crp->crp_opaque = crwu; - return (crwu); ]]]

diff | patch | tree

Commit:: e8eedebc88e40698d3d763e6f00601484d8cabf3
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Nov 6 14:04:54 2020 UTC

add some API functions which allow access to opaque struct diff_chunk

diff | patch | tree

Commit:: 67157248154a23138c2b7ff2eebecbdf3d079ef7
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Nov 6 02:12:56 2020 UTC

fix patience: off-by-one preventing swallow the same identical line twice

diff | patch | tree

Commit:: ede78929bedd695e06a0c30839b9a561b5d6bc9c
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Nov 6 02:12:56 2020 UTC

results_test: fix output: print atom indexes, not file pos

diff | patch | tree

Commit:: e638575c9295479520dc4db9d23e22c18d61f3fb
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Nov 6 02:12:02 2020 UTC

assertions fixup: unused var for non-debug

diff | patch | tree

Commit:: a94b7229326bfb2d0c8fb77a2ec4570c8fb4f9cf
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Oct 31 15:03:29 2020 UTC

include sys/types.h for size_t in our string.h compat header file

diff | patch | tree

Commit:: 7280e29c8ed198cf9253d84bb9289e55adaabf12
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 13:40:41 2020 UTC

remove a bunch of overly verbose debug

diff | patch | tree

Commit:: f6db314590fc96c0cdbf87367b47da8603e17ae9
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 03:56:10 2020 UTC

fix result chunks: add minus above plus failed to shift "empty" positions

diff | patch | tree

Commit:: c672cd5263e14c546a06d2b2132fd05bf20bbca0
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 03:56:10 2020 UTC

add test020

diff | patch | tree

Commit:: 486215cf28522983f77b83d7a2a5effc522fea5f
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 03:55:41 2020 UTC

undup code to add result chunks

diff | patch | tree

Commit:: 4861c9da86ada01cffa2ce3801f670587e896ce2
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 03:55:03 2020 UTC

add sanity assertions around adding result chunks uncovers errors related to placing minus chunks above already added plus chunks.

diff | patch | tree

Commit:: 6303eedc563848baa1f4c48ccdb70b80393255d6
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Oct 24 11:44:40 2020 UTC

add strlcat and strlcpy compat functions for Linux

diff | patch | tree

Commit:: 6c6e6e508e69acc5a20e0b15296af8bf1a71d535
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:38:39 2020 UTC

add test117

diff | patch | tree

Commit:: ae2763e9e2c27e22c7ab84b7250a49c2fd3dd9f6
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:38:35 2020 UTC

fix patience crash: iron out overlapping identical-blocks on the right

diff | patch | tree

Commit:: 46093fc37f745d0bcbf997d84fbc676fd3f468d5
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:38:21 2020 UTC

remove stray blank line

diff | patch | tree

Commit:: 10ae3a65609c50cc21f975749f15afdcdc514126
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:38:21 2020 UTC

patience debug

diff | patch | tree

Commit:: a5de2633143c41b5d79b996d2b8f64df0808eaeb
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:38:21 2020 UTC

patience comments

diff | patch | tree

Commit:: 9f9e0ab43b25a75c30b677d0642dddfe868f4f34
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

cosmetic: patience: use local var 'r' for right atom

diff | patch | tree

Commit:: ca1af2458002521a86c887db84fe24ccc7002ab9
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

cosmetic: rename local var from 'r' to 'rc'

diff | patch | tree

Commit:: f5a254cc6ed65ef2e4fcb0737f4e3730f1a63f92
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

debug fix in diff_data_init_subsection

diff | patch | tree

Commit:: a32272f07b9bd4e7168bfacf1aa5c385fb081fcf
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

debug: fix missing quote

diff | patch | tree

Commit:: de7a293922ab041cbe620b0421763d94a13fdf47
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

debug init subsection

diff | patch | tree

Commit:: 9403a358855aa5ba3ec2f3f20943215e1d758496
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sat Oct 24 01:37:36 2020 UTC

debug fix after changing result->left,right to pointers

diff | patch | tree