This fixes errors running with release candidate versions of Git:
  Error in startup script: expected version number but got "1.7.4-rc0"

Also, $git_version is no longer artificially limited to three
components.  That limitation was added by commit 194bbf6c
("gitk: Handle msysGit version during version comparisons") to deal
with msysGit version strings like “1.6.4.msysgit.0”, and we don’t need
it now.  Hence as another side effect, this enables showing notes with
git version 1.6.6.2 or 1.6.6.3, as originally intended by commit
7defefb1 ("gitk: Show notes by default (like git log does").
Signed-off-by: NAnders Kaseorg <andersk@mit.edu>
Reported-by: NMathias Lafeldt <misfire@debugon.org>
Reviewed-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Translating a SCM is tricky due to amount of jargon, so, I tried to
keep the wording consistent with both the German and Italian git
translations and the pt-BR translation of other SCMs.
Signed-off-by: NAlexandre Erwin Ittner <alexandre@ittner.com.br>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Stolen from git-gui, 23effa79 (original log message by
Shawn O. Pearce <spearce@spearce.org> follows):

    git-gui: Force focus to the diff viewer on mouse click.

    Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text
    widget cannot receive focus or receive a selection within it.  This
    makes the diff viewer almost useless on that platform as you cannot
    select individual parts of the buffer.

    Now we force focus into the diff viewer when its clicked on with
    button 1.  This works around the feature and allows selection to
    work within the viewer just like it does on other less sane systems,
    like Microsoft Windows.
Signed-off-by: NStefan Haller <stefan@haller-berlin.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

When setting the "Patch/Tree" radio buttons to "Tree" and
clicking on a file to display it, the text pane would
accidentally become editable (because of the early return
in getblobline).
Signed-off-by: NStefan Haller <stefan@haller-berlin.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings.  These are selected
by a dropdown box.

As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.

Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Starting from ~ git-1.6.6, log, show & whatchanged show notes by default.

On the other hand, gitk does not show notes by default, because under
the hood it calls 'git log --pretty=raw ...' to get the log, and in
'git log' notes are turned off when user specifies format or pretty
settings.

Yes, it is possible to invoke 'gitk --show-notes' explicitly, but since
from user's perspective, gitk is gui enabled git log, it would be
logical for gitk to show notes by default too for consistency.

In git, --show-notes was introduced in 66b2ed (Fix "log" family not to
be too agressive about showing notes) which predates 1.6.6.2.

Notes can still be supressed with 'gitk --no-notes'.

Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NKirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Since recently "git diff --submodule" prints out extra lines when the
submodule contains untracked or modified files. Show all those lines of
one submodule under the same header.

Also for newly added or removed submodules the submodule name contained
trailing garbage because the extraction of the name was not done right.
Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The script file uses utf-8 encoding but when sourced it will be read
using the default system encoding which is never utf8 on windows.
This causes the copyright symbol to display incorrectly in the about
dialog.  Using the unicode escape sequence avoids incorrect decoding
but does require a double escape in the .po files.

Also adjusted the year range.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Help contributors use the correct indentation style.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

This just messes up the system colors.  Leave them alone.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

In the View → Edit View... dialog, the "Remember this view" option
always starts out unset.  Using the dialog to change an existing view
and ignoring the parts of the dialog that aren’t relevant results in
both the old and new versions of the view being lost.

The cause: right after newviewopts($curview,perm) is set to an
appropriate value, decode_view_opts is clobbering it with the default
value.  If that call is moved a little earlier, the "Remember this
view" option gets properly set to its previous value, fixing the
problem.
Reported-by: NSteve Cotton <steve0001@s.cotton.clara.co.uk>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Summarize these functions to save the reader some time.
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Instead of setting the font for specific widgets, set the font for the
widget type. If themed widgets are not available, this is via the X
resources. If themed widgets are available, the theme font is used.

The exception is the SHA1 ID which is forced to use the fixed-width
font, even where themed widgets are used.
Signed-off-by: NMark Hills <mark@pogo.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

This affects the font chooser.
Signed-off-by: NMark Hills <mark@pogo.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Use the X resources to set the font, removing the need to set the font
for specific widgets.
Signed-off-by: NMark Hills <mark@pogo.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The X resources set using uifont cover this case.
Signed-off-by: NMark Hills <mark@pogo.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

To make the user experience between git gui and gitk more homogeneous,
use Ctrl-W in gitk for closing the active window.  When closing the
main window doquit is called for proper cleanup.
Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Somehow it got corrupted in commit d93f1713 ("gitk: Use themed tk
widgets").
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NChristian Stimming <stimming@tuhh.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NEmmanuel Trillaud <etrillaud@gmail.com>
Signed-off-by: NThomas Moulard <thomas.moulard@gmail.com>
Signed-off-by: NGuy Brand <gb@unistra.fr>
Signed-off-by: NNicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NMichele Ballabio <barra_cuda@katamail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

There were the two strings "SHA1 ID: " and "SHA1 ID:" as description
for the SHA1 search textbox.  Change it to two equal strings, the
space is now outside of the translated string.

Furthermore the German translation wasn't unique, but "SHA1:" resp.
"SHA1-Hashwert:". The former was displayed after initialisation, the
latter after changes to the textbox, for example when clearing the text.
But it was too long to be displayed fully, so use a shorter translation.
Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Previously, when submodule commit headings contained non-latin-1
characters, they were displayed incorrectly in gitk, because $line was
not properly decoded, for example:

----------------------------- Documentation/Dokko -----------------------------
Submodule Documentation/Dokko 2ca20c7..0ea204d:
  > Протоколы сопряжения ИМС "Мостик-21631"  (ЛИ2 и Сандал)
  > hardware: документация на InnoDisk SATA 10000
  > hardware: документация на IEI PCISA-6770E2 v3.0
  > hardware: документация на Fastwel NIB941
  > hardware: документация на IEI IPX-9S
  > hardware: документация на Hirschmann 5TX-EEC

instead of

----------------------------- Documentation/Dokko -----------------------------
Submodule Documentation/Dokko 2ca20c7..0ea204d:
  > Протоколы сопряжения ИМС "Мостик-21631"  (ЛИ2 и Сандал)
  > hardware: документация на InnoDisk SATA 10000
  > hardware: документация на IEI PCISA-6770E2 v3.0
  > hardware: документация на Fastwel NIB941
  > hardware: документация на IEI IPX-9S
  > hardware: документация на Hirschmann 5TX-EEC

This fixes it.
Signed-off-by: NKirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

If the user creates a tag with the "create tag" dialog in gitk and
then clicks on the newly-created tag, its contents don't get
displayed.  The reason is that rereadrefs hasn't been called, meaning
the tag doesn't exist in $tagobjid.  This causes the cat-file to fail.
Instead of using $tagobjid, pass the $tag directly, ensuring the tag
contents are populated correctly.
Signed-off-by: NDavid Dulson <dave@dulson.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Currently, tags created using the "create tag" dialog in gitk are
always lightweight tags, i.e., they don't have any annotation
(message).  This enables the user to specify a message; if they do,
gitk will create an unsigned, annotated tag object.
Signed-off-by: NDavid Dulson <dave@dulson.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

[Junio C Hamano <gitster@pobox.com>: Fix a couple of wrapped lines]
Signed-off-by: NLaszlo Papp <djszapi@archlinux.us>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Replace refs are useful to change some git objects after they
have started to be shared between different repositories. One
might want to ignore them to see the original state, and
"--no-replace-objects" option can be used from the command
line to do so.

This option simply sets the GIT_NO_REPLACE_OBJECTS environment
variable, and that is enough to make gitk ignore replace refs.

The GIT_NO_REPLACE_OBJECTS is set to "1" instead of "" as it is
safer on some platforms, thanks to Johannes Sixt and Michael J
Gruber.
Tested-by: NMichael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NChristian Couder <chriscool@tuxfamily.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

When a tag is clicked an error is raised due to a missing parameter in
a function call.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Also convert a button to use the themed widget set.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

When run in the top-level directory of a git repository, "git
rev-parse --git-dir" doesn't return an absolute path, but merely
".git", so the selected file for "git gui blame" has a relative path.
The function make_relative then tries to make the already relative
path relative, which results in a path like "../../../../Makefile"
with as many ".." as there are elements of [pwd].

This regression was introduced by commit 9712b81a (gitk: Fix bugs in
blaming code, 2008-12-06), which fixed "git gui blame" when called from
subdirs.

This also fixes it for bare repositories.
Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

At the command line, trying to check out a remote branch gives you a
detailed warning message, but the gitk GUI currently allows it without
any fuss.

Since the GUI is often used by people much less familiar with git, it
seems reasonable to make the GUI more restrictive than the command line,
not less.

This prevents a lot of detached HEAD commits by new users.
Signed-off-by: NSitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Commit 5497f7a2 ("gitk: Add configuration
for UI colour scheme") added a call to tk_setPalette at startup.
Unfortunately, tk_setPalette always chooses a dark red color for
the selectColor value if none is given explicitly, and this makes
checkbuttons and radiobuttons look rather bad.

This restores the previous appearance by specifying selectColor
explicitly.  For light backgrounds we use white for selectColor, and
for dark backgrounds we use black.  The formula and threshold for
distinguishing light from dark are the same as used in tk_setPalette
for choosing the foreground color.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

We check the required Tcl version number before we setup msgcat for
language translation.  If the Tcl version is too old just display the
untranslated error text.

The caller of show_error can now pass an alternative function for mc.
The Tcl list function turns the translation into a no-op.

This fixes the error:
    Error in startup script: invalid command name "mc"
when attempting to start gitk with Tcl 8.3.

Tested with both Tcl 8.3 and 8.4.
Signed-off-by: NBernt Hansen <bernt@norang.ca>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

When displaying diffs in a submodule, this makes gitk display the
headlines of the commits being diffed, instead of just showing
not-quite-helpful SHA-1 pairs, if the underlying git installation
supports this.  That makes it much easier to evaluate the changes, as
it eliminates the need to start a gitk inside the submodule and use
the superprojects hashes there to find out what the commits are about.

Since the --submodule option of git diff is new in git version 1.6.6,
this only uses the --submodule option when a git version of 1.6.6 or
higher is detected.
Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>