SOURCES: tig-git.patch - up
adamg
adamg at pld-linux.org
Thu Oct 16 10:03:35 CEST 2008
Author: adamg Date: Thu Oct 16 08:03:35 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up
---- Files affected:
SOURCES:
tig-git.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/tig-git.patch
diff -u SOURCES/tig-git.patch:1.4 SOURCES/tig-git.patch:1.5
--- SOURCES/tig-git.patch:1.4 Mon Sep 1 00:19:40 2008
+++ SOURCES/tig-git.patch Thu Oct 16 10:03:29 2008
@@ -1,1701 +1,1038 @@
-diff --git a/INSTALL b/INSTALL
-index 85662a3..3f6ff92 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -23,6 +23,10 @@ need to first make the configure script:
-
- $ make configure
-
-+Release notes documenting notable changes are available in the NEWS file. When
-+upgrading, you are adviced to also read them after you have completed the
-+installation.
-+
- The following tools and packages are needed:
-
- `-------------------------------`----------------------------------------------
-diff --git a/Makefile b/Makefile
-index 575c5bf..1107f95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ CFLAGS ?= -Wall -O2
- DFLAGS = -g -DDEBUG -Werror
- PROGS = tig
- MANDOC = tig.1 tigrc.5
--HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
-+HTMLDOC = tig.1.html tigrc.5.html manual.html README.html NEWS.html
- ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
-
- # Never include the release number in the tarname for tagged
-@@ -99,8 +99,9 @@ clean:
- $(RM) $(PROGS) core *.o *.xml
-
- distclean: clean
-- $(RM) -r manual.html-chunked *.toc $(ALLDOC)
-- $(RM) -r autom4te.cache aclocal.m4 config.{h,log,make,status} config.h.in configure
-+ $(RM) -r manual.html-chunked autom4te.cache
-+ $(RM) *.toc $(ALLDOC) aclocal.m4 configure
-+ $(RM) config.h config.log config.make config.status config.h.in
-
- spell-check:
- aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
-@@ -162,6 +163,9 @@ manual.toc: manual.txt
- README.html: README asciidoc.conf
- $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -a readme $<
-
-+NEWS.html: NEWS asciidoc.conf
-+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article $<
-+
- %.1.html : %.1.txt asciidoc.conf
- $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
-
diff --git a/NEWS b/NEWS
-new file mode 100644
-index 0000000..d93fb04
---- /dev/null
+index 7e219af..a0f75c6 100644
+--- a/NEWS
+++ b/NEWS
-@@ -0,0 +1,159 @@
-+Release notes
-+=============
-+
-+tig master branch
-+-----------------
+@@ -1,6 +1,21 @@
+ Release notes
+ =============
+
++tig master
++----------
+
+Improvements:
+
-+ - F5 also refreshes the current view.
-+ - Allow line graphics to be disabled with new line-graphics option.
-+ - Main view: also include the reference names when searching.
-+ - Stage view: add stage-next action to jump to next diff chunk that can
-+ be staged. By default bound to '@'.
-+ - Configure: check for the ncurses header files.
-+ - Add author-width option to costumize the width of the author column.
-+ For example, put the following in ~/.tigrc: set author-width = 10
++ - Display repository references in the sorted order: tags, heads,
++ tracked remotes, remotes.
++ - Add bash completion for blame.
+
+Bug fixes:
+
-+ - Fix regression when staging all diff chunks in a section.
-+ - Bind the maximize view action to 'O'; it conflicted with the
-+ keybinding to launch the merge tool in the status view.
-+ - Fix problem with $(cmd) usage in shell code. Some shells (jsh)
-+ installed as /bin/sh does not support it.
-+ - Do not show incomplete boundary commits when --no-walk is used.
-+ - Documentation: Rename gitlink macro to support AsciiDoc 8.2.3.
-+
-+tig-0.11
-+--------
-+
-+Incompatibilities:
-+
-+ - Remove parsing of deprecated options: -g, -l, -d.
-+ - The first seen '--' will stop option parsing and is passed to git
-+ instead of breaking out of tig's option parsing.
-+
-+New features:
-+
-+ - Blame view; bound to 'B' by default, reachable from the command line
-+ and the tree, status, and stage views.
-+ - Blame/main view: allow display of date, author, and references to be
-+ toggled on/off. Bound to 'D', 'A', and 'F' respectively.
-+ - Add action to maximize the current view.
++ - Separate blame revision and file argument by "--" to avoid problems.
++ - Main view: fix redrawing of the last commit wrt. the revision graph.
++ - Fix waiting for input after executing a run request in pager mode.
++
+ tig-0.12.1
+ ----------
+
+diff --git a/contrib/tig-completion.bash b/contrib/tig-completion.bash
+index 79b414b..40bfcfa 100755
+--- a/contrib/tig-completion.bash
++++ b/contrib/tig-completion.bash
+@@ -182,6 +182,26 @@ _tig_options ()
+ __tig_complete_revlist
+ }
+
++_tig_blame ()
++{
++ local reply="" ref=HEAD cur="${COMP_WORDS[COMP_CWORD]}"
+
-+Improvements:
++ if test "$COMP_CWORD" -lt 3; then
++ reply="$(__tig_refs)"
++ else
++ ref="${COMP_WORDS[2]}"
++ fi
+
-+ - Show the current branch in the status view.
-+ - Show local/light-weight tags.
++ reply="$reply $(git --git-dir="$(__tigdir)" ls-tree "$ref" \
++ | sed '/^100... blob /s,^.* ,,
++ /^040000 tree /{
++ s,^.* ,,
++ s,$,/,
++ }
++ s/^.* //')"
++ _tigcomp "$reply"
++}
+
-+Bug fixes:
+ _tig_show ()
+ {
+ local cur="${COMP_WORDS[COMP_CWORD]}"
+@@ -218,12 +238,13 @@ _tig ()
+ case "${COMP_WORDS[COMP_CWORD]}" in
+ --*=*) COMPREPLY=() ;;
+ -*) _tig_options ;;
+- *) _tigcomp "status show $(__tig_refs)" ;;
++ *) _tigcomp "blame status show $(__tig_refs)" ;;
+ esac
+ return
+ fi
+
+ case "$command" in
++ blame) _tig_blame ;;
+ show) _tig_show ;;
+ status) ;;
+ *) _tigcomp "
+diff --git a/manual.txt b/manual.txt
+index f11b77a..447dec0 100644
+--- a/manual.txt
++++ b/manual.txt
+@@ -44,7 +44,7 @@ given command and all will be shell quoted before they are passed to the
+ shell.
+
+ NOTE: If you specify options for the main view, you should not use the
+-`--pretty` option as this option will be set automatically to the format
++`\--pretty` option as this option will be set automatically to the format
+ expected by the main view.
+
+ Example on how to view a commit and show both author and committer
+@@ -54,100 +54,10 @@ information:
+ $ tig show --pretty=fuller
+ -----------------------------------------------------------------------------
+
+-See the <<refspec, "Specifying revisions">> section below for an introduction
+-to revision options supported by the git commands. For details on specific git
++See the section on <<refspec, specifying revisions>> for an introduction to
++revision options supported by the git commands. For details on specific git
+ command options, refer to the man page of the command in question.
+
+-[[env-variables]]
+-Environment Variables
+----------------------
+-
+-Several options related to the interface with git can be configured via
+-environment options.
+-
+-[[configuration-files]]
+-Configuration Files
+-~~~~~~~~~~~~~~~~~~~
+-
+-Upon startup, tig first reads the system wide configuration file
+-(`{sysconfdir}/tigrc` by default) and then proceeds to read the user's
+-configuration file (`~/.tigrc` by default). The paths to either of these files
+-can be overridden through the following environment variables:
+-
+-TIGRC_USER::
+- Path of the user configuration file.
+-
+-TIGRC_SYSTEM::
+- Path of the system wide configuration file.
+-
+-[[repo-refs]]
+-Repository References
+-~~~~~~~~~~~~~~~~~~~~~
+-
+-Commits that are referenced by tags and branch heads will be marked by the
+-reference name surrounded by '[' and ']':
+-
+------------------------------------------------------------------------------
+-2006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
+------------------------------------------------------------------------------
+-
+-If you want to filter out certain directories under `.git/refs/`, say `tmp`
+-you can do it by setting the following variable:
+-
+------------------------------------------------------------------------------
+-$ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig
+------------------------------------------------------------------------------
+-
+-Or set the variable permanently in your environment.
+-
+-TIG_LS_REMOTE::
+- Set command for retrieving all repository references. The command
+- should output data in the same format as git-ls-remote(1).
+-
+-[[history-commands]]
+-History Commands
+-~~~~~~~~~~~~~~~~
+-
+-It is possible to alter which commands are used for the different views. If
+-for example you prefer commits in the main view to be sorted by date and only
+-show 500 commits, use:
+-
+------------------------------------------------------------------------------
+-$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
+------------------------------------------------------------------------------
+-
+-Or set the variable permanently in your environment.
+-
+-Notice, how `%s` is used to specify the commit reference. There can be a
+-maximum of 5 `%s` ref specifications.
+-
+-TIG_DIFF_CMD::
+- The command used for the diff view. By default, git show is used
+- as a backend.
+-
+-TIG_LOG_CMD::
+- The command used for the log view. If you prefer to have both
+- author and committer shown in the log view be sure to pass
+- `--pretty=fuller` to git log.
+-
+-TIG_MAIN_CMD::
+- The command used for the main view. Note, you must always specify
+- the option: `--pretty=raw` since the main view parser expects to
+- read that format.
+-
+-[[tree-commands]]
+-Tree Commands
+-~~~~~~~~~~~~~
+-
+-TIG_TREE_CMD::
+- The command used for the tree view. Takes two arguments, the first
+- is the revision ID and the second is the path of the directory tree,
+- empty for the root directory. Defaults to "git ls-tree %s %s".
+-
+-TIG_BLOB_CMD::
+- The command used for the blob view. Takes one argument which is
+- the blob ID. Defaults to "git cat-file blob %s".
+-
+ [[viewer]]
+ The Viewer
+ ----------
+@@ -167,18 +77,6 @@ You will split the view so that the log view is displayed in the top window
+ and the diff view in the bottom window. You can switch between the two views
+ by pressing 'Tab'. To maximize the log view again, simply press 'l'.
+
+-[[commit-id]]
+-Current Head and Commit ID
+-~~~~~~~~~~~~~~~~~~~~~~~~~~
+-
+-The viewer keeps track of both what head and commit ID you are currently
+-viewing. The commit ID will follow the cursor line and change every time
+-you highlight a different commit. Whenever you reopen the diff view it will be
+-reloaded, if the commit ID changed.
+-
+-The head ID is used when opening the main and log view to indicate from what
+-revision to show history.
+-
+ [[views]]
+ Views
+ ~~~~~
+@@ -226,7 +124,30 @@ The pager view::
+ commands entered in the internal prompt.
+
+ The help view::
+- Displays key binding quick reference.
++ Displays a quick reference of key bindings.
++
++[[commit-id]]
++Browsing State and User-defined Commands
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++The viewer keeps track of both what head and commit ID you are currently
++viewing. The commit ID will follow the cursor line and change every time you
++highlight a different commit. Whenever you reopen the diff view it will be
++reloaded, if the commit ID changed. The head ID is used when opening the main
++and log view to indicate from what revision to show history.
++
++Some of the commands used or provided by tig can be configured. This goes for
++the <<external-commands, external commands>>. These user-defined commands can
++use arguments that refer to the current browsing state by using one of the
++following variables.
++
++`-----------------------`-----------------------------------------------------
++Browsing state variables
++------------------------------------------------------------------------------
++%(head) The currently viewed 'head' ID. Defaults to HEAD
++%(commit) The currently selected commit ID.
++%(blob) The currently selected blob ID.
++------------------------------------------------------------------------------
+
+ [[title-window]]
+ Title Windows
+@@ -247,6 +168,134 @@ be appended:
+ [main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
+ -----------------------------------------------------------------------------
+
++[[env-variables]]
++Environment Variables
++---------------------
+
-+ - Fix regressions for the pager mode.
-+ - Fix refreshing of the index with working directory info.
++Several options related to the interface with git can be configured via
++environment options.
+
-+tig-0.10.1
-+----------
++[[configuration-files]]
++Configuration Files
++~~~~~~~~~~~~~~~~~~~
+
-+Improvements:
++Upon startup, tig first reads the system wide configuration file
++(`{sysconfdir}/tigrc` by default) and then proceeds to read the user's
++configuration file (`~/.tigrc` by default). The paths to either of these files
++can be overridden through the following environment variables:
+
-+ - Status view: detect renamed files and show them with 'R'.
-+ - Status view: refresh the index to avoid "empty diffs".
-+ - Diff view: make diff headers more verbose to include e.g. committer.
-+ - Configure: check for the ncursesw library.
++TIGRC_USER::
++ Path of the user configuration file.
+
-+Bug fixes:
++TIGRC_SYSTEM::
++ Path of the system wide configuration file.
+
-+ - Fix UTF8 handling for tag names and commit messages.
-+ - Fix the check for git-config(1) in configure to handle the case when
-+ git has been installed using a libexecdir which is not in the path.
-+ - Fix replacing of SYSCONFDIR when installing from released tarballs.
-+
-+tig-0.10
-+---------
-+
-+Incompatibilities:
-+
-+ - Deprecate most tig specific command line options to make tig more
-+ compatible with gitk. The deprecated options are: -g, -l, -d, and -S.
-+ Use of any of them will result in a warning being printed to stderr.
-+ Instead of '-S', use the new 'status' subcommand.
-+ - Make man page building depend on DocBook XSL version >= 1.72.0.
-+ - Install man pages in $(prefix)/share/man.
-+ - Implement the cherry pick action (bound to 'C') using new support for
-+ running external commands. This obsoletes the TIG_CHEERY_PICK
-+ environment variable
-+
-+New features:
-+
-+ - Add support for binding keys to external commands. To bind '.' to
-+ running git-commit(1), add the line: "bind generic . !git commit" to
-+ your ~/.tigrc. Each command can have replacement string such as
-+ %(commit), %(head), and %(blob), which are substituted before the
-+ command is run.
-+ - Add system-wide configuration file defaulting to $(prefix)/etc/tigrc.
-+ - Add the environment variables TIGRC_USER and TIGRC_SYSTEM to change
-+ user and system-wide configuration files, respectively.
++[[repo-refs]]
++Repository References
++~~~~~~~~~~~~~~~~~~~~~
+
-+Improvements:
++Commits that are referenced by tags and branch heads will be marked by the
++reference name surrounded by '[' and ']':
+
-+ - Main view: color the revision graph.
-+ - Main view: show boundary commits; they are marked with '^' in the
-+ revision graph.
-+ - Tree view: add tree-parent action to jump to view of the parent tree.
-+ Bound to ',' by default.
-+ - Allow the default terminal colors to be overwritten. To use black
-+ text on white, add the line "color default white black" to your
-+ ~/.tigrc.
-+ - Misc. documentation improvements.
++-----------------------------------------------------------------------------
++2006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
++-----------------------------------------------------------------------------
+
-+Bug fixes:
++If you want to filter what branches gets shown, say limit to only show
++branches named `master` or which starts with the `jf/` prefix, you can
++do it by setting the following variable:
+
-+ - Use git-diff-index(1) and git-diff-files(1) instead of git-diff(1) to
-+ avoid running external diff drivers.
-+ - Use --no-color when calling git-log(1).
-+ - Fix crash when opening mergetool for lines that are not unmerged.
++-----------------------------------------------------------------------------
++$ TIG_LS_REMOTE="git ls-remote . master jf/*" tig
++-----------------------------------------------------------------------------
+
-+tig-0.9.1
-+---------
++Or set the variable permanently in your environment.
+
-+Incompatibilities:
++--
+
-+ - Make the clean rule to never remove generated documentation files.
-+ Use the distclean rule for accomplishing this.
++TIG_LS_REMOTE::
+
-+New features:
++ Set command for retrieving all repository references. The command
++ should output data in the same format as git-ls-remote(1). Defaults
++ to:
++-----------------------------------------------------------------------------
++git ls-remote .
++-----------------------------------------------------------------------------
+
-+ - Add support for cherry-picking commits in the main view to the
-+ current branch. Bound to 'C' by default.
++--
+
-+Improvements:
++[[history-commands]]
++History Commands
++~~~~~~~~~~~~~~~~
+
-+ - Add support for launching git-mergetool(1) from the status view.
-+ Bound to 'M' by default.
-+ - Add support for refreshing/reloading the status view
-+ - Detect working trees and disable the status view when it is missing.
++It is possible to alter which commands are used for the different views. If
++for example you prefer commits in the main view to be sorted by date and only
++show 500 commits, use:
+
-+Bug fixes:
++-----------------------------------------------------------------------------
++$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
++-----------------------------------------------------------------------------
+
-+ - Fix iconv() checking in configure.
-+ - Fix editor invocation to make paths relative to the project root.
-+ - Fix out-of-range current line when reloading the status view.
-+ - Include autoconf files in the tarball generated by `make dist`.
-+
-+tig-0.9
-+-------
-+
-+New features:
-+
-+ - Add bash completion script for tig (contrib/tig-completion.bash).
-+ - Add optional autoconf-based build infrastructure.
-+ - Add stage view for showing changes in the working tree and add
-+ support for staging individual diff chunks for commit.
++Or set the variable permanently in your environment.
+
-+Improvements:
++Notice, how `%s` is used to specify the commit reference. There can be a
++maximum of 5 `%s` ref specifications.
+
-+ - Status view: allow all files in a section to be staged for commit.
-+ - Status view: Add support for opening files in an editor. Bound to 'e'
-+ by default.
-+ - Tree view: use a stack for remembering the lines for parent tree.
-diff --git a/TODO b/TODO
-index 437f0d4..919734a 100644
---- a/TODO
-+++ b/TODO
-@@ -28,3 +28,6 @@ Features that should be explored.
-
- - Color the revgraph to make it easier to follow branches. Idea by
- Dominik Vogt
-+
-+ - Allow names in the author column to be abbreviated to initials.
-+ Will optimize screen usage for the blame view.
-diff --git a/asciidoc.conf b/asciidoc.conf
-index 630552c..90fdb6a 100644
---- a/asciidoc.conf
-+++ b/asciidoc.conf
-@@ -1,5 +1,5 @@
- ifdef::backend-docbook[]
--[gitlink-inlinemacro]
-+[manpage-inlinemacro]
- {0%{target}}
- {0#<citerefentry>}
- {0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
-@@ -7,7 +7,7 @@ ifdef::backend-docbook[]
- endif::backend-docbook[]
-
- ifdef::backend-xhtml11[]
--[gitlink-inlinemacro]
-+[manpage-inlinemacro]
- <a href="{target}{0?.{0}}.html">{target}{0?({0})}</a>
- endif::backend-xhtml11[]
-
-@@ -56,4 +56,7 @@ ifdef::readme[]
-
- [footer]
- </div>
-+
-+[replacements]
-+(^|[^-\\])--($|[^-])=\1--\2
- endif::readme[]
-diff --git a/configure.ac b/configure.ac
-index 764190a..6b0fc45 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,13 +1,23 @@
--AC_INIT([tig], [0],
-- [Jonas Fonseca <fonseca at diku.dk>],
-- [tig])
-+AC_INIT([tig], [0], [Jonas Fonseca <fonseca at diku.dk>], [tig])
-
- AC_LANG([C])
- AC_CONFIG_HEADER(config.h)
- AC_CONFIG_SRCDIR(tig.c)
-
--AC_SEARCH_LIBS([wclear], [ncursesw ncurses curses], [],
-- [AC_ERROR([curses not found])])
-+cursed=no
-+AC_CHECK_HEADERS([ncursesw/ncurses.h],
-+ [AC_SEARCH_LIBS([initscr], [ncursesw], [cursed=yes])])
-+case "$cursed" in "no")
-+ AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h],
-+ [AC_SEARCH_LIBS([wclear], [ncurses], [cursed=yes])])
-+
-+ case "$cursed" in "no")
-+ AC_ERROR([ncurses not found])
-+ esac
-+
-+ AC_MSG_WARN([The found ncurses library does not support wide-char.])
-+ AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
-+esac
-
- AM_ICONV
-
-@@ -26,9 +36,3 @@ AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])
-
- AC_CONFIG_FILES([config.make])
- AC_OUTPUT
--
--case "$LIBS" in
--*-lncursesw*) ;;
--*) AC_MSG_RESULT([NOTE: The found ncurses library does not support wide-char.])
-- AC_MSG_RESULT([NOTE: This means that tig will not correctly render UTF-8])
--esac
-diff --git a/manual.txt b/manual.txt
-index e4f937a..3157eb3 100644
---- a/manual.txt
-+++ b/manual.txt
-@@ -366,6 +366,7 @@ u Update status of file. In the status view, this allows you to add an \
- M Resolve unmerged file by launching git-mergetool(1). Note, to work \
- correctly this might require some initial configuration of your \
- preferred merge tool. See the manpage of git-mergetool(1).
-+@ Move to next chunk in the stage view.
- ',' Move tree view to the parent tree.
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tig-git.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list