- 15 3月, 2015 8 次提交
-
-
由 Paul Mackerras 提交于
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>
-
由 0xAX 提交于
Signed-off-by: N0xAX <kuleshovmail@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 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 2 次提交
-
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org> 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>
-
- 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 6 次提交
-
-
由 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>
-
由 David Aguilar 提交于
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: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Jens Lehmann 提交于
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: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Anders Kaseorg 提交于
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: NAnders Kaseorg <andersk@mit.edu> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Max Kirillov 提交于
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: NPaul Mackerras <paulus@samba.org>
-
由 Ilya Bobyr 提交于
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: NIlya Bobyr <ilya.bobyr@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 21 2月, 2014 1 次提交
-
-
https://github.com/vnwildman/gitk由 Paul Mackerras 提交于
to get Vietnamese translations for gitk. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 23 1月, 2014 1 次提交
-
-
由 Paul Mackerras 提交于
In the cases where the lines starting with Precedes:, Follows: and Branches: in the commit display are long enough to be word-wrapped, this adds a 1cm margin on the left of the wrapped lines, to make the display more readable. Suggested by Stephen Rothwell. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 22 1月, 2014 1 次提交
-
-
由 Astril Hayato 提交于
Write the gitk config data to $XDG_CONFIG_HOME/git/gitk ($HOME/.config/git/gitk by default) in line with the XDG specification. This makes it consistent with git which also follows the spec. If $HOME/.gitk already exists use that for backward compatibility, so only new installations are affected. Signed-off-by: NAstril Hayato <astrilhayato@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 21 1月, 2014 5 次提交
-
-
由 Marc Branchaud 提交于
Users often find that "next" and "prev" do the opposite of what they expect. For example, "next" moves to the next match down the list, but that is almost always backwards in time. Replacing the text with arrows makes it clear where the buttons will take the user. Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Jonathan Nieder 提交于
The Makefile only runs it using tclsh, but because the fallback po2msg script has the usual tcl preamble starting with #!/bin/sh it can also be run directly. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org> 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>
-
- 14 12月, 2013 1 次提交
-
-
由 Trần Ngọc Quân 提交于
Signed-off-by: NTrần Ngọc Quân <vnwildman@gmail.com>
-
- 02 12月, 2013 5 次提交
-
-
由 Thomas Rast 提交于
This gives line-log support to gitk, by exploiting the new support for processing and showing "inline" diffs straight from the git-log output. Note that we 'set allknown 0', which is a bit counterintuitive since this is a "known" option. But that flag prevents gitk from thinking it can optimize the view by running rev-list to see the topology; in the -L case that doesn't work. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Thomas Rast 提交于
The previous commit split the diffs into a separate field. Now we actually want to show them. To that end we use the stored diff, and - process it once to build a fake "tree diff", i.e., a list of all changed files; - feed it through parseblobdiffline to actually format it into the $ctext field, like the existing diff machinery would. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Thomas Rast 提交于
So far we just parsed everything after the headers into the "comment" bit of $commitinfo, including notes and -- if you gave weird options -- the diff. Split out the diff, if any, into a separate field. It's easy to recognize, since it always starts with /^diff/ and is preceded by an empty line. We take care to snip away said empty line. The display code already properly spaces the end of the message from the first diff, and leaving another empty line at the end looks ugly. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Thomas Rast 提交于
For later use with data sources other than a pipe, refactor the big worker part of getblobdiffline to a separate function parseblobdiffline. Also refactor its initialization and wrap-up to separate routines. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Thomas Rast 提交于
The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 31 10月, 2013 1 次提交
-
-
由 Paul Mackerras 提交于
When a commit has many tags, the tag icons in the graph display can easily become so wide as to push the commit message off the right-hand edge of the graph display pane. This changes the display so that if there are more than 3 tags or they would take up more than a quarter of the width of the pane, we instead display a single tag icon with a legend inside it like "4 tags...". If the user clicks on the tag icon, gitk then displays all the tags in the diff display pane. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 17 5月, 2013 1 次提交
-
-
由 Peter Krefting 提交于
Signed-off-by: NPeter Krefting <peter@softwolves.pp.se> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 13 5月, 2013 1 次提交
-
-
由 Tair Sabirgaliev 提交于
On OSX, Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is: if we are on OSX, use osascript to bring the current Wish process window to front. Signed-off-by: NTair Sabirgaliev <tair.sabirgaliev@gmail.com> Thanks-to: Stefan Haller <lists@haller-berlin.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-