Skip to content

Commit

Permalink
Updated to latest release, 1.1. No changes other than updating patches
Browse files Browse the repository at this point in the history
to allow package to continue to work as previously packaged. +LICENSE;
From NEWS:

tig-1.1
-------

Incompatibilities:

 - Disable diff move/copy detection by default, boosting diff
   performance on larger projects. Use git config 'diff.renames' option
   (git-wide) to set your preferred behavior. Environment variable
   TIG_DIFF_OPTS can be used to restore the old behavior.
 - Values set for author-width and filename-width will result in widths
   one character bigger than previously.

Improvements:

 - Typing a text in the prompt will be interpreted as a tig command.
   Prefixing the command with a '!' will execute this system command in
   an external pager. Entering a single key will execute the
   corresponding key binding.
 - Basic support for wrapping long line in pager, diff, and stage views.
   Enable using: `set wrap-lines = yes`. (GH #2)
 - User-defined commands prefixed with a '?' means prompt before
   execution. Example: `bind main B !?git rebase -i %(commit)`.
 - User-defined commands prefixed with a '<' means exit after execution.
   Example: `bind main C !<git commit`. (GH #66)
 - User-defined commands are executed unquoted to support shell commands.
   Example: `bind generic I !@sh -c "echo -n %(commit) | xclip -selection c"`.
   (GH #65)
 - Configure case-insensitive searches using: `set ignore-case = yes`.
 - Add "deleted mode" line type for better diff coloring.
 - Open editor when requesting edit action from within a file diff.
 - Update AX_WITH_CURSES to build under Cygwin.
 - Improve tigrc(5) documentation. (Debian #682766)
 - Allow to build on Mac OS 10.7 without the configure script. (GH #25)
 - Add option to split the view vertically instead of horizontally.
   Example: `set vertical-split = yes'. (GH #76)
 - Add 'show-id' and 'id-width' options to configure the display of
   commit IDs in the main view and ID width in the blame view. (GH #77)
 - Allow to override git-based encoding to UTF-8 by setting
   'i18n.commitencoding' or 'gui.encoding'.
 - Improve autobuild support to track generated files and work with
   autoreconf 2.61.
 - Commit IDs are read from stdin when --stdin is given; works for main
   and diff view, e.g. `tig --no-walk --stdin < cherry-picks.txt`.
 - Add option to disable focusing of the child view when it's opened.
   Disable using: `set focus-child = no`. (GH #83)
 - Allow to open blob related with added content in a diff. (GH #91)

Bug fixes:

 - Fix commit graph regression when a path spec is specified. (GH #53)
 - Main view: only show staged/unstaged changes for the current branch.
 - Support submodules created with current version of git. (GH #54)
 - Fix diff status message for file diffs with no content changes.
 - Fix parent blaming when tig is launched in subdirectory. (GH #70)
 - Do not show deleted branch when reloading the branch view.

tig-1.0
-------

The master repository is git://github.com/jonas/tig.git, and the old
master repository (http://jonas.nitro.dk/tig/tig.git) will be retired.

Improvements:

 - Use git-log(1)s default commit ordering. The old behavior can be
   restored by adding `set commit-order = topo` to ~/.tigrc.
 - Support staging of single lines. Bound to '1' default. (GH #21)
 - Use +<lineno> to open the initial view at an arbitrary line. (GH #20)
 - Add show-notes ~/.tigrc option. Notes are displayed by default.
 - Support jumping to specific SHAs in the main view.
 - Decorate replaced commits.
 - Display line numbers in main view.
 - Colorize binary diff stats. (GH #17)
 - Custom colorization of lines matching a string prefix (GH #16).
   Example configuration: color "Reported-by:" green default
 - Use git's color settings for the main, status and diff views.
   Put `set read-git-colors = no` in ~/.tigrc to disable.
 - Handle editor options with multiple arguments. (GH #12)
 - Show filename when running tig blame with copy detection. (GH #19)
 - Use 'source <path>' command to load additional files from ~/.tigrc
 - User-defined commands prefixed with '@' are run with no console
   output, e.g.

   	bind generic 3 !@rm sys$command

 - Make display of space changes togglable in the diff and stage view.
   Bound to 'W' by default.
 - Use per-file encoding specified in gitattributes(5) for blobs and
   unstaged files.
 - Obsolete commit-encoding option and pass --encoding=UTF-8 to revision
   commands.
 - Main view: show uncommitted changes as staged/unstaged commits.
   Can be disabled by putting `set show-changes = no` in ~/.tigrc.
 - Add %(prompt) external command variable, which will prompt for the
   argument value.
 - Log information about git commands when the TIG_TRACE environment
   variable is set. Example: `TIG_TRACE=/tmp/tig.log tig`
 - Branch view: Show the title of the last commit.
 - Increase the author auto-abbreviation threshold to 10. (GH #49)
 - For old commits show number of years in relative dates. (GH #50)

Bug fixes:

 - Fix navigation behavior when going from branch to main view. (GH #38)
 - Fix segfault when sorting the tree view by author name.
 - Fix diff stat navigation for unmodified files with stat changes.
 - Show branches/refs which names are a substring of the current branch.
 - Stage view: fix off-by-one error when jumping to a file in a diff
   with only one file.
 - Fix diff-header colorization. (GH #15)

tig-0.18
--------

Incompatibilities:

 - Remove support for the deprecated TIG_{MAIN,DIFF,LOG,TREE,BLOB}_CMD
   environment variables.

Improvements:

 - Pressing enter on diff stat file lines will jump to file's diff.
 - Naïvely color blame IDs to distinguish lines.
 - Document palette color options used for revision graph and blame IDs.
 - Add support for blaming diff lines.
 - Add diff-context option and bindings to increase the diff context in
   the diff and stage view.
 - (GH-6) Make blame configurable via extra options passed from the command
   line and blame-options setting from ~/.tigrc. For example:

   	set blame-options = -C -C -C

Bug fixes:

 - Expand browsing state variables for prompt. (LP #694780, Debian #635546)
 - Fix segfault when sorting the branch view by author.
 - Expand %(directory) to . for the root directory. (GH-3)
 - Accept 'utf-8' for the line-graphics option as indicated in the docs.
 - Use erasechar() to check for the correct backspace character.
  • Loading branch information
rodent committed Jul 3, 2013
1 parent 6b94188 commit 31e35a7
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 23 deletions.
5 changes: 3 additions & 2 deletions devel/tig/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# $NetBSD: Makefile,v 1.6 2012/10/31 11:19:50 asau Exp $
# $NetBSD: Makefile,v 1.7 2013/07/03 00:41:14 rodent Exp $
#

DISTNAME= tig-0.17
DISTNAME= tig-1.1
CATEGORIES= devel scm
MASTER_SITES= http://jonas.nitro.dk/tig/releases/

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://jonas.nitro.dk/tig/
COMMENT= Ncurses-based GIT repository tool
LICENSE= gnu-gpl-v2

BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
Expand Down
14 changes: 7 additions & 7 deletions devel/tig/distinfo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.5 2011/07/31 22:15:36 dholland Exp $
$NetBSD: distinfo,v 1.6 2013/07/03 00:41:14 rodent Exp $

SHA1 (tig-0.17.tar.gz) = a48e9d08d96f8b49b65cf86602112c7c8e1a4804
RMD160 (tig-0.17.tar.gz) = 303c0920e7f2b8b8bb74d65cf0bb3e914501ecd4
Size (tig-0.17.tar.gz) = 168918 bytes
SHA1 (patch-aa) = 36dfa1084701d7950928075c4c764530b65a233e
SHA1 (patch-tig_c) = fad2b7fb1c931a9c54380bea67a84c28014613b8
SHA1 (patch-tig_h) = 49143512a967e77796ebf64013249d5bd516951e
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
19 changes: 14 additions & 5 deletions devel/tig/patches/patch-aa
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
$NetBSD: patch-aa,v 1.3 2011/04/10 10:24:47 ryoon Exp $
$NetBSD: patch-aa,v 1.4 2013/07/03 00:41:14 rodent Exp $

Don't make/install PDF.
Don't make/install PDF, and be sure to install test-graph.

--- Makefile.orig 2011-03-07 01:50:11.000000000 +0000
--- Makefile.orig 2012-10-12 12:51:47.000000000 +0000
+++ Makefile
@@ -40,7 +40,7 @@ SOURCE = tig.c tig.h io.c io.h graph.c g
TXTDOC = tig.1.txt tigrc.5.txt manual.txt NEWS README INSTALL BUGS TODO
@@ -45,7 +45,7 @@ SOURCE = tig.c tig.h io.c io.h graph.c g
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
-ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
+ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked

# Never include the release number in the tarname for tagged
# versions.
@@ -72,7 +72,7 @@ doc-html: $(HTMLDOC)

install: all
mkdir -p $(DESTDIR)$(bindir) && \
- for prog in $(PROGS); do \
+ for prog in $(PROGS) $(TESTS); do \
install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \
done

19 changes: 13 additions & 6 deletions devel/tig/patches/patch-tig_c
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-tig_c,v 1.1 2011/07/31 22:15:36 dholland Exp $
$NetBSD: patch-tig_c,v 1.2 2013/07/03 00:41:14 rodent Exp $

--- tig.c.orig 2011-03-07 01:50:11.000000000 +0000
--- tig.c.orig 2012-10-12 12:51:45.000000000 +0000
+++ tig.c
@@ -1897,12 +1897,12 @@ redraw_display(bool clear)
@@ -2444,17 +2444,17 @@ redraw_display(bool clear)
*/

#define TOGGLE_MENU \
Expand All @@ -12,9 +12,16 @@ $NetBSD: patch-tig_c,v 1.1 2011/07/31 22:15:36 dholland Exp $
TOGGLE_(AUTHOR, 'A', "author names", &opt_author, author_map) \
TOGGLE_(GRAPHIC, '~', "graphics", &opt_line_graphics, graphic_map) \
- TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, NULL) \
- TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, NULL)
+ TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, (struct enum_map *)NULL) \
+ TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, (struct enum_map *)NULL)
TOGGLE_(FILENAME, '#', "file names", &opt_filename, filename_map) \
TOGGLE_(IGNORE_SPACE, 'W', "space changes", &opt_ignore_space, ignore_space_map) \
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_(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)

static void
static bool
toggle_option(enum request request)
6 changes: 3 additions & 3 deletions devel/tig/patches/patch-tig_h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-tig_h,v 1.1 2011/07/31 22:15:36 dholland Exp $
$NetBSD: patch-tig_h,v 1.2 2013/07/03 00:41:14 rodent Exp $

--- tig.h~ 2011-03-07 01:50:11.000000000 +0000
--- tig.h.orig 2012-10-12 12:51:45.000000000 +0000
+++ tig.h
@@ -68,7 +68,7 @@
@@ -89,7 +89,7 @@
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#define MAX(x, y) ((x) > (y) ? (x) : (y))

Expand Down

0 comments on commit 31e35a7

Please sign in to comment.