Jonas Fonseca [Sun, 16 Mar 2008 20:26:56 +0000 (21:26 +0100)]
Make it possible to overwrite the default (terminal) colors
Use the setting of the "default" color pair to set the default colors of
the terminal via assume_default_colors(). Fall back to white on black.
With this it is possible to no longer use the terminal colors if
desired.
This was requested by Sebastian Harl as a way to fix Debian bug 399884.
Jonas Fonseca [Wed, 6 Feb 2008 10:07:58 +0000 (11:07 +0100)]
Add support for showing boundary commits in the main view
The boundary commits are marked using a "^" character, which hopefully
is somewhat intuitive and familiar since git revision specification uses
it as its cut-off prefix.
Jonas Fonseca [Wed, 6 Feb 2008 02:30:23 +0000 (03:30 +0100)]
Drop -B from diff options
My main motivation is a recent (almost) rewrite where I actually wanted
to see a "real" diff instead of a rewrite diff.
Jonas Fonseca [Tue, 5 Feb 2008 14:21:14 +0000 (15:21 +0100)]
Simplify documentation building and fix asciidoc.conf dependency
Jonas Fonseca [Tue, 5 Feb 2008 12:56:00 +0000 (13:56 +0100)]
Replace the manpage XSL workarounds with AsciiDoc conf workarounds
This is a lot simpler and generates better manpages (with the required
documentation tools). The XSL stuff was a nightmarish adventure, anyway.
Of course this probably breaks documentation building on some systems.
Jonas Fonseca [Tue, 5 Feb 2008 12:53:38 +0000 (13:53 +0100)]
INSTALL: Document the optional documentation tools
Jonas Fonseca [Tue, 5 Feb 2008 12:50:51 +0000 (13:50 +0100)]
Update manpages to not contain contain so many formatting workarounds
... like indentation. However, the '.git/config' thing no longer works.
Dominik Vogt [Thu, 27 Dec 2007 12:44:33 +0000 (13:44 +0100)]
Added examples to tig(1) manpage
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Tue, 5 Feb 2008 11:17:17 +0000 (12:17 +0100)]
TODO: Mention tig.c splitting and revgraph rewrite
Jonas Fonseca [Tue, 5 Feb 2008 10:59:22 +0000 (11:59 +0100)]
Install manpages in $(prefix)/share/man
... instead of just $(prefix)/man. This location is also used by git.
Dominik Vogt [Thu, 27 Dec 2007 09:38:36 +0000 (10:38 +0100)]
Updated .gitignore
[ Also ignore XML files. ]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Thu, 27 Dec 2007 09:17:21 +0000 (10:17 +0100)]
Removed trailing whitespace.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Thu, 1 Nov 2007 09:30:20 +0000 (10:30 +0100)]
Added action tree-parent and bound it to backspace by default.
This allow to leave the current directory in the tree view and change to
the parent tree / directory. At the top of the tree, this closes the tree
view. Bound to ',' by default.
Example:
bind tree Left tree-parent
bind tree Right Enter
bind blob Left view-close
This allows to navigate the tree and blob views just with the cursor keys.
[ Cleanup the patch a bit and mention the default keybinding in
manual.txt --jonas ]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Mon, 29 Oct 2007 13:35:36 +0000 (14:35 +0100)]
Added color option main-revgraph to color the revision graph.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Mon, 29 Oct 2007 13:35:35 +0000 (14:35 +0100)]
Add documentation for undocumented color options.
pp-refs
tree-dir, tree-file
stat-section, stat-none, stat-staged, stat-unstaged, stat-untracked
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Mon, 29 Oct 2007 13:35:35 +0000 (14:35 +0100)]
Minor formatting and spelling fixes.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Thu, 18 Oct 2007 19:33:21 +0000 (21:33 +0200)]
Ignore HTML files in general
Jonas Fonseca [Thu, 18 Oct 2007 19:32:06 +0000 (21:32 +0200)]
manual: remove section on porcelains
People should already know git and Cogito is being phased out.
Jari Aalto [Thu, 18 Oct 2007 18:35:12 +0000 (21:35 +0300)]
Makefile: add ASCIIDOC_FLAGS
... so that under Cygwin it can be set to --unsafe, in order for
asciidoc to work.
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Thu, 18 Oct 2007 19:26:05 +0000 (21:26 +0200)]
Avoid using git-diff since it might run external diff drivers
Relying only on the diff plumbing seems to be the safer thing to do.
Jonas Fonseca [Sat, 13 Oct 2007 14:56:37 +0000 (16:56 +0200)]
Use --no-color option when calling git-log and git-diff
This fixes problems when user has set color.diff=true. The problem was
first reported for gitk on the git mailing list.
Jonas Fonseca [Sat, 13 Oct 2007 13:52:23 +0000 (15:52 +0200)]
Rearrange the order of option parsing
Jonas Fonseca [Wed, 10 Oct 2007 14:49:28 +0000 (16:49 +0200)]
Fix crash when opening mergetool for lines that are not unmerged
Jonas Fonseca [Tue, 9 Oct 2007 00:43:01 +0000 (02:43 +0200)]
Use get_key_name() in get_key()
It was factored out in the external command patch.
James Bowes [Tue, 9 Oct 2007 00:35:36 +0000 (02:35 +0200)]
Add missing = for comparison in obsolete actions check
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Sun, 7 Oct 2007 09:53:21 +0000 (11:53 +0200)]
Collect remaining string in last entry when parsing config file lines
This raises the length of external commands to what fits in the command
buffer (1024 characters).
Jonas Fonseca [Sat, 6 Oct 2007 22:38:53 +0000 (00:38 +0200)]
Improve sanity check error messages
Jonas Fonseca [Sat, 6 Oct 2007 22:32:54 +0000 (00:32 +0200)]
Obsolete the cherry-pick action and define as builtin external command
Jonas Fonseca [Sat, 6 Oct 2007 21:49:23 +0000 (23:49 +0200)]
Add support binding keys to running external commands
Each command can have replacement string such as %(commit), %(head), and
%(blob), which are substituted before the command is run.
Jonas Fonseca [Sat, 6 Oct 2007 18:22:56 +0000 (20:22 +0200)]
Unify REQ_NONE and REQ_UNKNOWN by moving REQ_NONE to be the last request
Jonas Fonseca [Sat, 29 Sep 2007 21:23:28 +0000 (23:23 +0200)]
tig-0.10.git
Jonas Fonseca [Sat, 29 Sep 2007 21:13:04 +0000 (23:13 +0200)]
tig-0.9.1
Jonas Fonseca [Sat, 29 Sep 2007 16:15:46 +0000 (18:15 +0200)]
SITES: 'Tarballs' is a bit more telling than 'Releases'
Jonas Fonseca [Sat, 29 Sep 2007 01:43:23 +0000 (03:43 +0200)]
Cleanup status_request to make it reload the status view by default
Jonas Fonseca [Sat, 29 Sep 2007 01:36:24 +0000 (03:36 +0200)]
Add support for launching git-mergetool from the status view
Unmerged entries now suggests to press M to resolve merge conflicts.
Unmerged entries are no longer shown for the "staged changes"; the same
goes for 'M'odified entries following an 'U'nmerged entry.
Jonas Fonseca [Fri, 28 Sep 2007 15:59:47 +0000 (17:59 +0200)]
Refactor code to open_external_viewer
This way there is only one place calling system. In addition, files
opened in an editor will now wait for the user to press Enter to
continue. Whether this is good or bad can be discussed but it feels more
consistent and could help the user spot any errors printed by the
editor.
Jonas Fonseca [Fri, 28 Sep 2007 15:52:40 +0000 (17:52 +0200)]
Detect working trees and disable the status view when it is missing
In the process, make any call to report() before a view has been
set end up in die() to avoid problems with uninitialized views.
Jonas Fonseca [Thu, 27 Sep 2007 13:19:22 +0000 (15:19 +0200)]
Document the refresh request
Jonas Fonseca [Thu, 27 Sep 2007 02:12:55 +0000 (04:12 +0200)]
Ignore REQ_NONE in the help view and improve unbound request handling
Jonas Fonseca [Wed, 26 Sep 2007 23:28:35 +0000 (01:28 +0200)]
Never put the release number in the tarball name for tagged versions
... when the version is given using DIST_VERSION!
Jonas Fonseca [Wed, 26 Sep 2007 23:27:50 +0000 (01:27 +0200)]
Also ignore generated .md5 files for tarballs
Jonas Fonseca [Tue, 25 Sep 2007 10:15:22 +0000 (12:15 +0200)]
Add support for refreshing/reloading the status view
... and also refresh it after edits to capture any changes in the
working tree.
Jonas Fonseca [Sun, 23 Sep 2007 21:51:41 +0000 (23:51 +0200)]
Remove unused 'view' argument from open_editor
Jonas Fonseca [Sun, 23 Sep 2007 21:43:08 +0000 (23:43 +0200)]
Include autoconf file for 'make dist'
Jonas Fonseca [Sun, 23 Sep 2007 21:05:40 +0000 (23:05 +0200)]
Fix the clean rule to never remove generated doc files
... this is now done by new distclean rule, which will also
purge autoconf files.
Jonas Fonseca [Sun, 23 Sep 2007 21:00:45 +0000 (23:00 +0200)]
Fix out-of-range lineno when reloading the status view
Reproducable when standing on the last line of the status view with no
staged files and pressing 'u' twice. The first will make the current
line point outside the range of lines in the view, making the second
update read garbage memory and calling die because of an unknown status
line ID.
Restore previous line number if possible else move make the current
line index be that of the last line in the updated view.
Jonas Fonseca [Wed, 19 Sep 2007 00:50:12 +0000 (02:50 +0200)]
Fix open_editor to make the file path relative to the project root
.. by prefixing the file path with opt_cdup if requested.
Jonas Fonseca [Mon, 17 Sep 2007 23:52:02 +0000 (01:52 +0200)]
Handle REQ_NONE upfront in view_driver
It is very common during loading from pipe so deserves the small
optimization.
Jonas Fonseca [Mon, 17 Sep 2007 23:38:42 +0000 (01:38 +0200)]
Support cherry-picking commits in main view to current branch
Bound to 'C' by default. Idea by krh on #git.
Jonas Fonseca [Fri, 14 Sep 2007 13:57:42 +0000 (15:57 +0200)]
Oops, always ensure that ICONV_CONST is defined
Jonas Fonseca [Fri, 14 Sep 2007 12:46:00 +0000 (14:46 +0200)]
Use the more advanced iconv.m4 script from ELinks
Jonas Fonseca [Fri, 14 Sep 2007 12:51:15 +0000 (14:51 +0200)]
tig-0.9.1.git
Jonas Fonseca [Thu, 13 Sep 2007 09:10:58 +0000 (11:10 +0200)]
tig-0.9
Jonas Fonseca [Thu, 13 Sep 2007 09:07:45 +0000 (11:07 +0200)]
Change the default styles for the status view
It now uses cyan for the section headers. Mentioned by Miciah.
Jonas Fonseca [Thu, 13 Sep 2007 09:06:36 +0000 (11:06 +0200)]
Update documentation
... to list search option in tigrc and mention the stage view
in the manual.
Jonas Fonseca [Thu, 23 Aug 2007 09:18:29 +0000 (11:18 +0200)]
Force adding of doc files in the release-doc rule
Horst H. von Brand [Thu, 23 Aug 2007 09:15:50 +0000 (11:15 +0200)]
Fix INSTALL
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Update Makefile to also use autoreconf for `make configure`.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Wed, 22 Aug 2007 17:41:12 +0000 (19:41 +0200)]
Build intermediate tig.o file to fix tig dependency on config.h
Jonas Fonseca [Wed, 22 Aug 2007 17:38:00 +0000 (19:38 +0200)]
Ensure ICONV_INBUF_TYPE is always defined; fix GIT_CONFIG define
Jonas Fonseca [Wed, 22 Aug 2007 17:36:00 +0000 (19:36 +0200)]
Guard config.h include with HAVE_CONFIG_H
... and add -DHAVE_CONFIG_H to CPPFLAGS in config.make.in.
Jonas Fonseca [Wed, 22 Aug 2007 17:33:40 +0000 (19:33 +0200)]
Define TIG_VERSION as intended when autoconf was introduced
Jonas Fonseca [Wed, 22 Aug 2007 09:31:19 +0000 (11:31 +0200)]
Change last commit to make tig depend on config.h
Jonas Fonseca [Wed, 22 Aug 2007 09:29:40 +0000 (11:29 +0200)]
Make tig.c depend on config.h when using configure
Jonas Fonseca [Wed, 22 Aug 2007 09:27:52 +0000 (11:27 +0200)]
Add CC to the list of expanded symbols by configure
Also rearrange the list a bit.
Jonas Fonseca [Wed, 22 Aug 2007 09:18:16 +0000 (11:18 +0200)]
Allow LDLIBS to be overriden by configure
Jonas Fonseca [Wed, 22 Aug 2007 09:16:05 +0000 (11:16 +0200)]
Fix warning from blob_read returning pointer instead of bool
Jonas Fonseca [Tue, 21 Aug 2007 23:36:58 +0000 (01:36 +0200)]
stage: add request handler supporting file edits and chunk staging
This adds and interface (idea from git-gui) allowing a diff chunk to be
staged/unstaged for the next commit. It should also make it more
pleasant to make status updates when in the stage view.
Jonas Fonseca [Tue, 21 Aug 2007 11:43:53 +0000 (13:43 +0200)]
Add stage view, which is used for showing status changes
Jonas Fonseca [Mon, 20 Aug 2007 21:12:46 +0000 (23:12 +0200)]
autoconf: check for the AsciiDoc and XmlTo document tools
Jonas Fonseca [Mon, 20 Aug 2007 21:03:21 +0000 (23:03 +0200)]
autoconf: check whether to use git-config or git-repo-config
Steven Grimm [Mon, 20 Aug 2007 20:49:05 +0000 (22:49 +0200)]
Add autoconf-based build infrastructure for tig
This is a first cut at building tig using autoconf. With this patch, tig
configures and builds on both Linux (FC4) and OS X.
Signed-off-by: Steven Grimm <koreth@midwinter.com>
Reworked to not use aclocal+automake and external scripts for
bootstrapping. Instead, run `make configure` to generate the configure
script. It will create a config.make file from config.make.in, which
contains variables set by the configure script. Update .gitignore to
list generated files.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Tue, 21 Aug 2007 00:37:10 +0000 (02:37 +0200)]
tree: use simple stack to remember the previous subtree line numbers
Jonas Fonseca [Mon, 20 Aug 2007 22:35:32 +0000 (00:35 +0200)]
Only show the command being loaded from for the pager view
This feature was introduced in
035ba11f40c0a045989ed861e72327012af022b4.
Jonas Fonseca [Mon, 20 Aug 2007 21:49:47 +0000 (23:49 +0200)]
TODO: tig now has a status view
Jonas Fonseca [Sun, 19 Aug 2007 09:31:03 +0000 (11:31 +0200)]
Make it possible to browse all status changes once the diff view is open
Jonas Fonseca [Sun, 19 Aug 2007 09:02:21 +0000 (11:02 +0200)]
Fix handling of REQ_NEXT/REQ_PREVIOUS
The special browsing of the main view was broken by commit
586c423dd99238a85c556df86e043dcfacffe277, when the REQ_ENTER
case was removed.
Jonas Fonseca [Sun, 19 Aug 2007 08:44:39 +0000 (10:44 +0200)]
Fix updating of the view title to show the current position in the view
It regressed in
11359638c5dfc91b4b14a003a0519b2a5bc7f89d.
Jonas Fonseca [Sat, 18 Aug 2007 17:12:47 +0000 (19:12 +0200)]
Warn about nothing to enter if REQ_ENTER reaches the view_driver switch
Jonas Fonseca [Sat, 18 Aug 2007 15:45:49 +0000 (17:45 +0200)]
status: implement support for opening files in editor
Jonas Fonseca [Sat, 18 Aug 2007 12:43:39 +0000 (14:43 +0200)]
status: cleanup status_request by resurrection status_enter
Jonas Fonseca [Sat, 18 Aug 2007 01:14:52 +0000 (03:14 +0200)]
status: "wire" REQ_STATUS_UPDATE handling through status_request
Jonas Fonseca [Sat, 18 Aug 2007 01:07:23 +0000 (03:07 +0200)]
Add view request operation for handling view specific requests
For now <view>_enter is replaced with <view>_request.
Jonas Fonseca [Fri, 17 Aug 2007 22:16:49 +0000 (00:16 +0200)]
status: fix switching to the main view when starting in status view
Jonas Fonseca [Fri, 17 Aug 2007 22:14:12 +0000 (00:14 +0200)]
status: improve title and report messages
Jonas Fonseca [Fri, 17 Aug 2007 21:59:37 +0000 (23:59 +0200)]
status: make it possible to batch updates by pressing on the section line
Jonas Fonseca [Fri, 17 Aug 2007 21:24:20 +0000 (23:24 +0200)]
status: assert that there are always view lines in the status view
Jonas Fonseca [Fri, 17 Aug 2007 20:47:33 +0000 (22:47 +0200)]
status: make it possible to see all changes for a status section
... except untracked files.
Jeff King [Fri, 10 Aug 2007 17:58:43 +0000 (19:58 +0200)]
status window: mention 'u' instead of Enter
Commits
ca1d71ea and
89d917a bound the Enter functionality
to 'u' (and Enter now shows the diff).
[ Slightly changed to use get_key(). --jonas ]
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Fri, 10 Aug 2007 13:19:41 +0000 (15:19 +0200)]
Add support for showing staged/unstaged changes and untracked files
When pressing enter on a file in the status view either a diff or the
content of the untracked file will be shown.
Jonas Fonseca [Fri, 10 Aug 2007 12:12:32 +0000 (14:12 +0200)]
Introduce status-update action bound to 'u' by default
For now this obsoletes the action triggered when pressing Enter.
Witold Filipczyk [Wed, 8 Aug 2007 12:39:22 +0000 (14:39 +0200)]
Avoid flickering when moving past the main view's first and last line
In diff mode when first or last item is displayed KEY_UP or KEY_DOWN
respectively cause flickering. I know that I should not press
those keys in that situation, but this annoys me anyway.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Tue, 3 Jul 2007 16:19:03 +0000 (18:19 +0200)]
Ignore generated HTML pages
Also ':sort u' the .gitignore file.
Brian Gernhardt [Tue, 3 Jul 2007 14:50:25 +0000 (10:50 -0400)]
Ignore generated manpages.
Adds tig.1 and tigrc.5 to .gitignore
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Sat, 23 Jun 2007 09:37:17 +0000 (11:37 +0200)]
Include the tig bash completion script as documentation
Jonas Fonseca [Sat, 23 Jun 2007 09:34:57 +0000 (11:34 +0200)]
Rename contrib/tig-completion.sh to contrib/tig-completion.bash
Jonas Fonseca [Sat, 23 Jun 2007 09:33:45 +0000 (11:33 +0200)]
Fix a few typos in the bash completion
Jakub Narebski [Fri, 22 Jun 2007 21:39:42 +0000 (23:39 +0200)]
Simplify naming (versioning) of non-release tig tarball and rpm file
Use the tag part of git-describe output, with `tig-' prefix stripped
off, as version number. Use number of commits since given tag as
release number, using 0 if we are at tagged version, and adding
'.dirty' suffix if working directory is dirty. Do not use 'g<sha 1>'
part of git-describe output.
For example, when git-describe output was
tig-0.7-8-g26d0386, before
this commit tarball was named tig-0.7.8.g26d0386.tar.gz and rpm was
named tig-0.7.8.g26d0386-1.src.rpm (for dirty tree tarball was
tig-0.7.8.g26d0386.dirty.tar.gz), now tarball is named
tig-0.7-8.tar.gz and rpm is named tig-0.7-8.src.rpm (for dirty tree
tarball is tig-0.7-8.dirty.tar.gz).
[ Simplify the version extraction a bit. --jonas ]
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Fri, 22 Jun 2007 15:06:15 +0000 (17:06 +0200)]
Move tig.spec.in to the contrib area
Jonas Fonseca [Fri, 22 Jun 2007 15:04:45 +0000 (17:04 +0200)]
Move tigrc to the contrib area
Jonas Fonseca [Fri, 22 Jun 2007 15:01:24 +0000 (17:01 +0200)]
Add tig bash completion script
Based on git-completion.sh by Shawn Pearce.