git/gitk, branch v1.2.2

gitk: Use git-diff-tree --cc for showing the diffs for merges

2006-02-06T22:13:52Z

This replaces a lot of code that used the result from several 2-way diffs to generate a combined diff for a merge. Now we just use git-diff-tree --cc and colorize the output a bit, which is a lot simpler, and has the enormous advantage that if the diff doesn't show quite what someone thinks it should show, I can deflect the blame to someone else. :) Signed-off-by: Paul Mackerras

gitk: Add braces around if expressions

2006-02-06T22:10:18Z

Apparently this simplifies things for the parser/compiler and makes it go slightly faster (since without the braces, it potentially has to do two levels of substitutions rather than one). Signed-off-by: Paul Mackerras

gitk: Work around Tcl's non-standard names for encodings

2005-12-07T12:28:22Z

This uses a table of encoding names and aliases distilled from http://www.iana.org/assignments/character-sets plus some heuristics to convert standard encoding names to ones that Tcl recognizes. Signed-off-by: Paul Mackerras

gitk: Some improvements for the code for updating the display

2005-12-05T22:46:23Z

This should be more robust in the case that some does "Update" before the initial drawing is finished. It also avoids having to reset the list of children for each commit and reconstruct it. Signed-off-by: Paul Mackerras

gitk: Factored out some common code into a new start_rev_list procedure

2005-12-01T11:42:46Z

Signed-off-by: Paul Mackerras

[PATCH] gitk: add Update menu item.

2005-12-01T09:01:51Z

Update will redraw the commits if any commits have been added to any of the selected heads. The new commits appear on the top. Signed-off-by: Sven Verdoolaege Signed-off-by: Paul Mackerras

gitk: Add a preferences dialog with some basic stuff

2005-11-29T22:28:16Z

There is a lot more that could be put in, such as a selector for the font family etc., but this is a start. Signed-off-by: Paul Mackerras

[PATCH] gitk: Use i18n.commitencoding configuration item.

2005-11-28T09:46:49Z

Hardcoding "utf-8" in the script breaks projects that use local encoding, so allow setting i18n.commitEncoding. Signed-off-by: Junio C Hamano Signed-off-by: Paul Mackerras

gitk: Fix diff this->selected and selected->this functions

2005-11-28T09:41:56Z

The change in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3, which makes a couple of git-diff-tree calls supply only one id rather than two, fixes the display when showing what a single commit did with dense revlists, but broke the diff this->selected and diff selected->this right-click menu functions. Yann Dirson pointed this out and had a patch that fixed the diff menu functions by passing a "singlecommit" flag around. This fixes it a bit differently, by making the ids and diffids variables be either a single id, in the case of showing what a commit did, or {oldid newid}, in the case of the diff menu functions. That way we can just pass $ids to git-diff-tree as is. Most of the changes in fact are just reversing the order of ids in $ids and $diffids, because they used to be {child parent}, but git-diff-tree requires old id before new id. Signed-off-by: Paul Mackerras

[PATCH] gitk: UTF-8 support

2005-11-23T10:21:33Z

Add gitencoding variable and set it to "utf-8". Use it for converting git-rev-list output. Signed-off-by: Pavel Roskin Signed-off-by: Paul Mackerras