Jonas Fonseca [Thu, 3 Apr 2008 15:02:15 +0000 (17:02 +0200)]
Share the line number colors between blame view and others
Renames the blame-lineno color to line-number.
Jonas Fonseca [Thu, 3 Apr 2008 13:47:21 +0000 (15:47 +0200)]
Rename load_repo_config() to load_git_config()
Jonas Fonseca [Thu, 3 Apr 2008 13:24:44 +0000 (15:24 +0200)]
Do not load repository references when acting as a pager
It will cause git ls-remote to print an error message.
Jonas Fonseca [Wed, 2 Apr 2008 22:01:15 +0000 (00:01 +0200)]
Merge branch 'master' of remote-server:src/tig
Jonas Fonseca [Wed, 2 Apr 2008 22:13:42 +0000 (00:13 +0200)]
status: use draw_text completely
Jonas Fonseca [Wed, 2 Apr 2008 21:59:15 +0000 (23:59 +0200)]
Make local tags and normal branches use normal font-weight
Change color of HEAD reference to use cyan as normal branches
but with bold font.
Jonas Fonseca [Wed, 2 Apr 2008 21:57:08 +0000 (23:57 +0200)]
Show the tracked remote branch with bold text
... and others with normal font-weight.
Jonas Fonseca [Wed, 2 Apr 2008 21:14:40 +0000 (23:14 +0200)]
Add draw_lineno() and use when drawing the blame and pager view
Jonas Fonseca [Wed, 2 Apr 2008 20:27:06 +0000 (22:27 +0200)]
Add action to maximize the current view; bound to M by default
Jonas Fonseca [Mon, 31 Mar 2008 17:51:22 +0000 (19:51 +0200)]
Disable opening views that require a git directory when in pager mode
Jonas Fonseca [Mon, 31 Mar 2008 17:51:02 +0000 (19:51 +0200)]
Fix pager mode by always doing the isatty()
Also relax the opt_git_dir check.
Jonas Fonseca [Mon, 31 Mar 2008 11:03:45 +0000 (13:03 +0200)]
stage: disable whitespace warnings from git apply when staging updates
Jonas Fonseca [Thu, 27 Mar 2008 19:44:23 +0000 (20:44 +0100)]
Improve perfomance and usability when updating many files
Split the update function into one for single file and all files in a
section so that only one fork of update-index is required in both cases.
Show progress for long running updates (e.g. importing the Linux kernel)
where git needs to hash many objects (>20k).
Jonas Fonseca [Thu, 27 Mar 2008 10:47:00 +0000 (11:47 +0100)]
Fix and improve status refreshing after updating
Update the view offset so the current line is already visible.
This requires that the display is split or initialized before
starting to load the view so status_open has the view->height
available.
Jonas Fonseca [Thu, 27 Mar 2008 19:20:10 +0000 (20:20 +0100)]
Fix uninitialized variable warning
Stefan Naewe [Wed, 26 Mar 2008 12:04:53 +0000 (13:04 +0100)]
Output extra \n on tig -h
The usage string does not contain a '\n' as the last character which is
annoying when calling 'tig -h'.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Wed, 26 Mar 2008 10:54:28 +0000 (11:54 +0100)]
Avoid reloading the status view when nothing was updated
Jonas Fonseca [Wed, 26 Mar 2008 10:39:26 +0000 (11:39 +0100)]
Oops, fix delimiter documentation
Jonas Fonseca [Wed, 26 Mar 2008 10:26:00 +0000 (11:26 +0100)]
Add support for preparing the initial commit in the status view
Jonas Fonseca [Wed, 26 Mar 2008 09:15:47 +0000 (10:15 +0100)]
Rename "main-delim" color to the more generic "delimiter"
It was already used by views other than main.
Jonas Fonseca [Wed, 26 Mar 2008 08:50:19 +0000 (09:50 +0100)]
Show the current branch in the status view
Also, improve the positioning of the cursor line after updates to
restore or select something that is "updateable". Adding new files
should now work more intuitively.
Jonas Fonseca [Tue, 25 Mar 2008 20:43:38 +0000 (21:43 +0100)]
Save current branch from rev-parse output and highlight it
The chosen color is red with bold font, however, maybe all other refs
should be toned down and only the current branch should use bold font.
Jonas Fonseca [Mon, 24 Mar 2008 00:10:23 +0000 (01:10 +0100)]
blame: Fix opening from subdirectory and consecutive invokations
Jonas Fonseca [Sun, 23 Mar 2008 01:29:41 +0000 (02:29 +0100)]
Remove deprecated options and cleanup option parsing
Jonas Fonseca [Sun, 23 Mar 2008 13:50:48 +0000 (14:50 +0100)]
More blame view fixes
Jonas Fonseca [Sun, 23 Mar 2008 02:00:03 +0000 (03:00 +0100)]
Various fixes and improvements of the new blame view
- Fix entering from status and stage views by making opt_ref setting
optional.
- Use separate opt_file variable, since the tree view also uses
opt_path.
Jonas Fonseca [Sat, 22 Mar 2008 02:05:00 +0000 (03:05 +0100)]
Add blame view
It may both be entered from the command line using:
tig blame [rev] path
or from either the status and stage, as well as by using the tree view
to navigte.
Jonas Fonseca [Sat, 22 Mar 2008 20:35:31 +0000 (21:35 +0100)]
Add hack to allow view loading to have multiple phases
.. by avoiding end_update() call after last read line.
Jonas Fonseca [Fri, 21 Mar 2008 16:27:28 +0000 (17:27 +0100)]
Simplify subcommand option parsing by moving it out of the loop
Jonas Fonseca [Fri, 21 Mar 2008 18:04:54 +0000 (19:04 +0100)]
draw_text: remove unused col argument
Jonas Fonseca [Fri, 21 Mar 2008 16:53:46 +0000 (17:53 +0100)]
Use rewritten parent info from --parents to simplify the revgraph
Jonas Fonseca [Thu, 20 Mar 2008 18:27:44 +0000 (19:27 +0100)]
Move unrelated UTF-8 setup code out of parse_options
Jonas Fonseca [Thu, 20 Mar 2008 18:08:42 +0000 (19:08 +0100)]
tigrc(5): Improve documentation of new show-* options
Jonas Fonseca [Thu, 20 Mar 2008 17:58:05 +0000 (18:58 +0100)]
configure: test for git binary and improve config subcommand test
Dominik Vogt [Thu, 20 Mar 2008 15:09:05 +0000 (16:09 +0100)]
Call realloc() less often because it is potentially slow.
Signed-off-by: Dominik Vogt <dvogt@ffm.tc.iot.dtag.de>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Thu, 20 Mar 2008 15:41:16 +0000 (16:41 +0100)]
New config options show-author, show-date, show-refs, show-line-numbers.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Wed, 19 Mar 2008 22:08:40 +0000 (23:08 +0100)]
Fixed displaying local tags.
Added a new colour main-local-tag.
Signed-off-by: Dominik Vogt <dvogt@ffm.tc.iot.dtag.de>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Dominik Vogt [Thu, 20 Mar 2008 10:23:26 +0000 (11:23 +0100)]
New actions toggle-date, toggle-author, and toggle-refs.
Signed-off-by: Dominik Vogt <dvogt@ffm.tc.iot.dtag.de>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Thu, 20 Mar 2008 12:21:40 +0000 (13:21 +0100)]
Fix index refreshing into separate call so diff-files is always run
Jonas Fonseca [Thu, 20 Mar 2008 00:54:26 +0000 (01:54 +0100)]
draw_text: reduce indentation level
Jonas Fonseca [Thu, 20 Mar 2008 00:53:36 +0000 (01:53 +0100)]
draw_text: minor cleanup to use fewer local variables
Jonas Fonseca [Thu, 20 Mar 2008 00:51:09 +0000 (01:51 +0100)]
utf8_length: add reserve flag for reserving a trailing character
Replace unused coloffset with reserve flag, which will reserve at least
one character cell at the end. Use it for reserving a delimiter character
when use_tilde is TRUE, and avoid a second call to utf8_length().
Jonas Fonseca [Thu, 20 Mar 2008 00:51:41 +0000 (01:51 +0100)]
TODO: --boundary flag is already used
Jonas Fonseca [Thu, 20 Mar 2008 11:27:57 +0000 (12:27 +0100)]
0.11.git
Jonas Fonseca [Wed, 19 Mar 2008 22:45:36 +0000 (23:45 +0100)]
tig-0.10.1
Dominik Vogt [Fri, 8 Feb 2008 14:50:26 +0000 (15:50 +0100)]
More verbose diff headers (including dates and committer)
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Wed, 19 Mar 2008 22:35:54 +0000 (23:35 +0100)]
Fix drawing "outside" the screen in the status and pager views
It was causing text to wrap to next line, but with the new function to
draw text with limited width this has become much easier.
Dominik Vogt [Thu, 27 Dec 2007 11:43:16 +0000 (12:43 +0100)]
Fixed handling of UTF8 tag names and commit messages.
[ jf: fix off-by-one error for trimmed tilde drawing and bad padding
substraction ]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Wed, 19 Mar 2008 20:40:26 +0000 (21:40 +0100)]
Make configure search for the ncursesw library first
Also (unconditionally) define _XOPEN_SOURCE_EXTENDED before including
curses.h to have extended functions as recommended by ncurses(3).
Dominik Vogt [Tue, 12 Feb 2008 17:14:32 +0000 (18:14 +0100)]
Fix compiler warnings: pointer of type ‘void *’ used in arithmetic
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Russell Steicke [Tue, 18 Mar 2008 08:47:43 +0000 (17:47 +0900)]
Fix signed char comparison where char is unsigned by default
tig uses a char as a flag, and expects that to have three
values: TRUE, FALSE, and -1. When char is unsigned char (such
as on PPC), this fails with the compiler warning "comparison is
always false due to limited range of data type".
So explicitly make the flag a signed char.
Detecting the int8_t type with the autoconf macro
AC_CREATE_STDINT_H would probably be a better fix.
Signed-off-by: Russell Steicke <russellsteicke@gmail.com>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Peter Karlsson [Tue, 18 Mar 2008 08:42:24 +0000 (09:42 +0100)]
Fixed spurious "/bin/sh: --list: command not found" error
If git has been installed with a separate libexecdir which is not in path
(for example, a standard msysgit installation), tig would not find
"git-config", and we must instead find the "git" binary and call it as
"git config".
Signed-off-by: Peter Karlsson <peter@softwolves.pp.se>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Jonas Fonseca [Mon, 17 Mar 2008 13:58:51 +0000 (14:58 +0100)]
Refresh the index when opening the status view to avoid "empty diffs"
Jonas Fonseca [Fri, 14 Mar 2008 20:05:14 +0000 (21:05 +0100)]
Add rename support to the status view
Renames are now picked up and displayed with the 'R' flag instead of
being shown as a 'C'opy and 'D'eletion. Remove --find-copies-harder from
the arguments to diff-index and diff-files since this option seem to
interfere with rename detection.
Jonas Fonseca [Mon, 17 Mar 2008 12:03:14 +0000 (13:03 +0100)]
Make it more clear that use of configure (and autoreconf) is optional
Suggested by Junio.
Jonas Fonseca [Mon, 17 Mar 2008 10:07:05 +0000 (11:07 +0100)]
Replace SYSCONFDIR value in distributed documentation distributed
.. by defining sysconfdir to ++SYSCONFDIR++ when building documentation
for the release branch. This also improved quoting of paths during
installation.
Reported by Jakub Narebski.
Jonas Fonseca [Mon, 17 Mar 2008 11:37:07 +0000 (12:37 +0100)]
tig-0.10.1.git
Jonas Fonseca [Mon, 17 Mar 2008 01:23:01 +0000 (02:23 +0100)]
tig-0.10
Jonas Fonseca [Thu, 7 Feb 2008 19:00:38 +0000 (20:00 +0100)]
Make command line parsing more compatible with gitk
Many of the command line arguments are relics from the beginning of the
project and served as a method of configuring tig before support for the
configuration file was introduced. Since then they have become less
useful and make tig less compatible with gitk and other git repo
viewers.
This commit tries to fix this by deprecating all command line arguments
except the very tig specific version and help arguments. The option to
enter the status view (-S) is moved to a new "status" subcommand. Tig
will warn about the deprecation and advise -S users to use the new
subcommand. The handling of "--" is kept as it is for compatibility, but
will be removed in a future version. Finally, the man page and manual
was updated to reflect the new options and subcommands.
So enjoy the new less cludgy `tig --all' ... I will! :)
Dominik Vogt [Thu, 27 Dec 2007 10:11:28 +0000 (11:11 +0100)]
Add system-wide configuration file and new config file environment vars
Introduced envvars TIGRC_USER and TIGRC_SYSTEM to control which config
file is used. The default user specific config file can be overridden
with TIGRC_USER. Before loading the user config file, tig now looks for
a system wide config file ($(sysconfdir)/tirgc by default). This can be
overridden with the environment variable TIGRC_SYSTEM.
Also corrected a small mistake in the Makefile. Instead of setting
CFLAGS for '-D...' compiler options, use CPPFLAGS.
[ The original code from Dominik was changed so that tig always reads
the system-wide configuration file. The documentation was improved
so the configured sysconfdir is used in the generated documentation.
-- jonas ]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
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!