tigrc: update for tig >= 2.0

diff --git a/setup.sh b/setup.sh
index c2b3bb991526a65ae78e7058ef11729cc0a69d46..0f93a8c9864eb33b4849d8d032503d1a1dd36874 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -55,7 +55,11 @@ if installed git; then
 fi
 
 if installed tig; then
-    link tigrc ~/.tigrc
+    if tig --version | grep -F 'tig version 1.' >/dev/null; then
+        link tigrc.old ~/.tigrc
+    else
+        link tigrc ~/.tigrc
+    fi
 fi
 
 if installed hg; then

diff --git a/tigrc b/tigrc
index aa74de13e13dc22a7a4cc84a87b7b01c559e8850..273d382bc6db7a910399413ec1c5369027d9dcc0 100644 (file)
--- a/tigrc
+++ b/tigrc
@@ -1,6 +1,6 @@
 # tig configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,16 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# Show the revision graph like gitk does.
-set show-rev-graph = yes
-
-# Use relative dates.
-set show-date = relative
-
 # Don't display uncommitted changes.
 set show-changes = no
 
 
+# DISPLAY
+
+# Same as the default, but use relative dates.
+set main-view = date:relative author:full commit-title:yes,graph,refs
+
+
 # BINDINGS
 
 # Allow moving in the main menu while displaying a diff in the bottom of the
@@ -39,7 +39,6 @@ bind generic * move-last-line
 
 # Close current view like in mutt.
 bind diff i view-close
-
 # Unbind unnecessary views. I only use the main view and view diffs of
 # commits.
 bind generic m none
@@ -47,20 +46,16 @@ bind generic d none
 bind generic l none
 bind generic t none
 bind generic f none
-bind generic B none
-bind generic H none
-bind generic p none
+bind generic b none
+bind generic r none
+bind generic s none
 bind generic S none
 bind generic c none
+bind generic y none
+bind generic g none
+bind generic p none
 # Unbind commands which may change the repository. I use tig only as a viewer.
-bind generic C none
-bind generic u none
-bind generic ! none
-bind generic M none
-bind generic 1 none
-bind generic @ none
-bind generic e none
-bind generic G none
+bind main C none
 
 
 # COLORS
@@ -72,7 +67,7 @@ color delimiter default default # ~ if text is too long
 
 # Main window.
 color cursor         black   cyan         # currently selected line
-color main-author    default default      # just 'author' in newer versions
+color author         default default
 color main-head      green   default bold # HEAD
 color main-ref       green   default      # branches
 color main-remote    yellow  default      # remote branches
@@ -80,17 +75,17 @@ color main-tag       yellow  default bold # tags
 color main-local-tag yellow  default bold # local tags (normal tags)
 
 # Information at the top of the commit diff.
-color commit    default default
-color pp-author default default
-color pp-commit default default
-color pp-merge  default default
-color pp-date   default default
-color pp-adate  default default
-color pp-cdate  default default
-color pp-refs   default default
+color commit                default default
+color "Author: "            default default
+color "Commit: "            default default
+color pp-merge              default default
+color "Date: "              default default
+color "AuthorDate: "        default default
+color "CommitDate: "        default default
+color pp-refs               default default
 # Special parts of the commit message.
-color signoff   default default
-color acked     default default
+color "    Signed-off-by"   default default
+color "    Acked-by"        default default
 
 # Diff coloring.
 color diff-header default default bold # diff --git a/.. b/..

diff --git a/tigrc.old b/tigrc.old
new file mode 100644 (file)
index 0000000..aa74de1
--- /dev/null
+++ b/tigrc.old
@@ -0,0 +1,100 @@
+# tig configuration file.
+
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Show the revision graph like gitk does.
+set show-rev-graph = yes
+
+# Use relative dates.
+set show-date = relative
+
+# Don't display uncommitted changes.
+set show-changes = no
+
+
+# BINDINGS
+
+# Allow moving in the main menu while displaying a diff in the bottom of the
+# screen.
+bind generic J next
+bind generic K previous
+
+# Mutt like bindings to move to first and last line.
+bind generic = move-first-line
+bind generic * move-last-line
+
+# Close current view like in mutt.
+bind diff i view-close
+
+# Unbind unnecessary views. I only use the main view and view diffs of
+# commits.
+bind generic m none
+bind generic d none
+bind generic l none
+bind generic t none
+bind generic f none
+bind generic B none
+bind generic H none
+bind generic p none
+bind generic S none
+bind generic c none
+# Unbind commands which may change the repository. I use tig only as a viewer.
+bind generic C none
+bind generic u none
+bind generic ! none
+bind generic M none
+bind generic 1 none
+bind generic @ none
+bind generic e none
+bind generic G none
+
+
+# COLORS
+
+# Try to mimic gitk's colors.
+
+color date      default default
+color delimiter default default # ~ if text is too long
+
+# Main window.
+color cursor         black   cyan         # currently selected line
+color main-author    default default      # just 'author' in newer versions
+color main-head      green   default bold # HEAD
+color main-ref       green   default      # branches
+color main-remote    yellow  default      # remote branches
+color main-tag       yellow  default bold # tags
+color main-local-tag yellow  default bold # local tags (normal tags)
+
+# Information at the top of the commit diff.
+color commit    default default
+color pp-author default default
+color pp-commit default default
+color pp-merge  default default
+color pp-date   default default
+color pp-adate  default default
+color pp-cdate  default default
+color pp-refs   default default
+# Special parts of the commit message.
+color signoff   default default
+color acked     default default
+
+# Diff coloring.
+color diff-header default default bold # diff --git a/.. b/..
+color diff-index  default default bold # index abc..def
+color diff-chunk  cyan    default      # @@ -.. +.. @@
+
+# vim: ft=muttrc