summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-12gitk: Translate more to Japanese catalogLibravatar YOKOTA Hiroshi1-31/+16
Signed-off-by: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>
2015-11-12gitk: Update Japanese message catalogLibravatar YOKOTA Hiroshi1-13/+11
Signed-off-by: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>
2015-11-12gitk: Re-sync line number in Japanese message catalogueLibravatar YOKOTA Hiroshi1-275/+294
Signed-off-by: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>
2015-10-30Merge https://github.com/vnwildman/gitkLibravatar Paul Mackerras1-22/+23
This brings in an update to the Vietnamese translation. Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: Update Russian translationLibravatar Dimitriy Ryazantcev1-239/+160
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: Add accelerator to German localeLibravatar Takashi Iwai1-18/+18
Assigned either to the first letter or some unique letter. At least there are no conflicts, as far as I see... Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: Add accelerators to Japanese localeLibravatar Takashi Iwai1-17/+17
Just follow the English accelerator keys. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: Update msgid's for menu items with acceleratorLibravatar Takashi Iwai12-205/+205
The commit d99b4b0de27a ("gitk: Accelerators for the main menu") modified the menu item strings with the accelerator, but the translations didn't follow, thus the menus are shown without translations. This patch systematically update the msgid keys just to follow this change. The contents aren't changed, so the accelerator won't work in these locales for now. Each locale translator needs to add proper acceleration keys appropriately. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: l10n: Update Catalan translationLibravatar Alex Henrie1-28/+25
The gitk included in git 2.6.0 crashes if run from a Catalan locale. I'm hoping that a translation update will fix this. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-10-30gitk: Add missing acceleratorsLibravatar Beat Bolli1-2/+2
In d99b4b0de27a ("gitk: Accelerators for the main menu", 2015-09-09), accelerators were added to allow efficient keyboard navigation. One instance of the strings "Edit view..." and "Delete view" were left without the ampersand. Add the missing ampersand characters to unbreak our international users. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-09-15Updated Vietnamese translationLibravatar Trần Ngọc Quân1-22/+23
Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>
2015-09-13gitk: Accelerators for the main menuLibravatar Giuseppe Bilotta1-23/+23
This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-09-13gitk: Adjust the menu line numbers to compensate for the new entryLibravatar Beat Bolli1-3/+3
Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-08-13gitk: Add a "Copy commit summary" commandLibravatar Beat Bolli1-0/+15
When referring to earlier commits in commit messages or other text, one of the established formats is <abbrev-sha> ("<summary>", <author-date>) Add a "Copy commit summary" command to the context menu that puts this text for the currently selected commit on the clipboard. This makes it easy for our users to create well-formatted commit references. The <abbrev-sha> is produced with the %h format specifier to make it unique. Its length can be controlled with the gitk preference "Auto-select SHA1 (length)", or, if this preference is set to its default value (40), with the Git config setting core.abbrev. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-08-13gitk: Update Bulgarian translation (307t)Libravatar Alexander Shopov1-11/+8
Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Update .po filesLibravatar Paul Mackerras12-3403/+3583
Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Update Bulgarian translation (304t)Libravatar Alexander Shopov1-9/+8
Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Use translated version of "Command line" in getcommitlinesLibravatar Marc Branchaud1-1/+1
This is needed for getcommitlines to work properly when a language translation is being used. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Make it easier to go quickly to a specific commitLibravatar Ismael Luceno1-0/+2
Binds "g" to focus and clear the sha1 entry box. Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Show the current view's name in the window titleLibravatar Marc Branchaud1-1/+16
If the current view is the "Command line" view, show the command line arguments instead of the view name. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Add mouse right-click options to copy path and branch nameLibravatar Michael Rappazzo1-0/+2
This adds menu entries to two of the right-click menus: - 'Copy path' in the file list - 'Copy branch name' on a branch in the commit list Signed-off-by: Michael Rappazzo <rappazzo@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-17gitk: Remove mc parameter from proc show_errorLibravatar Alex Henrie1-23/+23
This is a better fix for 8d849957d81fc0480a52570d66cc3c2a688ecb1b. This new fix makes the strings "Sorry, gitk cannot run..." and "OK" translatable and the string "mc" not translatable. It will take effect the next time `make update-po` is run. msgcat is now imported before the Tcl/Tk version check so that the mc function is available even if the version check fails. This should not be a problem because msgcat and ::msgcat::mc were officially added in Tcl 8.1 (released April 29, 1999) and we are not trying to support versions of Tcl older than that. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-03gitk: Fix error when changing colors after closing "List references" windowLibravatar Paul Mackerras1-5/+13
This fixes an error that manifests itself if the user opens the "List references" window and the closes it, and subsequently opens the Preferences window and changes one of the colors. When the user clicks OK, and error popup appears with the message: Error: invalid command name ".showrefs.list" This is because .showrefs.list was added to the list of windows to be notified on foreground/background color changes, but the window no longer exists. We fix the bug by checking whether the window exists before trying to change its colors. As an optimization, we also avoid adding the .showrefs.list window to the list a second time. Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-05-02gitk: Replace catch {unset foo} with unset -nocomplain fooLibravatar Paul Mackerras1-56/+56
This generates better bytecode in Tcl 8.6 according to http://wiki.tcl.tk/1506. Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-04-06gitk: Rearrange window title to be more conventionalLibravatar Marc Branchaud1-1/+1
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-04-06gitk: sv.po: Update Swedish translation (305t0f0u)Libravatar Peter Krefting1-7/+23
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-04-06gitk: Fix bad English grammar "Matches none Commit Info"Libravatar Alex Henrie1-1/+1
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Update .po filesLibravatar Paul Mackerras12-3737/+5253
Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: l10n: Add Catalan translationLibravatar Alex Henrie1-0/+1349
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Fix typo in Russian translationLibravatar 0xAX1-1/+1
Signed-off-by: 0xAX <kuleshovmail@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Remove tcl-format flag from a message that shouldn't have itLibravatar Alex Henrie1-0/+1
xgettext sees "% o" and interprets it as a placeholder for an octal number preceded by a space. However, in this case it's not actually a placeholder, and most translations will replace the "% o" sequence with something else. Removing the tcl-format flag from this string prevents tools like Poedit from freaking out when "% o" doesn't appear in the translated string. The corrected flag will appear in each translation's po file the next time the translation is updated with `make update-po`. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Pass --invert-grep option down to "git log"Libravatar Christoph Junghans1-0/+1
"git log --grep=<string>" shows only commits with messages that match the given string, but sometimes it is useful to be able to show only commits that do *not* have certain messages (e.g. "show me ones that are not FIXUP commits"). Now the underlying "git log" learned the "--invert-grep" option. The option syntactically behaves similar to "--all-match" that requires that all of the grep strings to match and semantically behaves the opposite---it requires that none of the grep strings to match. Teach "gitk" to allow users to pass it down to underlying "git log" command by adding it to the known_view_options array. Signed-off-by: Christoph Junghans <ottxor@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Synchronize config file writesLibravatar Max Kirillov1-3/+28
If several gitk instances are closed simultaneously, the savestuff procedure can run at the same time, resulting in a conflict which may cause losing of some of the instance's changes, failing the saving operation or even corrupting the configuration file. This can happen, for example, at user session closing, or at group closing of all instances of an application which is possible in some desktop environments. To avoid this, make sure that only one saving operation is in progress. It is guarded by existence of the $config_file_tmp file. Creating the file and moving it to $config_file are both atomic operations, so it should be reliable. Reading does not need to be syncronized, because moving is an atomic operation, and the $config_file always refers to a full and correct file. But, if there is a stale $config_file_tmp file, report it at gitk start. If such file is detected when saving, just report it abort the save, as for other errors in saving. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Report errors in saving config fileLibravatar Max Kirillov1-1/+3
Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-15gitk: Only write changed configuration variablesLibravatar Max Kirillov1-10/+76
When gitk contains some changed parameter, and there is an existing instance of gitk where the parameter is still old, it is reverted to that old value when that instance exits. Instead, store a parameter in config only if it has been modified in the exiting instance. Otherwise, preserve the value which currently is in file. This allows editing the configuration when several instances are running, without rollback of the modification if some other instance where the configuration was not edited is closed last. For scalar variables, use trace(3tcl) to detect their change. Since `trace` can send bogus events, doublecheck if the value has really been changed, but once it is marked as changed, do not reset it back to unchanged ever, because if user has restored the original value, it's the decision which should be stored as well as modified value. Treat view list especially: instead of rewriting the whole list, merge individual views. Place old and updated views in their old places, add new ones to the end of list. Collect modified views explicitly, in newviewok{} and delview{}. Do not merge geometry values. They are almost always changing because user moves and resises windows, and there is no way to find which one of the geometries is most desired. Just overwrite them unconditionally, like earlier. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-02gitk: Enable mouse horizontal scrolling in diff paneLibravatar Gabriele Mazzotta1-0/+7
Currently it's required to hold Shift and scroll up and down to move horizontally. Listen to Button-6 and Button-7 events too to make horizontal scrolling handier with touchpads and some mice. Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2015-03-02gitk: Default wrcomcmd to use --pretty=emailLibravatar Chris Packham1-1/+1
This makes the "Write commit to file" context menu option generate a file that is consumable by 'git am'. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-10-30gitk: Remove boilerplate for configuration variablesLibravatar Max Kirillov1-68/+20
Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-10-30gitk: Show detached HEAD if --all is specifiedLibravatar Max Kirillov1-0/+2
If HEAD is detached, 'gitk --all' does not show it. This is inconvenient for frontend program, and for example git log does show the detached HEAD. gitk uses git rev-parse to find a list of branches to show. Apparently, the command does not include detached HEAD to output if --all argument is specified. This has been discussed in [1] and stated as expected behavior. So rev-parse's parameters should be tuned in gitk. [1] http://thread.gmane.org/gmane.comp.version-control.git/255996 Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-10-30gitk: Do not depend on Cygwin's "kill" command on WindowsLibravatar Sebastian Schuberth1-1/+1
Windows does not necessarily mean Cygwin, it could also be MSYS. The latter ships with a version of "kill" that does not understand "-f". In msysgit this was addressed by shipping Cygwin's version of kill. Properly fix this by using the stock Windows "taskkill" command instead, which is available since Windows XP Professional. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-08-08gitk: Updated Bulgarian translation (302t,0f,0u)Libravatar Alexander Shopov1-323/+329
Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-08-08gitk: Add keybinding to switch to parent commitLibravatar Max Kirillov1-0/+12
Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-27gitk: Add visiblerefs option, which lists always-shown branchesLibravatar Max Kirillov1-4/+6
When many branches contain a commit, the branches used to be shown in the form "A, B and many more", where A, B can be master of current HEAD. But there are more which might be interesting to always know about. For example, "origin/master". The new option, visiblerefs, is stored in ~/.gitk. It contains a list of references which are always shown before "and many more" if they contain the commit. By default it is `{"master"}', which is compatible with previous behavior. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-27gitk: Catch mkdtemp errorsLibravatar David Aguilar1-1/+3
105b5d3f ("gitk: Use mktemp -d to avoid predictable temporary directories") introduced a dependency on mkdtemp, which is not available on Windows. Use the original temporary directory behavior when mkdtemp fails. This makes the code use mkdtemp when available and gracefully fallback to the existing behavior when it is not available. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Use mktemp -d to avoid predictable temporary directoriesLibravatar David Aguilar1-1/+2
gitk uses a predictable ".gitk-tmp.$PID" pattern when generating a temporary directory. Use "mktemp -d .gitk-tmp.XXXXXX" to harden gitk against someone seeding /tmp with files matching the pid pattern. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Honor TMPDIR when viewing external diffsLibravatar David Aguilar1-2/+9
gitk fails to show diffs when browsing a read-only repository. This is due to gitk's assumption that the current directory is always writable. Teach gitk to honor either the GITK_TMPDIR or TMPDIR environment variables. This allows users to override the default location used when writing temporary files. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Show staged submodules regardless of ignore configLibravatar Jens Lehmann1-3/+10
Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to "all" suppresses all output of submodule changes for gitk. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it manually this change won't show up under "Local changes checked in to index but not committed". Fix that by using the '--ignore-submodules=dirty' option for both callers of "git diff-index --cached" when the underlying git version supports that option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Allow displaying time zones from author and commit dates timestampsLibravatar Anders Kaseorg1-1/+23
Now gitk can be configured to display author and commit dates in their original timezone, by putting %z into datetimeformat in ~/.gitk. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Switch to patch mode when searching for line originLibravatar Max Kirillov1-2/+6
If the "Show origin of this line" is started from tree mode, it still shows the result in tree mode, which I suppose not what user expects to see. Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-06-15gitk: Replace SHA1 entry field on keyboard pasteLibravatar Ilya Bobyr1-0/+1
We already replace old SHA with the clipboard content for the mouse paste event. It seems reasonable to do the same when pasting from keyboard. Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 17:54:16 +0000