Master

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -22,7 +22,8 @@ doc/release-docs/
 src/builtin-config.c
 src/tig
 tags
-test/test-graph
+test/tools/test-graph
+test/tmp
 tig-*.tar.gz
 tig-*.tar.gz.md5
 tig.spec

.travis.yml

@@ -5,7 +5,7 @@ compiler:
   - gcc
 
 env:
-  - TEST=autoconf VERBOSE=1
+  - TEST=autoconf VERBOSE=1 TEST_SHELL=bash
   - TEST=make     VERBOSE=@
 
 before_install: sudo apt-get update -qq
@@ -15,4 +15,4 @@ install: sudo apt-get install -qq --no-install-recommends asciidoc xmlto docbook
 script:
   - if [ "$TEST" = autoconf ]; then ./autogen.sh && ./configure; fi
   - if [ "$TEST" = make ]; then cp contrib/config.make .; fi
-  - make V=$VERBOSE DESTDIR=/tmp all test install install-doc
+  - make V=$VERBOSE DESTDIR=/tmp TEST_SHELL=$TEST_SHELL all test install install-doc

Makefile

@@ -2,7 +2,7 @@
 
 # The last tagged version. Can be overridden either by the version from
 # git or from the value of the DIST_VERSION environment variable.
-VERSION	= 2.0.1
+VERSION	= 2.0.3
 
 all:
 
@@ -41,7 +41,7 @@ LDLIBS ?= -lcurses
 CFLAGS ?= -Wall -O2
 DFLAGS	= -g -DDEBUG -Werror -O0
 EXE	= src/tig
-TOOLS	= test/test-graph tools/doc-gen
+TOOLS	= test/tools/test-graph tools/doc-gen
 TXTDOC	= doc/tig.1.adoc doc/tigrc.5.adoc doc/manual.adoc NEWS.adoc README.adoc INSTALL.adoc
 MANDOC	= doc/tig.1 doc/tigrc.5 doc/tigmanual.7
 HTMLDOC = doc/tig.1.html doc/tigrc.5.html doc/manual.html README.html INSTALL.html NEWS.html
@@ -103,7 +103,7 @@ install-release-doc-html:
 install-doc: install-doc-man install-doc-html
 install-release-doc: install-release-doc-man install-release-doc-html
 
-clean:
+clean: clean-test
 	$(RM) -r $(TARNAME) *.spec tig-*.tar.gz tig-*.tar.gz.md5 .deps
 	$(RM) $(EXE) $(TOOLS) $(OBJS) core doc/*.xml src/builtin-config.c
 
@@ -153,16 +153,26 @@ dist: configure tig.spec
 rpm: dist
 	rpmbuild -ta $(TARNAME).tar.gz
 
-test: $(TOOLS)
-	test/unit-test-graph.sh
-	test/builtin-config.sh
+TESTS  = $(sort $(shell find test -type f -name '*-test'))
+
+clean-test:
+	$(Q)$(RM) -r test/tmp
+
+test: clean-test $(TESTS)
+	$(QUIET_SUMMARY)test/tools/show-results.sh
+
+export TEST_OPTS ?= $(V:1=no-indent)
+
+$(TESTS): PATH := $(CURDIR)/test/tools:$(CURDIR)/src:$(PATH)
+$(TESTS): $(EXE) test/tools/test-graph
+	$(QUIET_TEST)$(TEST_SHELL) $@
 
 # Other autoconf-related rules are hidden in config.make.in so that
 # they don't confuse Make when we aren't actually using ./configure
 configure: configure.ac acinclude.m4 tools/*.m4
 	./autogen.sh
 
-.PHONY: all all-debug doc doc-man doc-html install install-doc \
+.PHONY: all all-debug doc doc-man doc-html install install-doc $(TESTS) \
 	install-doc-man install-doc-html clean spell-check dist rpm test
 
 ifdef NO_MKSTEMPS
@@ -222,8 +232,8 @@ TIG_OBJS = \
 
 src/tig: $(TIG_OBJS)
 
-TEST_GRAPH_OBJS = test/test-graph.o src/string.o src/util.o src/io.o src/graph.o $(COMPAT_OBJS)
-test/test-graph: $(TEST_GRAPH_OBJS)
+TEST_GRAPH_OBJS = test/tools/test-graph.o src/string.o src/util.o src/io.o src/graph.o $(COMPAT_OBJS)
+test/tools/test-graph: $(TEST_GRAPH_OBJS)
 
 DOC_GEN_OBJS = tools/doc-gen.o src/string.o src/types.o src/util.o src/request.o
 tools/doc-gen: $(DOC_GEN_OBJS)
@@ -317,6 +327,8 @@ QUIET_DB2PDF		= $(Q:@=@echo    '    DB2PDF  '$@;)
 # tools/install.sh will print 'file -> $install_dir/file'
 QUIET_INSTALL		= $(Q:@=@printf  '   INSTALL  ';)
 QUIET_INSTALL_EACH	= $(Q:@=printf   '   INSTALL  ';)
+QUIET_TEST		= $(Q:@=@echo    '      TEST  '$@;)
+QUIET_SUMMARY		= $(Q:@=@printf  '   SUMMARY  ';)
 
 export V
 endif

NEWS.adoc

@@ -4,11 +4,75 @@ Release notes
 master
 ------
 
+Improvements:
+
+ - Add move-half-page-up and move-half-page-down actions. (GH #323)
+ - Preserve the cursor position when changing the diff context. 
+
+Bug fixes:
+
+ - Update manual to reflect default keybinding changes. (GH #325)
+ - Fix graph support for `--first-parent`. (GH #326)
+ - Fix off-by-one error when opening editor from the grep view.
+
+tig-2.0.3
+---------
+
+Improvements:
+
+ - Add `:save-display <file>` prompt command to save the current display.
+ - Add `:script <file>` prompt command for scripting the Tig UI.
+ - Add test framework and convert existing tests to use it.
+ - Add command-line option for starting in refs view: `tig refs`. (GH #309)
+ - Make blame commit ID colors stable across reloads. (GH #303)
+ - Increase blame ID and graph rendering color palette to 14 colors.
+ - New setting 'split-view-width' controls the width for vertical splits. It
+   takes the width of the right-most view either as a number or a percentage.
+ - Expose settings holding command line argument lists: `file-args`, `rev-args`,
+   and `cmdline-args`. They are mainly intended for testing purposes but also
+   allows to change the filtering arguments dynamically. (GH #306)
+ - Add `log-options` setting for specifying default log view options.
+   Example: `set log-options = --pretty=fuller`.
+ - Use option specific view flags to reload view after `:set` commands.
+
+Bug fixes:
+
+ - Refresh the current view when returning from an external command and
+   `refresh-mode=after-command`. (GH #289)
+ - Fix readline completion.
+ - Fix '/' to `find-next` when readline support is enabled. (GH #302)
+ - Fix readline prompt to correctly handle UTF-8 characters.
+ - Add warnings for more obsolete actions and colors.
+ - Fix passing of commit IDS via stdin to the main view.
+ - Fix commit title overflow drawing for multibyte text. (GH #307)
+ - Fix installation directory permissions.
+ - Handle binary files matches reported by git-grep.
+ - Toggling of "args"-typed options without any arguments will clear the current
+   arguments. Example: `:toggle blame-options`.
+ - Detect custom `pretty.format` settings that break the log view and fallback
+   to use the `medium` format. (GH #225)
+ - Fix invocation of git-diff for the blame view's line tracking. (GH #316)
+ - Fix blame completion of directory names. (GH #317)
+ - Fix display of conflicts in the main view when 'show-changes' is enabled.
+ - Fix off-by-one error when displaying line numbers in the grep view.
+ - When showing the commit graph ensure that either topo, date or author-date
+   commit order is used. (Debian #757692) (GH #238)
+
+tig-2.0.2
+---------
+
+Improvements:
+
+ - Use git-status for diffing the index.
+ - Group toggle options together in the help view.
+
 Bug fixes:
 
  - Fix refs, main and grep loading when 'gui.encoding' is set. (GH #287)
  - Ignore 'gui.encoding' and 'i18n.commitencoding' when set to 'UTF-8'.
  - Add work-around for missing strndup() on Mac OS X v10.6. (GH #286)
+ - Fix spurious abbreviation of author names. (GH #288)
+ - Don't show empty action groups in the help view.
 
 tig-2.0.1
 ---------

contrib/tig-completion.bash

@@ -186,22 +186,40 @@ _tig_options ()
 
 _tig_blame ()
 {
-	local reply="" ref=HEAD cur="${COMP_WORDS[COMP_CWORD]}"
+	local reply="" ref=HEAD cur="${COMP_WORDS[COMP_CWORD]}" p=""
+	local pfx=$(git rev-parse --show-prefix 2>/dev/null)
 
 	if test "$COMP_CWORD" -lt 3; then
-		reply="$(__tig_refs)"
+		_tigcomp "$(__tig_refs)"
 	else
 		ref="${COMP_WORDS[2]}"
 	fi
 
-	reply="$reply $(git --git-dir="$(__tigdir)" ls-tree "$ref" \
-			| sed '/^100... blob /s,^.*	,,
-			       /^040000 tree /{
-			           s,^.*	,,
-			           s,$,/,
-			       }
-			       s/^.*	//')"
-	_tigcomp "$reply"
+	case "$cur" in
+		*/)	p=${cur%/} ;;
+		*/*)	p=${cur%/*} ;;
+		*)	p= ;;
+	esac
+
+	i=${#COMPREPLY[@]}
+	local IFS=$'\n'
+	for c in $(git --git-dir="$(__tigdir)" ls-tree "$ref:$pfx$p" 2>/dev/null |
+		sed -n '/^100... blob /{
+			s,^.*	,,
+			s,$, ,
+			p
+		}
+		/^040000 tree /{
+			s,^.*	,,
+			s,$,/,
+			p
+		}')
+	do
+		c="${p:+$p/}$c"
+		if [[ "$c" == "$cur"* ]]; then
+			COMPREPLY[i++]=$c
+		fi
+	done
 }
 
 _tig_show ()

doc/manual.adoc

@@ -88,7 +88,7 @@ from an external command, most often 'git log', 'git diff', or 'git show'.
 
 The main view::
 	Is the default view, and it shows a one line summary of each commit
-	in the chosen list of revisions. The summary includes commit date,
+	in the chosen list of revisions. The summary includes author date,
 	author, and the first line of the log message. Additionally, any
 	repository references, such as tags, will be shown.
 
@@ -301,11 +301,12 @@ View Switching
 |p	|Switch to pager view.
 |t	|Switch to (directory) tree view.
 |f	|Switch to (file) blob view.
-|B	|Switch to blame view.
-|H	|Switch to refs view.
+|g	|Switch to grep view.
+|b	|Switch to blame view.
+|r	|Switch to refs view.
 |y	|Switch to stash view.
 |h	|Switch to help view
-|S	|Switch to status view
+|s	|Switch to status view
 |c	|Switch to stage view
 |=============================================================================
 
@@ -384,8 +385,8 @@ Scrolling
 |Key	|Action
 |Insert	|Scroll view one line up.
 |Delete	|Scroll view one line down.
-|w	|Scroll view one page up.
-|s	|Scroll view one page down.
+|ScrBack|Scroll view one page up.
+|ScrFwd	|Scroll view one page down.
 |Left	|Scroll view one column left.
 |Right	|Scroll view one column right.
 |\|	|Scroll view to the first column.
@@ -412,16 +413,16 @@ Misc
 |=============================================================================
 |Key	|Action
 |Q	|Quit.
-|r	|Redraw screen.
+|<C-L>	|Redraw screen.
 |z	|Stop all background loading. This can be useful if you use
 	 Tig in a repository with a long history without limiting
 	 the revision log.
 |v	|Show version.
 |o	|Open option menu
-|.	|Toggle line numbers on/off.
+|#	|Toggle line numbers on/off.
 |D	|Toggle date display on/off/short/relative/local.
 |A	|Toggle author display on/off/abbreviated/email/email user name.
-|g	|Toggle revision graph visualization on/off.
+|G	|Toggle revision graph visualization on/off.
 |~	|Toggle (line) graphics mode
 |F	|Toggle reference display on/off (tag and branch names).
 |W	|Toggle ignoring whitespace on/off for diffs

doc/tig.1.adoc

@@ -16,6 +16,7 @@ tig log    [options] [revisions] [--] [paths]
 tig show   [options] [revisions] [--] [paths]
 tig blame  [options] [rev] [--] path
 tig grep   [options] [pattern]
+tig refs
 tig stash
 tig status
 tig <      [Git command output]
@@ -52,6 +53,9 @@ status::
 log::
 	Start up in log view, displaying git-log(1) output.
 
+refs::
+	Start up in refs view.
+
 stash::
 	Start up in stash view.
 
@@ -167,6 +171,11 @@ Grep all files for lines containing `DEFINE_ENUM`:
 $ tig grep -p DEFINE_ENUM
 -----------------------------------------------------------------------------
 
+Show references (branches, remotes and tags):
+-----------------------------------------------------------------------------
+$ tig refs
+-----------------------------------------------------------------------------
+
 ENVIRONMENT VARIABLES
 ---------------------
 
@@ -201,6 +210,16 @@ TIG_DIFF_OPTS::
 TIG_TRACE::
 	Path for trace file where information about Git commands are logged.
 
+TIG_SCRIPT::
+	Path to script that should be executed automatically on startup. If this
+	environment variable is defined to the empty string, the script is read
+	from stdin. The script is interpreted line-by-line and can contain
+	prompt commands and key mappings.
+
+TIG_NO_DISPLAY::
+	Open Tig without rendering anything to the terminal. This force Ncurses
+	to write to /dev/null. The main use is for automated testing of Tig.
+
 FILES
 -----
 '~/.tigrc'::