From f2c6086838bcdf795c3322c27d78a6bfc49c9d4b Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 13 Jun 2018 12:27:30 +0200 Subject: [PATCH] vcs: remove support for tig < 2.0 Even jessie (oldstable) has tig 2.0, so remove this unnecessary duplication. --- vcs/setup.sh | 6 +-- vcs/tigrc.old | 104 -------------------------------------------------- 2 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 vcs/tigrc.old diff --git a/vcs/setup.sh b/vcs/setup.sh index bf22f99..664f938 100755 --- a/vcs/setup.sh +++ b/vcs/setup.sh @@ -54,11 +54,7 @@ if installed git; then fi if installed tig; then - if tig --version | grep -F 'tig version 1.' >/dev/null; then - link tigrc.old ~/.tigrc - else - link tigrc ~/.tigrc - fi + link tigrc ~/.tigrc fi if installed hg; then diff --git a/vcs/tigrc.old b/vcs/tigrc.old deleted file mode 100644 index 8824257..0000000 --- a/vcs/tigrc.old +++ /dev/null @@ -1,104 +0,0 @@ -# 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 . - - -# 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 - -# Ignore case when searching. -set ignore-case = yes - - -# 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 graph-commit magenta default # commit dots in graph -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 -- 2.43.2