From 6663adb58e22a7378cb5a03ed872de6aa7f9ac5b Mon Sep 17 00:00:00 2001 From: schmonz Date: Fri, 23 Aug 2013 05:09:28 +0000 Subject: [PATCH] Update to 1.2. From the changelog: ============= - Tig now has its own tag on Stack Overflow, where users are invited to ask questions: http://stackoverflow.com/questions/tagged/tig Improvements: - Make tig prompt commands bindable to keys. For example: `bind diff F :set diff-options = --full-diff`. (GH #69, #116) - Add a diff-options setting for specifying default diff options. Example: `set diff-options = --patience`. (GH #116) - Options in diff-options and blame-options matching tig browsing state variables are replaced. - Show diff stats as wide as the terminal. (GH #109) - Show line numbers in the branch view. (GH #135) - Add toggles for showing author email or email user names. (GH #115) - Open editor at the selected line by prefixing the file argument with `+`. Tested in vi, vim, emacs, nano, gedit, geany. Disable by adding `set editor-line-number = no` to ~/.tigrc. (GH #118, #119) - Add toggle-files to control whether to show full commit diff or only the diff concerning the currently selected file, e.g. for blame. - Optionally highlight exceeding characters in long commit titles. The default title max width is 50 characters. Customize using: `set title-overflow = 50` (GH #125) - Add +ESC key bindings. Example: `bind generic ^[v move-page-up` (GH #120) - Create temporary files in TMPDIR, TEMP, or TMP before defaulting to /tmp. - Reenable `tig log` as a subcommand. (GH #146) - Enable tilde expansion in ~/.tigrc "source" commands. (GH #168) - Introduce the stash view, bound to the 'y' keybinding. (GH #169, #174) Bug fixes: - Fix blame and status to work in directories starting with a dot. (GH #172) - Reload current branch name when reloading the status view. (GH #93) - Fix compile errors on old Solaris. (GH #97) - Reload HEAD info when reloading the stage view. (GH #104, #93) - Fix disappearing branch labels after external commands. (GH #148) - Fix diff view display for staged/unstaged changes when using 'd'. - Fix display of status messages when toggling view options. (GH #111) - Fix illegal memory access. (GH #98) - Fix display of all branches label in repos with short branch names. - Fix rendering glitch for branch names. - Do not apply diff styling to untracked files in the stage view. (GH #153) - Fix tree indentation for entries containing combining characters. (GH #170) - Ignore unrepresentable characters when transliterating text for rendering. - Transliterate text to output encoding before trimming it to avoid misalignment. (GH #86) - Introduce a more natural context-sensitive log display. (GH #155) --- devel/tig/Makefile | 4 ++-- devel/tig/distinfo | 14 +++++++------- devel/tig/patches/patch-aa | 8 ++++---- devel/tig/patches/patch-tig_c | 20 ++++++++++++-------- devel/tig/patches/patch-tig_h | 6 +++--- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 26fe158cb5770..599b98c897d7c 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2013/07/03 00:41:14 rodent Exp $ +# $NetBSD: Makefile,v 1.8 2013/08/23 05:09:28 schmonz Exp $ # -DISTNAME= tig-1.1 +DISTNAME= tig-1.2 CATEGORIES= devel scm MASTER_SITES= http://jonas.nitro.dk/tig/releases/ diff --git a/devel/tig/distinfo b/devel/tig/distinfo index a0fb3b7721131..42b2bbcc823d6 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2013/07/03 00:41:14 rodent Exp $ +$NetBSD: distinfo,v 1.7 2013/08/23 05:09:28 schmonz Exp $ -SHA1 (tig-1.1.tar.gz) = de37817e6b53e91b5a8949a5080daf45478bd45f -RMD160 (tig-1.1.tar.gz) = fd1c6fe5743ff6618d6885330916f0bf207362d6 -Size (tig-1.1.tar.gz) = 201009 bytes -SHA1 (patch-aa) = 704c48050f26490e5bf443175c1fcebb03b70647 -SHA1 (patch-tig_c) = acceb51fb483c933c2c5c668ff644995f8b0f425 -SHA1 (patch-tig_h) = b3b3a827742114e8ce36d68a10a76728b579fdcf +SHA1 (tig-1.2.tar.gz) = 38bff28a205b94623ad0c087a3073c986002dc83 +RMD160 (tig-1.2.tar.gz) = 419d66b2ac5c2daff163a01f0db442a7e1e7b11b +Size (tig-1.2.tar.gz) = 216724 bytes +SHA1 (patch-aa) = 2cb821a030f1f40fbdf098d1ffd339f3012b4b81 +SHA1 (patch-tig_c) = a02c564e805670213277fe3c8484a0cd289bcee1 +SHA1 (patch-tig_h) = 81c4623867f80888cdb10109a3cd373937e24f43 diff --git a/devel/tig/patches/patch-aa b/devel/tig/patches/patch-aa index e6eb3f9c53708..b22623f41254e 100644 --- a/devel/tig/patches/patch-aa +++ b/devel/tig/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.4 2013/07/03 00:41:14 rodent Exp $ +$NetBSD: patch-aa,v 1.5 2013/08/23 05:09:28 schmonz Exp $ Don't make/install PDF, and be sure to install test-graph. ---- Makefile.orig 2012-10-12 12:51:47.000000000 +0000 +--- Makefile.orig 2013-08-10 14:27:12.000000000 +0000 +++ Makefile -@@ -45,7 +45,7 @@ SOURCE = tig.c tig.h io.c io.h graph.c g +@@ -44,7 +44,7 @@ TESTS = test-graph TXTDOC = tig.1.txt tigrc.5.txt manual.txt NEWS README INSTALL BUGS MANDOC = tig.1 tigrc.5 tigmanual.7 HTMLDOC = tig.1.html tigrc.5.html manual.html README.html NEWS.html @@ -13,7 +13,7 @@ Don't make/install PDF, and be sure to install test-graph. # Never include the release number in the tarname for tagged # versions. -@@ -72,7 +72,7 @@ doc-html: $(HTMLDOC) +@@ -71,7 +71,7 @@ doc-html: $(HTMLDOC) install: all mkdir -p $(DESTDIR)$(bindir) && \ diff --git a/devel/tig/patches/patch-tig_c b/devel/tig/patches/patch-tig_c index ecbdfe73a7275..0e515d1a866bf 100644 --- a/devel/tig/patches/patch-tig_c +++ b/devel/tig/patches/patch-tig_c @@ -1,15 +1,15 @@ -$NetBSD: patch-tig_c,v 1.2 2013/07/03 00:41:14 rodent Exp $ +$NetBSD: patch-tig_c,v 1.3 2013/08/23 05:09:28 schmonz Exp $ ---- tig.c.orig 2012-10-12 12:51:45.000000000 +0000 +--- tig.c.orig 2013-08-10 14:27:10.000000000 +0000 +++ tig.c -@@ -2444,17 +2444,17 @@ redraw_display(bool clear) +@@ -2594,19 +2594,19 @@ redraw_display(bool clear) */ #define TOGGLE_MENU \ - TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, NULL) \ + TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, (struct enum_map *)NULL) \ - TOGGLE_(DATE, 'D', "dates", &opt_date, date_map) \ - TOGGLE_(AUTHOR, 'A', "author names", &opt_author, author_map) \ + TOGGLE_(DATE, 'D', "dates", &opt_date, date_map) \ + TOGGLE_(AUTHOR, 'A', "author", &opt_author, author_map) \ TOGGLE_(GRAPHIC, '~', "graphics", &opt_line_graphics, graphic_map) \ - TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, NULL) \ + TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, (struct enum_map *)NULL) \ @@ -18,10 +18,14 @@ $NetBSD: patch-tig_c,v 1.2 2013/07/03 00:41:14 rodent Exp $ TOGGLE_(COMMIT_ORDER, 'l', "commit order", &opt_commit_order, commit_order_map) \ - TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, NULL) \ - TOGGLE_(CHANGES, 'C', "local change display", &opt_show_changes, NULL) \ -- TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, NULL) +- TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, NULL) \ +- TOGGLE_(FILES, '%', "file filtering", &opt_file_filter, NULL) \ +- TOGGLE_(TITLE_OVERFLOW, '$', "commit title overflow display", &opt_show_title_overflow, NULL) \ + TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, (struct enum_map *)NULL) \ + TOGGLE_(CHANGES, 'C', "local change display", &opt_show_changes, (struct enum_map *)NULL) \ -+ TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, (struct enum_map *)NULL) ++ TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, (struct enum_map *)NULL) \ ++ TOGGLE_(FILES, '%', "file filtering", &opt_file_filter, (struct enum_map *)NULL) \ ++ TOGGLE_(TITLE_OVERFLOW, '$', "commit title overflow display", &opt_show_title_overflow, (struct enum_map *)NULL) \ static bool - toggle_option(enum request request) + toggle_option(struct view *view, enum request request, char msg[SIZEOF_STR]) diff --git a/devel/tig/patches/patch-tig_h b/devel/tig/patches/patch-tig_h index ab34f864729f9..4a2aafe3d1cca 100644 --- a/devel/tig/patches/patch-tig_h +++ b/devel/tig/patches/patch-tig_h @@ -1,8 +1,8 @@ -$NetBSD: patch-tig_h,v 1.2 2013/07/03 00:41:14 rodent Exp $ +$NetBSD: patch-tig_h,v 1.3 2013/08/23 05:09:28 schmonz Exp $ ---- tig.h.orig 2012-10-12 12:51:45.000000000 +0000 +--- tig.h.orig 2013-08-10 14:27:10.000000000 +0000 +++ tig.h -@@ -89,7 +89,7 @@ +@@ -93,7 +93,7 @@ #define MIN(x, y) ((x) < (y) ? (x) : (y)) #define MAX(x, y) ((x) > (y) ? (x) : (y))