summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-14gitk: Add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner
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: Alexandre Erwin Ittner <alexandre@ittner.com.br> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-12-12gitk: Make text selectable on MacStefan Haller
Stolen from git-gui, 23effa79f7 (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: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-12-12gitk: Prevent the text pane from becoming editableStefan Haller
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: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-12-11gitk: Add the equivalent of diff --color-wordsThomas Rast
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: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-12-11gitk: Update Swedish translation (290t)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-05-30gitk: Show notes by default (like git log does)Kirill Smelkov
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: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-04-17gitk: Display dirty submodules correctlyJens Lehmann
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: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Fix display of copyright symbolPat Thoyts
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: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Add emacs editor variable blockPat Thoyts
Help contributors use the correct indentation style. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Avoid calling tk_setPalette on WindowsPat Thoyts
This just messes up the system colors. Leave them alone. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Don't clobber "Remember this view" settingJonathan Nieder
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: Steve Cotton <steve0001@s.cotton.clara.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Add comments to explain encode_view_opts and decode_view_optsJonathan Nieder
Summarize these functions to save the reader some time. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Use consistent font for all text input fieldsMark Hills
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: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Set the font for all listbox widgetsMark Hills
This affects the font chooser. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Set the font for all spinbox widgetsMark Hills
Use the X resources to set the font, removing the need to set the font for specific widgets. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Remove forced use of sans-serif fontMark Hills
The X resources set using uifont cover this case. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-03-20gitk: Add Ctrl-W shortcut for closing the active windowJens Lehmann
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: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-02-03gitk: Fix copyright symbol in About box messagePaul Mackerras
Somehow it got corrupted in commit d93f1713 ("gitk: Use themed tk widgets"). Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-29gitk: Update German translationChristian Stimming
Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-29gitk: Add French translationEmmanuel Trillaud
Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Thomas Moulard <thomas.moulard@gmail.com> Signed-off-by: Guy Brand <gb@unistra.fr> Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-29gitk: update Italian translationMichele Ballabio
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-29gitk: Update Swedish translationPeter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Adjust two equal strings which differed in whitespaceMarkus Heidelberg
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: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Display submodule diffs with appropriate encodingKirill Smelkov
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: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Fix display of newly-created tagsDave Dulson
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: David Dulson <dave@dulson.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Enable gitk to create tags with messagesDave Dulson
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: David Dulson <dave@dulson.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Update Hungarian translationMiklos Vajna
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-01-12gitk: Add Hungarian translationLaszlo Papp
[Junio C Hamano <gitster@pobox.com>: Fix a couple of wrapped lines] Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-12-13gitk: Add "--no-replace-objects" optionChristian Couder
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: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-19gitk: Fix selection of tagsPat Thoyts
When a tag is clicked an error is raised due to a missing parameter in a function call. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Default to the system colours on WindowsPat Thoyts
Also convert a button to use the themed widget set. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Merge branch 'dev' into masterPaul Mackerras
Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Update Japanese translationMizar
Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Fix "git gui blame" invocation when called from top-level directoryMarkus Heidelberg
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 9712b81 (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: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Disable checkout of remote branchesSitaram Chamarty
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: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-14gitk: Improve appearance of radiobuttons and checkbuttonsPaul Mackerras
Commit 5497f7a23ac11f9b230892220d5ed80263eedd1f ("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: Paul Mackerras <paulus@samba.org>
2009-11-03gitk: Skip translation of "wrong Tcl version" messageBernt Hansen
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: Bernt Hansen <bernt@norang.ca> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-03gitk: Add Japanese translationMizar
Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-03gitk: Use the --submodule option for displaying diffs when availableJens Lehmann
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: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-03gitk: Fix diffing committed -> staged (typo in diffcmd)Jens Lehmann
When highlighting a commit, using the context menu over the staged changes and then selecting "Diff this -> selected" the diff was empty. The same happened when highlighting the staged changes and using "Diff selected -> this" over a commit. The reason was a copy/paste error in [diffcmd]. This fixes it. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-11-03gitk: Add configuration for UI colour schemeGuillermo S. Romero
This adds an option to control the global colour scheme in the Edit > Preferences dialog so that the whole interface can have a non-default main colour. Signed-off-by: Guillermo S. Romero <gsromero@infernal-iceberg.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-21gitk: Work around leftover temporary save filePat Thoyts
If a file exists and is hidden on Windows the Tcl open command will fail as the attributes provided in the CREAT call fail to match those of the existing file. Forcing removal of the temporary file before we begin solves any problems caused by previous failures to save the application settings. An alternative would be to remove the hidden attribute before calling 'open'. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-10gitk: Don't compare fake children when comparing commitsPaul Mackerras
This fixes a bug where the compare-commits function would advance to a fake node (one representing local changes, either checked in but not committed, or not checked in) and then get an error when trying to get the patch-id. This fixes it by only considering the real children of each commit. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-10gitk: Show diff of commits at end of compare-commits outputPaul Mackerras
When comparing a string of commits, when we find two non-merge commits that differ, we now write the two commits to files and diff the files. This pulls out the logic for creating a temporary directory from external_diff into a separate procedure so that the new diffcommits procedure can use it. Because the diff command returns an exit status of 1 when the files differ, and Tcl treats that as an error, this adds catch {} around the close statements in getblobdiffline. At present this only removes the temporary files when gitk exits. It should remove them when the diff is done. Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-07gitk: Show diff of commits at end of compare-commits outputPaul Mackerras
When comparing a string of commits, when we find two non-merge commits that differ, we now write the two commits to files and diff the files. This pulls out the logic for creating a temporary directory from external_diff into a separate procedure so that the new diffcommits procedure can use it. Because the diff command returns an exit status of 1 when the files differ, and Tcl treats that as an error, this adds catch {} around the close statements in getblobdiffline. At present this only removes the temporary files when gitk exits. It should remove them when the diff is done. Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-05gitk: Add a user preference to enable/disable use of themed widgetsPaul Mackerras
Also move the hide-remotes option up into the commit display options in the Edit->Preferences panel, since it affects the commit display more than the diff display. Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-09-05Merge branch 'master' into devPaul Mackerras
2009-08-13gitk: Update Swedish translation (280t0f0u)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-08-13gitk: Parse arbitrary commit-ish in SHA1 fieldThomas Rast
We only accepted either SHA1s or heads/tags that have been read. This meant the user could not, e.g., enter HEAD to go back to the current commit. This adds code to call out to git rev-parse --verify if all other methods of interpreting the string the user entered fail. (git-rev-parse alone is not enough as we really want a single revision.) The error paths change slighly, because we now know from the rev-parse invocation whether the expression was valid at all. The previous "unknown" path is now only triggered if the revision does exist, but is not in the current view display. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-08-13gitk: Fix direction of symmetric difference in optimized modeThomas Rast
ee66e08 (gitk: Make updates go faster, 2008-05-09) implemented an optimized mode where gitk parses the arguments with rev-parse, and manually reads history in chunks. As mentioned in the commit message, symmetric differences are a problem there: One wrinkle is that we have to turn symmetric diff arguments (of the form a...b) back into symmetric diff form so that --left-right still works, as git rev parse turns a...b into a b ^merge_base(a,b). However, git-rev-parse returns a...b in the swapped order b a ^merge_base(a,b) This has been the case since at least 1f8115b (the state of master at the time of the abovementioned ee66e08; Merge branch 'maint', 2008-05-08). So gitk flipped the sides of symmetric differences whenever it was in optimized mode. Fix this by swapping the sides of the reconstruction code. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Paul Mackerras <paulus@samba.org>