Date: Tue, 6 Apr 2021 08:15:13 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d34abcb3e18f - main - devel/git-cinnabar: update to 0.5.7 Message-ID: <202104060815.1368FD6t090869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d34abcb3e18f8be04522ff9059b62a38123e8938 commit d34abcb3e18f8be04522ff9059b62a38123e8938 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-03-31 21:58:42 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-04-06 08:11:40 +0000 devel/git-cinnabar: update to 0.5.7 Changes: https://github.com/glandium/git-cinnabar/releases/tag/0.5.7 Reported by: GitHub (watch releases) --- devel/git-cinnabar/Makefile | 3 +- devel/git-cinnabar/distinfo | 6 +-- devel/git-cinnabar/files/patch-git-2.30 | 49 ----------------- devel/git-cinnabar/files/patch-git-2.31 | 93 --------------------------------- 4 files changed, 4 insertions(+), 147 deletions(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 285aa32a7a33..24e400c67377 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.5.6 -PORTREVISION= 4 +DISTVERSION= 0.5.7 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/distinfo b/devel/git-cinnabar/distinfo index f14793ab0d26..1b17f68bcfa2 100644 --- a/devel/git-cinnabar/distinfo +++ b/devel/git-cinnabar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1605147574 -SHA256 (glandium-git-cinnabar-0.5.6_GH0.tar.gz) = 64c483e93eea5ec9ef142988e272f949428db2ef685aecc31ce112e24f55f3c9 -SIZE (glandium-git-cinnabar-0.5.6_GH0.tar.gz) = 176409 +TIMESTAMP = 1617227922 +SHA256 (glandium-git-cinnabar-0.5.7_GH0.tar.gz) = 1f30b79b89b421ba33e47f00a8301da5b7533e10cc6314c4febd23ad6ed4b17b +SIZE (glandium-git-cinnabar-0.5.7_GH0.tar.gz) = 176569 diff --git a/devel/git-cinnabar/files/patch-git-2.30 b/devel/git-cinnabar/files/patch-git-2.30 deleted file mode 100644 index 9e8e3f197447..000000000000 --- a/devel/git-cinnabar/files/patch-git-2.30 +++ /dev/null @@ -1,49 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/2db9fad6a3df - ---- helper/GIT-VERSION.mk.orig 2020-11-12 02:19:34 UTC -+++ helper/GIT-VERSION.mk -@@ -1,2 +1,2 @@ --GIT_VERSION ?= v2.29.2 -+GIT_VERSION ?= v2.30.0 - WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 ---- helper/cinnabar-fast-import.c.orig 2020-11-12 02:19:34 UTC -+++ helper/cinnabar-fast-import.c -@@ -264,7 +264,7 @@ static uintmax_t parse_mark_ref(const char *p, char ** - e->pack_id = MAX_PACK_ID; - e->idx.offset = 1; - } -- insert_mark(marks, 2, e); -+ insert_mark(&marks, 2, e); - return 2; - } - ---- helper/cinnabar-helper.c.orig 2020-11-12 02:19:34 UTC -+++ helper/cinnabar-helper.c -@@ -1978,8 +1978,8 @@ static void do_upgrade(struct string_list *args) - free_tree_buffer(get_commit_tree(manifest_commit)); - } - } -- hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); -- hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent); -+ hashmap_clear_and_free(&track.commit_cache, struct oid_map_entry, ent); -+ hashmap_clear_and_free(&track.tree_cache, struct oid_map_entry, ent); - oidset_clear(&track.manifests); - stop_progress(&track.progress); - } -@@ -2371,7 +2371,7 @@ static void do_reload(struct string_list *args) - - oidset_clear(&hg2git_seen); - -- hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); -+ hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent); - hashmap_init(&git_tree_cache, oid_map_entry_cmp, NULL, 0); - - oid_array_clear(&manifest_heads); -@@ -2574,6 +2574,6 @@ int main(int argc, const char *argv[]) - free_notes(&files_meta); - - oidset_clear(&hg2git_seen); -- hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); -+ hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent); - return 0; - } diff --git a/devel/git-cinnabar/files/patch-git-2.31 b/devel/git-cinnabar/files/patch-git-2.31 deleted file mode 100644 index c3eeb83bffad..000000000000 --- a/devel/git-cinnabar/files/patch-git-2.31 +++ /dev/null @@ -1,93 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/ce38b14f5efc - ---- cinnabar/helper.py.orig 2020-11-12 02:19:34 UTC -+++ cinnabar/helper.py -@@ -326,7 +326,7 @@ class GitHgHelper(BaseHelper): - - @classmethod - def diff_tree(self, rev1, rev2, detect_copy=False): -- extra = () if not detect_copy else (b'-C100%',) -+ extra = () if not detect_copy else (b'-C', b'-C') - extra = extra + (b'--ignore-submodules=dirty', b'--') - with self.query(b'diff-tree', rev1, rev2, *extra) as stdout: - data = self._read_data(stdout) ---- helper/GIT-VERSION.mk.orig 2020-11-12 02:19:34 UTC -+++ helper/GIT-VERSION.mk -@@ -1,2 +1,2 @@ --GIT_VERSION ?= v2.30.0 -+GIT_VERSION ?= v2.31.0 - WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 ---- helper/cinnabar-fast-import.c.orig 2020-11-12 02:19:34 UTC -+++ helper/cinnabar-fast-import.c -@@ -1152,7 +1152,7 @@ static void for_each_changegroup_chunk(FILE *in, int v - struct rev_chunk chunk = { STRBUF_INIT, }; - struct hg_object_id delta_node = {{ 0, }}; - -- while (read_chunk(in, &buf), buf.len) { -+ while (read_rev_chunk(in, &buf), buf.len) { - rev_chunk_from_memory(&chunk, &buf, cg2 ? NULL : &delta_node); - if (!cg2 && is_null_hg_oid(&delta_node)) - hg_oidcpy(&delta_node, chunk.parent1); -@@ -1239,7 +1239,7 @@ static void do_store(struct string_list *args) - /* manifests */ - for_each_changegroup_chunk(stdin, version, store_manifest); - /* files */ -- while (read_chunk(stdin, &buf), buf.len) { -+ while (read_rev_chunk(stdin, &buf), buf.len) { - strbuf_release(&buf); - for_each_changegroup_chunk(stdin, version, store_file); - } ---- helper/hg-bundle.c.orig 2020-11-12 02:19:34 UTC -+++ helper/hg-bundle.c -@@ -86,7 +86,7 @@ void copy_bundle_to_strbuf(FILE *in, struct strbuf *ou - writer_close(&writer); - } - --void read_chunk(FILE *in, struct strbuf *out) -+void read_rev_chunk(FILE *in, struct strbuf *out) - { - // See copy_bundle2_chunk and copy_changegroup_chunk. - char buf[4]; ---- helper/hg-bundle.h.orig 2020-11-12 02:19:34 UTC -+++ helper/hg-bundle.h -@@ -11,7 +11,7 @@ void copy_bundle(FILE *in, struct writer *out); - void copy_bundle_to_file(FILE *in, FILE *out); - void copy_bundle_to_strbuf(FILE *in, struct strbuf *out); - --void read_chunk(FILE *in, struct strbuf *out); -+void read_rev_chunk(FILE *in, struct strbuf *out); - - struct rev_chunk { - struct strbuf raw; ---- /dev/null -+++ helper/object-file.c.patch -@@ -0,0 +1,13 @@ -+diff --git a/object-file.c b/object-file.c -+index 188de57634..7b06e56727 100644 -+--- a/object-file.c -++++ b/object-file.c -+@@ -1868,7 +1868,7 @@ static int freshen_packed_object(const struct object_id *oid) -+ return 1; -+ } -+ -+-int write_object_file(const void *buf, unsigned long len, const char *type, -++int real_write_object_file(const void *buf, unsigned long len, const char *type, -+ struct object_id *oid) -+ { -+ char hdr[MAX_HEADER_LEN]; ---- helper/sha1-file.c.patch.orig 2020-11-12 02:19:34 UTC -+++ helper/sha1-file.c.patch -@@ -1,13 +0,0 @@ --diff --git a/sha1-file.c b/sha1-file.c --index 188de57634..7b06e56727 100644 ----- a/sha1-file.c --+++ b/sha1-file.c --@@ -1868,7 +1868,7 @@ static int freshen_packed_object(const struct object_id *oid) -- return 1; -- } -- ---int write_object_file(const void *buf, unsigned long len, const char *type, --+int real_write_object_file(const void *buf, unsigned long len, const char *type, -- struct object_id *oid) -- { -- char hdr[MAX_HEADER_LEN];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104060815.1368FD6t090869>