rugged 1.3.2.3 → 1.4.2

data/vendor/libgit2/src/xdiff/xpatience.c

@@ -20,8 +20,6 @@
  *
  */
 #include "xinclude.h"
-#include "xtypes.h"
-#include "xdiff.h"
 
 /*
  * The basic idea of patience diff is to find lines that are unique in
@@ -78,7 +76,7 @@ struct hashmap {
 
 static int is_anchor(xpparam_t const *xpp, const char *line)
 {
-	unsigned long i;
+	int i;
 	for (i = 0; i < xpp->anchors_nr; i++) {
 		if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i])))
 			return 1;
@@ -92,7 +90,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
 {
 	xrecord_t **records = pass == 1 ?
 		map->env->xdf1.recs : map->env->xdf2.recs;
-	xrecord_t *record = records[line - 1], *other;
+	xrecord_t *record = records[line - 1];
 	/*
 	 * After xdl_prepare_env() (or more precisely, due to
 	 * xdl_classify_record()), the "ha" member of the records (AKA lines)
@@ -106,11 +104,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
 	int index = (int)((record->ha << 1) % map->alloc);
 
 	while (map->entries[index].line1) {
-		other = map->env->xdf1.recs[map->entries[index].line1 - 1];
-		if (map->entries[index].hash != record->ha ||
-				!xdl_recmatch(record->ptr, record->size,
-					other->ptr, other->size,
-					map->xpp->flags)) {
+		if (map->entries[index].hash != record->ha) {
 			if (++index >= map->alloc)
 				index = 0;
 			continue;
@@ -217,9 +211,6 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
 	 */
 	int anchor_i = -1;
 
-	if (!sequence)
-		return NULL;
-
 	for (entry = map->first; entry; entry = entry->next) {
 		if (!entry->line2 || entry->line2 == NON_UNIQUE)
 			continue;
@@ -258,8 +249,7 @@ static int match(struct hashmap *map, int line1, int line2)
 {
 	xrecord_t *record1 = map->env->xdf1.recs[line1 - 1];
 	xrecord_t *record2 = map->env->xdf2.recs[line2 - 1];
-	return xdl_recmatch(record1->ptr, record1->size,
-		record2->ptr, record2->size, map->xpp->flags);
+	return record1->ha == record2->ha;
 }
 
 static int patience_diff(mmfile_t *file1, mmfile_t *file2,
@@ -294,9 +284,6 @@ static int walk_common_sequence(struct hashmap *map, struct entry *first,
 
 		/* Recurse */
 		if (next1 > line1 || next2 > line2) {
-			struct hashmap submap;
-
-			memset(&submap, 0, sizeof(submap));
 			if (patience_diff(map->file1, map->file2,
 					map->xpp, map->env,
 					line1, next1 - line1,
@@ -323,6 +310,8 @@ static int fall_back_to_classic_diff(struct hashmap *map,
 		int line1, int count1, int line2, int count2)
 {
 	xpparam_t xpp;
+
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
 
 	return xdl_fall_back_diff(map->env, &xpp,

data/vendor/libgit2/src/xdiff/xprepare.c

@@ -181,15 +181,11 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 	if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *))))
 		goto abort;
 
-	if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
-		hbits = hsize = 0;
-	else {
-		hbits = xdl_hashbits((unsigned int) narec);
-		hsize = 1 << hbits;
-		if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
-			goto abort;
-		memset(rhash, 0, hsize * sizeof(xrecord_t *));
-	}
+	hbits = xdl_hashbits((unsigned int) narec);
+	hsize = 1 << hbits;
+	if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
+		goto abort;
+	memset(rhash, 0, hsize * sizeof(xrecord_t *));
 
 	nrec = 0;
 	if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
@@ -208,9 +204,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 			crec->size = (long) (cur - prev);
 			crec->ha = hav;
 			recs[nrec++] = crec;
-
-			if ((XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) &&
-			    xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
+			if (xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
 				goto abort;
 		}
 	}
@@ -219,10 +213,13 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 		goto abort;
 	memset(rchg, 0, (nrec + 2) * sizeof(char));
 
-	if (!(rindex = (long *) xdl_malloc((nrec + 1) * sizeof(long))))
-		goto abort;
-	if (!(ha = (unsigned long *) xdl_malloc((nrec + 1) * sizeof(unsigned long))))
-		goto abort;
+	if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
+	    (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)) {
+		if (!(rindex = xdl_malloc((nrec + 1) * sizeof(*rindex))))
+			goto abort;
+		if (!(ha = xdl_malloc((nrec + 1) * sizeof(*ha))))
+			goto abort;
+	}
 
 	xdf->nrec = nrec;
 	xdf->recs = recs;
@@ -279,8 +276,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	enl1 = xdl_guess_lines(mf1, sample) + 1;
 	enl2 = xdl_guess_lines(mf2, sample) + 1;
 
-	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF &&
-	    xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
+	if (xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
 		return -1;
 
 	if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
@@ -305,8 +301,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 		return -1;
 	}
 
-	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
-		xdl_free_classifier(&cf);
+	xdl_free_classifier(&cf);
 
 	return 0;
 }

data/vendor/libgit2/src/xdiff/xutils.c

@@ -23,8 +23,6 @@
 #include "xinclude.h"
 
 
-
-
 long xdl_bogosqrt(long n) {
 	long i;
 
@@ -52,7 +50,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
 		mb[2].size = strlen(mb[2].ptr);
 		i++;
 	}
-	if (ecb->outf(ecb->priv, mb, i) < 0) {
+	if (ecb->out_line(ecb->priv, mb, i) < 0) {
 
 		return -1;
 	}
@@ -342,8 +340,9 @@ int xdl_num_out(char *out, long val) {
 	return str - out;
 }
 
-int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
-		      const char *func, long funclen, xdemitcb_t *ecb) {
+static int xdl_format_hunk_hdr(long s1, long c1, long s2, long c2,
+			       const char *func, long funclen,
+			       xdemitcb_t *ecb) {
 	int nb = 0;
 	mmbuffer_t mb;
 	char buf[128];
@@ -376,7 +375,7 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 	nb += 3;
 	if (func && funclen) {
 		buf[nb++] = ' ';
-		if (funclen > (long)(sizeof(buf) - nb - 1))
+		if (funclen > sizeof(buf) - nb - 1)
 			funclen = sizeof(buf) - nb - 1;
 		memcpy(buf + nb, func, funclen);
 		nb += funclen;
@@ -385,9 +384,21 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 
 	mb.ptr = buf;
 	mb.size = nb;
-	if (ecb->outf(ecb->priv, &mb, 1) < 0)
+	if (ecb->out_line(ecb->priv, &mb, 1) < 0)
 		return -1;
+	return 0;
+}
 
+int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
+		      const char *func, long funclen,
+		      xdemitcb_t *ecb) {
+	if (!ecb->out_hunk)
+		return xdl_format_hunk_hdr(s1, c1, s2, c2, func, funclen, ecb);
+	if (ecb->out_hunk(ecb->priv,
+			  c1 ? s1 : s1 - 1, c1,
+			  c2 ? s2 : s2 - 1, c2,
+			  func, funclen) < 0)
+		return -1;
 	return 0;
 }
 

data/vendor/libgit2/src/zstream.c

@@ -9,7 +9,7 @@
 
 #include <zlib.h>
 
-#include "buffer.h"
+#include "str.h"
 
 #define ZSTREAM_BUFFER_SIZE (1024 * 1024)
 #define ZSTREAM_BUFFER_MIN_EXTRA 8
@@ -164,7 +164,7 @@ int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream)
 	return 0;
 }
 
-static int zstream_buf(git_buf *out, const void *in, size_t in_len, git_zstream_t type)
+static int zstream_buf(git_str *out, const void *in, size_t in_len, git_zstream_t type)
 {
 	git_zstream zs = GIT_ZSTREAM_INIT;
 	int error = 0;
@@ -178,7 +178,7 @@ static int zstream_buf(git_buf *out, const void *in, size_t in_len, git_zstream_
 	while (!git_zstream_done(&zs)) {
 		size_t step = git_zstream_suggest_output_len(&zs), written;
 
-		if ((error = git_buf_grow_by(out, step)) < 0)
+		if ((error = git_str_grow_by(out, step)) < 0)
 			goto done;
 
 		written = out->asize - out->size;
@@ -199,12 +199,12 @@ done:
 	return error;
 }
 
-int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len)
+int git_zstream_deflatebuf(git_str *out, const void *in, size_t in_len)
 {
 	return zstream_buf(out, in, in_len, GIT_ZSTREAM_DEFLATE);
 }
 
-int git_zstream_inflatebuf(git_buf *out, const void *in, size_t in_len)
+int git_zstream_inflatebuf(git_str *out, const void *in, size_t in_len)
 {
 	return zstream_buf(out, in, in_len, GIT_ZSTREAM_INFLATE);
 }

data/vendor/libgit2/src/zstream.h

@@ -11,11 +11,11 @@
 
 #include <zlib.h>
 
-#include "buffer.h"
+#include "str.h"
 
 typedef enum {
 	GIT_ZSTREAM_INFLATE,
-	GIT_ZSTREAM_DEFLATE,
+	GIT_ZSTREAM_DEFLATE
 } git_zstream_t;
 
 typedef struct {
@@ -48,7 +48,7 @@ bool git_zstream_eos(git_zstream *zstream);
 
 void git_zstream_reset(git_zstream *zstream);
 
-int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len);
-int git_zstream_inflatebuf(git_buf *out, const void *in, size_t in_len);
+int git_zstream_deflatebuf(git_str *out, const void *in, size_t in_len);
+int git_zstream_inflatebuf(git_str *out, const void *in, size_t in_len);
 
 #endif

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 1.3.2.3
+  version: 1.4.2
 platform: ruby
 authors:
 - Scott Chacon
 - Vicent Marti
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -124,11 +124,12 @@ files:
 - vendor/libgit2/CMakeLists.txt
 - vendor/libgit2/COPYING
 - vendor/libgit2/cmake/AddCFlagIfSupported.cmake
+- vendor/libgit2/cmake/DefaultCFlags.cmake
 - vendor/libgit2/cmake/EnableWarnings.cmake
 - vendor/libgit2/cmake/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/FindGSSAPI.cmake
 - vendor/libgit2/cmake/FindGSSFramework.cmake
-- vendor/libgit2/cmake/FindHTTP_Parser.cmake
+- vendor/libgit2/cmake/FindHTTPParser.cmake
 - vendor/libgit2/cmake/FindIconv.cmake
 - vendor/libgit2/cmake/FindLibSSH2.cmake
 - vendor/libgit2/cmake/FindPCRE.cmake
@@ -142,8 +143,13 @@ files:
 - vendor/libgit2/cmake/PkgBuildConfig.cmake
 - vendor/libgit2/cmake/SanitizeBool.cmake
 - vendor/libgit2/cmake/SelectGSSAPI.cmake
+- vendor/libgit2/cmake/SelectHTTPParser.cmake
 - vendor/libgit2/cmake/SelectHTTPSBackend.cmake
 - vendor/libgit2/cmake/SelectHashes.cmake
+- vendor/libgit2/cmake/SelectRegex.cmake
+- vendor/libgit2/cmake/SelectSSH.cmake
+- vendor/libgit2/cmake/SelectWinHTTP.cmake
+- vendor/libgit2/cmake/SelectZlib.cmake
 - vendor/libgit2/deps/chromium-zlib/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/COPYING
@@ -313,6 +319,7 @@ files:
 - vendor/libgit2/include/git2/sys/refdb_backend.h
 - vendor/libgit2/include/git2/sys/reflog.h
 - vendor/libgit2/include/git2/sys/refs.h
+- vendor/libgit2/include/git2/sys/remote.h
 - vendor/libgit2/include/git2/sys/repository.h
 - vendor/libgit2/include/git2/sys/stream.h
 - vendor/libgit2/include/git2/sys/transport.h
@@ -354,8 +361,8 @@ files:
 - vendor/libgit2/src/blob.h
 - vendor/libgit2/src/branch.c
 - vendor/libgit2/src/branch.h
-- vendor/libgit2/src/buffer.c
-- vendor/libgit2/src/buffer.h
+- vendor/libgit2/src/buf.c
+- vendor/libgit2/src/buf.h
 - vendor/libgit2/src/cache.c
 - vendor/libgit2/src/cache.h
 - vendor/libgit2/src/cc-compat.h
@@ -384,6 +391,7 @@ files:
 - vendor/libgit2/src/config_snapshot.c
 - vendor/libgit2/src/crlf.c
 - vendor/libgit2/src/date.c
+- vendor/libgit2/src/date.h
 - vendor/libgit2/src/delta.c
 - vendor/libgit2/src/delta.h
 - vendor/libgit2/src/describe.c
@@ -399,6 +407,7 @@ files:
 - vendor/libgit2/src/diff_parse.h
 - vendor/libgit2/src/diff_print.c
 - vendor/libgit2/src/diff_stats.c
+- vendor/libgit2/src/diff_stats.h
 - vendor/libgit2/src/diff_tform.c
 - vendor/libgit2/src/diff_tform.h
 - vendor/libgit2/src/diff_xdiff.c
@@ -416,6 +425,8 @@ files:
 - vendor/libgit2/src/filebuf.h
 - vendor/libgit2/src/filter.c
 - vendor/libgit2/src/filter.h
+- vendor/libgit2/src/fs_path.c
+- vendor/libgit2/src/fs_path.h
 - vendor/libgit2/src/futils.c
 - vendor/libgit2/src/futils.h
 - vendor/libgit2/src/graph.c
@@ -463,7 +474,6 @@ files:
 - vendor/libgit2/src/merge_driver.h
 - vendor/libgit2/src/merge_file.c
 - vendor/libgit2/src/message.c
-- vendor/libgit2/src/message.h
 - vendor/libgit2/src/midx.c
 - vendor/libgit2/src/midx.h
 - vendor/libgit2/src/mwindow.c
@@ -516,6 +526,8 @@ files:
 - vendor/libgit2/src/proxy.h
 - vendor/libgit2/src/push.c
 - vendor/libgit2/src/push.h
+- vendor/libgit2/src/rand.c
+- vendor/libgit2/src/rand.h
 - vendor/libgit2/src/reader.c
 - vendor/libgit2/src/reader.h
 - vendor/libgit2/src/rebase.c
@@ -550,6 +562,8 @@ files:
 - vendor/libgit2/src/stash.c
 - vendor/libgit2/src/status.c
 - vendor/libgit2/src/status.h
+- vendor/libgit2/src/str.c
+- vendor/libgit2/src/str.h
 - vendor/libgit2/src/strarray.c
 - vendor/libgit2/src/stream.h
 - vendor/libgit2/src/streams/mbedtls.c
@@ -660,6 +674,7 @@ files:
 - vendor/libgit2/src/win32/win32-compat.h
 - vendor/libgit2/src/worktree.c
 - vendor/libgit2/src/worktree.h
+- vendor/libgit2/src/xdiff/git-xdiff.h
 - vendor/libgit2/src/xdiff/xdiff.h
 - vendor/libgit2/src/xdiff/xdiffi.c
 - vendor/libgit2/src/xdiff/xdiffi.h
@@ -682,7 +697,7 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: libssh2 cmake
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -697,8 +712,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library
 test_files: []