Since 5024baa4 ([PATCH] Make gitk work when launched in a subdirectory,
2007-01-09), gitk has used 'git rev-parse --git-dir' to find the .git
directory. However, gitk still first checks for the $GIT_DIR
environment variable and that the value returned from git-rev-parse
does not point to a file. Since git-rev-parse does both of these
checks already, the checks can safely be removed from gitk. This makes
the gitdir procedure small enough to inline.

This cleanup introduces a UI regression in that the error message will
now be "Cannot find a git repository here." even in the case where
GIT_DIR points to a file, for which the error message was previously
"Cannot find the git directory \"%s\".". It should be noted, though,
that even before this patch, 'gitk --git-dir=path/to/some/file' would
give the former error message.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

It seems like gitk has been setting the global variable 'gitdir' at
startup since aa81d974 (gitk: Fix Update menu item, 2006-02-28).  It
should therefore no longer be necessary to call the procedure with the
same name (more than once to set the global variable).  Remove the
other call sites and use the global variable instead.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

When running "External diff" from gitk, the "from" and "to" files will
first be copied into a directory that is currently
".git/../.gitk-tmp.$pid".  When gitk is closed, the directory is
deleted. When the work tree is not at ".git/.." (which is supported
since the previous commit), that directory may not even be git-related
and it does not seem unlikely that permissions may not allow the
temporary directory to be created there.  Move the directory inside
.git instead.

This introduces a regression in the case that the .git directory
is readonly, but .git/.. is writeable.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Running "External diff" to compare the index and work tree currently
brings up an empty blame view when the work tree is not the parent of
the git directory.  This is because the file that is taken from the
work tree is assumed to be in
$GIT_DIR/../<repo-relative-file-name>.  Fix it by feeding the diff tool
a path under $GIT_WORK_TREE instead of "$GIT_DIR/..".
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Running "blame parent commit" currently brings up an empty blame view
when the the work tree is not the parent of the git directory.  Fix it
by feeding git-blame paths relative to $GIT_WORK_TREE instead of
"$GIT_DIR/..".
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Running "show origin of this line" currently fails when the the work
tree is not the parent of the git directory.  Fix it by feeding
git-blame paths relative to $GIT_WORK_TREE instead of "$GIT_DIR/..".
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The "highlight this only" and "highlight this too" commands in gitk
add the path relative to $GIT_WORK_TREE to the "Find" input box. When
the search (using git-diff-tree) is run, the paths are used
unmodified, except for some shell escaping. Since the search is run
from gitk's working directory, no commits matching the paths will be
found if gitk was started in a subdirectory.

Make the paths passed to git-diff-tree relative to gitk's working
directory instead of being relative to $GIT_WORK_TREE. If, however,
gitk is run outside of the working directory (e.g. with $GIT_WORK_TREE
set), we still need to use the path relative to $GIT_WORK_TREE.
Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

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

It is desirable to see at a glance which commits do contain notes.
Therefore mark them with a yellow rectangle.

That can be suppressed with `gitk --no-notes`.
Signed-off-by: NRaphael Zimmerer <killekulla@rdrz.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

When resolving a conflicted cherry-pick, this lets us pass
GIT_AUTHOR_DATE to git citool with the correct timezone.
It does this by making elements 2 and 4 of the commitinfo array
entries, which store the author and committer dates of the commit,
be 2-element lists storing the numerical date and timezone offset,
rather than just the numerical date.
Signed-off-by: NAnders Kaseorg <andersk@mit.edu>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

It was unused since commit 9f1afe05 ("gitk: New improved gitk").
Signed-off-by: NAnders Kaseorg <andersk@mit.edu>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Commit 981ff5c3 changed the error
message from git cherry-pick from
    Automatic cherry-pick failed.  [...advice...]
to
    error: could not apply 7ab78c9... Do something neat.
    [...advice...]

Update gitk’s regex to match this, restoring the ability to launch git
citool to resolve conflicted cherry-picks.
Signed-off-by: NAnders Kaseorg <andersk@mit.edu>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Tag names that contain a % character require quoting when used in event
bindings or the name may be mis-recognised for percent substitution in
the event script.
Reported-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

This adds a new spinbox on the Edit Preferences pane to allow the user
to control how many characters of the SHA1 ID get autoselected.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NSkip <bsvskip@rambler.ru>
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

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>