- 12 12月, 2016 9 次提交
-
-
由 Paul Mackerras 提交于
Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Markus Hitter 提交于
After a reload we might have an entirely different set of commits, so keeping all of them leaks memory. Remove them all because re-creating them is not more expensive than testing wether they're still valid. Lazy (re-)creation is already well established, so a missing entry can't cause harm. Signed-off-by: NMarkus Hitter <mah@jump-ing.de> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Markus Hitter 提交于
One shouldn't have descriptors of already closed files around. The first idea to deal with this (previously) ever growing array was to remove it entirely, but it's needed to detect start of a new diff with ths old diff not yet done. This happens when a user clicks on the same commit in the commit list repeatedly without delay. Signed-off-by: NMarkus Hitter <mah@jump-ing.de> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Markus Hitter 提交于
The diff text widget is read-only, so there's zero point in building an undo stack. This change reduces memory consumption of this widget by about 95%. Memory usage of the whole program for viewing a reference commit before; 579'692'744 bytes, after: 32'724'446 bytes. Test procedure: - Choose a largish commit and check it out. In this case one with 90'802 lines, 5'006'902 bytes. - Have a Tcl version with memory debugging enabled. This is, build one with --enable-symbols=mem passed to configure. - Instrument Gitk to regularly show a memory dump. E.g. by adding these code lines at the very bottom: proc memDump {} { catch { set output [memory info] puts $output } after 3000 memDump } memDump - Start Gitk, it'll load this largish commit into the diff text field automatically (because it's the current commit). - Wait until memory consumption levels out and note the numbers. Note that the numbers reported by [memory info] are much smaller than the ones reported in 'top' (1.75 GB vs. 105 MB in this case), likely due to all the instrumentation coming with the debug version of Tcl. Signed-off-by: NMarkus Hitter <mah@jump-ing.de> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Stefan Dotterweich 提交于
When -S or -G is used as a filter option, the resulting commit list rarely contains all matching commits. Only a certain number of commits are displayed and the rest are missing. "git log --boundary -S" does not return as many boundary commits as you might expect. gitk makes up for this in closevarcs() by adding missing parent (boundary) commits. However, it does not change $numcommits, which limits how many commits are shown. In the end, some commits at the end of the commit list are simply not shown. Change $numcommits whenever a missing parent is added to the current view. Signed-off-by: NStefan Dotterweich <stefandotterweich@gmx.de> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Paul Mackerras 提交于
Some systems don't recognize "lime" as a color, leading to errors when gitk is run. What we want is a bright green, so use "#00ff00" instead. Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Rogier Goossens 提交于
Hi, I made another branch dialog related change, included in this message. It applies on top of my other two patches. Rogier. ------- 8< ------------------- 8< -------------- Only the SHA1 was included. It's convenient to have the title mentioned as well. Signed-off-by: NRogier Goossens <goossens.rogier@gmail.com> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Rogier Goossens 提交于
Git allows checking out remote branches, creating a local tracking branch in the process. Allow gitk to do this as well, provided a local branch of the same name does not yet exist. Signed-off-by: NRogier Goossens <goossens.rogier@gmail.com> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Rogier Goossens 提交于
Signed-off-by: NRogier Goossens <goossens.rogier@gmail.com> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
- 19 3月, 2016 1 次提交
-
-
由 Guillermo S. Romero 提交于
Make Help > About & Key bindings dialogs readable if theme has changed font color to something incompatible with white. Signed-off-by: NGuillermo S. Romero <gsromero@infernal-iceberg.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 12月, 2015 2 次提交
-
-
由 Giuseppe Bilotta 提交于
The widgets on top of the diff window are very tightly packed. Make them breathe a little by adding an 'i'-spaced padding between them. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Giuseppe Bilotta 提交于
The fonts set in setoptions aren't consistently picked up by ttk, which uses its own predefined fonts. This is noticeable when switching between using and not using ttk with custom fonts or in HiDPI settings (where the default TTK fonts do _not_ respect tk sclaing). Fix by mapping the ttk fontset to the one used by gitk internally. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 11月, 2015 1 次提交
-
-
由 YOKOTA Hiroshi 提交于
Color name "green" was darken since Tcl/Tk 7.6. Because color name scheme was changed from "X11 colors" to "Web colors". Use "lime" to keep colors. See also: http://www.tcl.tk/cgi-bin/tct/tip/403.htmlSigned-off-by: NYOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>
-
- 30 10月, 2015 1 次提交
-
-
由 Beat Bolli 提交于
In d99b4b0d ("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: NBeat Bolli <dev+git@drbeat.li> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 13 9月, 2015 2 次提交
-
-
由 Giuseppe Bilotta 提交于
This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Beat Bolli 提交于
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: NBeat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 13 8月, 2015 1 次提交
-
-
由 Beat Bolli 提交于
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: NBeat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 17 5月, 2015 5 次提交
-
-
由 Marc Branchaud 提交于
This is needed for getcommitlines to work properly when a language translation is being used. Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Ismael Luceno 提交于
Binds "g" to focus and clear the sha1 entry box. Signed-off-by: NIsmael Luceno <ismael@iodev.co.uk> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Marc Branchaud 提交于
If the current view is the "Command line" view, show the command line arguments instead of the view name. Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Michael Rappazzo 提交于
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: NMichael Rappazzo <rappazzo@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alex Henrie 提交于
This is a better fix for 8d849957. 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: NAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 03 5月, 2015 1 次提交
-
-
由 Paul Mackerras 提交于
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: NPaul Mackerras <paulus@samba.org>
-
- 02 5月, 2015 1 次提交
-
-
由 Paul Mackerras 提交于
This generates better bytecode in Tcl 8.6 according to http://wiki.tcl.tk/1506. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 06 4月, 2015 2 次提交
-
-
由 Marc Branchaud 提交于
Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 15 3月, 2015 5 次提交
-
-
由 Alex Henrie 提交于
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: NAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christoph Junghans 提交于
"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: NChristoph Junghans <ottxor@gentoo.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Max Kirillov 提交于
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: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Max Kirillov 提交于
Signed-off-by: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Max Kirillov 提交于
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: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 02 3月, 2015 2 次提交
-
-
由 Gabriele Mazzotta 提交于
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: NGabriele Mazzotta <gabriele.mzt@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Chris Packham 提交于
This makes the "Write commit to file" context menu option generate a file that is consumable by 'git am'. Signed-off-by: NChris Packham <judge.packham@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 30 10月, 2014 3 次提交
-
-
由 Max Kirillov 提交于
Signed-off-by: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Max Kirillov 提交于
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/255996Signed-off-by: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Sebastian Schuberth 提交于
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: NSebastian Schuberth <sschuberth@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 08 8月, 2014 1 次提交
-
-
由 Max Kirillov 提交于
Signed-off-by: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 27 6月, 2014 2 次提交
-
-
由 Max Kirillov 提交于
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: NMax Kirillov <max@max630.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 David Aguilar 提交于
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: NJunio C Hamano <gitster@pobox.com> Helped-by: Nbrian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 15 6月, 2014 1 次提交
-
-
由 David Aguilar 提交于
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: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-