aboutsummaryrefslogtreecommitdiff
path: root/devel/got
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2020-12-13 15:20:01 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2020-12-13 15:20:01 +0000
commit4a7d344be2eb4489579c0215fd3727cef1da9a9b (patch)
treee0634202c4a1a257d5092766ca3ba8554313ba66 /devel/got
parent31cbeeccb56cb4bf1b4a56b8fe76ee3ccf5fc2a6 (diff)
downloadports-4a7d344be2eb4489579c0215fd3727cef1da9a9b.tar.gz
ports-4a7d344be2eb4489579c0215fd3727cef1da9a9b.zip
Update to 0.45. User-visible changes:
- new diff implementation from git.gameoftrees.org/diff.git - new blame algorithm which compares commit N-1 to N - handle binary files in got/tog diff commands; add -a options to force text - consistently label removed files as "/dev/null" in diff headers - add histedit -f flag for folding shortcut - prevent log message loss of folded commits during histedit - tog: show current/total line numbers in diff view header - tog: highlight matched search terms in diff and blame views - tog: reset diff view's scroll position if diff context shrinks too much - tog: make tog diff accept reference and tag arguments; add -w and -C options - tog: new 'tog ref' subcommand which displays references in the repository - tog: fix entry selection when moving to the parent in tree view - tog: fix page-down/page-up scrolling in the tree view - tog: log view now requests more commits when the window expands - tog: fix bug on FreeBSD where pressing 'q' in a child view caused tog to exit - tog: fix move to next/prev commit in diff view if log is not displayed - tog: make ^L in the log view stick to branches/tags selected via -c option - tog: make tree view keep track of branches/tags specified via -c - tog: fix crashes when the log view reloads displayed data - tog: resize events go to child views as well as parent views - tog: move the tree view's selection cursor up if terminal shrinks too much - tog: fix display of lines that end in "\r\n"
Notes
Notes: svn path=/head/; revision=557991
Diffstat (limited to 'devel/got')
-rw-r--r--devel/got/Makefile3
-rw-r--r--devel/got/distinfo6
-rw-r--r--devel/got/files/patch-Makefile.inc6
-rw-r--r--devel/got/files/patch-got_Makefile4
-rw-r--r--devel/got/files/patch-regress_cmdline_histedit.sh20
-rw-r--r--devel/got/files/patch-tog_Makefile4
-rw-r--r--devel/got/files/patch-tog_tog.c48
7 files changed, 31 insertions, 60 deletions
diff --git a/devel/got/Makefile b/devel/got/Makefile
index 08330d67f187..31206d481ec2 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= got
-PORTVERSION= 0.44
-PORTREVISION= 1
+PORTVERSION= 0.45
CATEGORIES= devel
MASTER_SITES= https://gameoftrees.org/releases/
diff --git a/devel/got/distinfo b/devel/got/distinfo
index 2894518c7730..2f50c72439f3 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605047903
-SHA256 (got-0.44.tar.gz) = eff4956c07ee0eaa62652cf57db8145782703d8799e383f4bd5576a969cc7526
-SIZE (got-0.44.tar.gz) = 447925
+TIMESTAMP = 1607870946
+SHA256 (got-0.45.tar.gz) = 48f97532b8640dcfae37fee7da86e4bb8e56d149c8d1b9d3b54dddebbe894c56
+SIZE (got-0.45.tar.gz) = 479367
diff --git a/devel/got/files/patch-Makefile.inc b/devel/got/files/patch-Makefile.inc
index 8b7941707061..3510ead29343 100644
--- a/devel/got/files/patch-Makefile.inc
+++ b/devel/got/files/patch-Makefile.inc
@@ -1,8 +1,8 @@
---- Makefile.inc.orig 2020-07-25 09:10:27 UTC
+--- Makefile.inc.orig 2020-11-26 12:53:05 UTC
+++ Makefile.inc
-@@ -3,6 +3,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
- #CFLAGS += -DGOT_NO_OBJ_CACHE
+@@ -4,6 +4,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
#CFLAGS += -DGOT_OBJ_CACHE_DEBUG
+ #CFLAGS += -DGOT_DIFF_NO_MMAP
+OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat
+CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT}
diff --git a/devel/got/files/patch-got_Makefile b/devel/got/files/patch-got_Makefile
index 7e816cb3bed7..07fce0ea5d73 100644
--- a/devel/got/files/patch-got_Makefile
+++ b/devel/got/files/patch-got_Makefile
@@ -1,6 +1,6 @@
---- got/Makefile.orig 2020-09-14 14:04:47 UTC
+--- got/Makefile.orig 2020-11-10 22:54:37 UTC
+++ got/Makefile
-@@ -25,10 +25,6 @@ DPADD = ${LIBZ} ${LIBUTIL}
+@@ -29,10 +29,6 @@ DPADD = ${LIBZ} ${LIBUTIL}
NOMAN = Yes
.endif
diff --git a/devel/got/files/patch-regress_cmdline_histedit.sh b/devel/got/files/patch-regress_cmdline_histedit.sh
new file mode 100644
index 000000000000..5459b7681b94
--- /dev/null
+++ b/devel/got/files/patch-regress_cmdline_histedit.sh
@@ -0,0 +1,20 @@
+--- regress/cmdline/histedit.sh.orig 2020-12-13 15:08:45 UTC
++++ regress/cmdline/histedit.sh
+@@ -1468,7 +1468,7 @@ test_histedit_fold_only() {
+
+ cat > $testroot/editor.sh <<EOF
+ #!/bin/sh
+-sed -i 's/.*/committing folded changes/' "\$1"
++sed -i '' 's/.*/committing folded changes/' "\$1"
+ EOF
+ chmod +x $testroot/editor.sh
+
+@@ -1584,7 +1584,7 @@ test_histedit_fold_only_empty_logmsg() {
+
+ cat > $testroot/editor.sh <<EOF
+ #!/bin/sh
+-sed -i 'd' "\$1"
++sed -i '' 'd' "\$1"
+ EOF
+ chmod +x $testroot/editor.sh
+
diff --git a/devel/got/files/patch-tog_Makefile b/devel/got/files/patch-tog_Makefile
index a8e1397f9bcb..d95ee00e9d7a 100644
--- a/devel/got/files/patch-tog_Makefile
+++ b/devel/got/files/patch-tog_Makefile
@@ -1,6 +1,6 @@
---- tog/Makefile.orig 2020-09-11 17:05:16 UTC
+--- tog/Makefile.orig 2020-11-10 22:54:37 UTC
+++ tog/Makefile
-@@ -25,8 +25,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
+@@ -28,8 +28,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
NOMAN = Yes
.endif
diff --git a/devel/got/files/patch-tog_tog.c b/devel/got/files/patch-tog_tog.c
deleted file mode 100644
index fc6ae1b5e7f0..000000000000
--- a/devel/got/files/patch-tog_tog.c
+++ /dev/null
@@ -1,48 +0,0 @@
------------------------------------------------
-commit 276b94a1f9ff915aab767e558957527ccddf43e9 (main)
-from: Christian Weisgerber <naddy@mips.inka.de>
-date: Fri Nov 13 21:09:10 2020 UTC
-
- Call pthread_cond_destroy(cond) exactly once when closing a view.
-
- This moves the pthread_cond_destroy(need_commits) from stop_log_thread(),
- which can be called twice, to close_log_view(), which is called
- once. It also destroys the commit_loaded condition variable, which
- is created in open_log_view() but was never destroyed.
-
- ok stsp
-
-blob - 3895e44e1cc2bd3dcc96dbcbd7369ecad839c9b0
-blob + 200352838ae37181b0bce33796fd9bfa11c66d34
---- tog/tog.c.orig 2020-11-13 21:13:34 UTC
-+++ tog/tog.c
-@@ -2035,10 +2035,6 @@ stop_log_thread(struct tog_log_view_state *s)
- s->thread = NULL;
- }
-
-- errcode = pthread_cond_destroy(&s->thread_args.need_commits);
-- if (errcode && err == NULL)
-- err = got_error_set_errno(errcode, "pthread_cond_destroy");
--
- if (s->thread_args.repo) {
- got_repo_close(s->thread_args.repo);
- s->thread_args.repo = NULL;
-@@ -2057,8 +2053,18 @@ close_log_view(struct tog_view *view)
- {
- const struct got_error *err = NULL;
- struct tog_log_view_state *s = &view->state.log;
-+ int errcode;
-
- err = stop_log_thread(s);
-+
-+ errcode = pthread_cond_destroy(&s->thread_args.need_commits);
-+ if (errcode && err == NULL)
-+ err = got_error_set_errno(errcode, "pthread_cond_destroy");
-+
-+ errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
-+ if (errcode && err == NULL)
-+ err = got_error_set_errno(errcode, "pthread_cond_destroy");
-+
- free_commits(&s->commits);
- free(s->in_repo_path);
- s->in_repo_path = NULL;