- 03 4月, 2012 1 次提交
-
-
由 Pat Thoyts 提交于
In 8.5 the incr command creates the target variable if it does not exist but in 8.4 using incr on a non-existing variable raises an error. Ensure we have created our counter variable when creating the tabbed dialog for non-themed preferences. Reported-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 3月, 2012 1 次提交
-
-
由 Marcus Karlsson 提交于
In early days, all projects managed by git (except for git itself) had the product of a fairly mature development history in their first commit, and it was deemed unnecessary clutter to show additions of these thousands of paths as a patch. "git log" learned to show the patch for the initial commit without requiring --root command line option at 0f03ca94 (config option log.showroot to show the diff of root commits, 2006-11-23). Teach gitk to respect log.showroot. [paulus@samba.org: Cleaned up the Tcl a bit, use --bool on the git config call] Signed-off-by: NMarcus Karlsson <mk@acc.umu.se> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 23 3月, 2012 1 次提交
-
-
由 Paul Mackerras 提交于
Sometimes one wants to see the different between two commits that are a long distance apart in the graph display. This is difficult to do with the "Diff this -> selected" and "Diff selected -> this" menu items because the need to maintain the selection means that one can't use the find facilities or the reference list window to navigate from one to the other. This provides an alternative using the mark. Having found one commit, one marks it with the "Mark this commit" menu item, then navigates to the other commit and uses the new "Diff this -> marked commit" and/or "Diff marked commit -> this" menu items. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 19 3月, 2012 7 次提交
-
-
由 Paul Mackerras 提交于
On large repositories such as the Linux kernel, it can take quite a noticeable time (several seconds) for gitk to resolve short SHA1 IDs to their long form. This speeds up the process by maintaining lists of IDs indexed by the first 4 characters of the SHA1 ID, speeding up the search by a factor of 65536 on large repositories. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Jonathan Nieder 提交于
The following only concerns systems using X and the client-side font rendering framework from freedesktop.org. Windows and Mac OS X are not affected. Starting with version 8.5, Tk uses freetype and fontconfig by default to render fonts on platforms that support it. Gitk currently defaults to the font Helvetica for the interface and Courier for diffs, and both unfortunately look rather bad on screen in the default configuration on many Linux distros with anti-aliasing and poor hinting. It is better to default to "sans" and "monospace", which are mapped by fontconfig to some appropriate font of the sysadmin and user's choosing (typically Bitstream Vera Sans and Mono). The result looks more sensible and it makes gitk feel like a well-behaved software citizen since its fonts match other native apps. This patch does not change the appearance of gitk for users that have already run it, since gitk uses the remembered UI and diff font names from ~/.gitk. Requested-by: NMichael Biebl <biebl@debian.org> Reviewed-by: NJosh Triplett <josh@joshtriplett.org> Acked-by: NMark Hills <mark@pogo.org.uk> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Frédéric Brière 提交于
This prevents a search for a number like "105" on "All Fields" from matching against the raw author and commit timestamps. These timestamps were already not searchable by themselves, and the displayed format does not match the query string anyway. Signed-off-by: NFrédéric Brière <fbriere@fbriere.net> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Jim Meyering 提交于
Automake's contribution guidelines suggest using "git describe" output in commit logs to reference previous commits. By contrast, in coreutils, I had acquired the habit of using a bare SHA1 prefix (8 hex digits), since gitk creates clickable links for that, and not for "git describe" output. I prefer the readability of the full "git describe" output, yet want to retain the gitk links, so this renders as clickable not just SHA1-like strings, but also an SHA1-like string that is prefixed by "-g". Signed-off-by: NJim Meyering <meyering@redhat.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Pat Thoyts 提交于
Launching 'gitk -- .' or 'gitk -- ..\t' restricts the display to files under the given directory but the file list is left empty. This is because the path_filter function fails to match the filenames which are relative to the working tree to the filter which is filessytem relative. This solves the problem by making both names fully qualified filesystem paths before performing the comparison. Tested-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Pat Thoyts 提交于
This commit converts the user preferences dialog into a tabbed property sheet grouping general properties, colours and font selections onto separate pages. The previous implementation was exceeding the screen height on some systems and this avoids such problems and permits extension using new pages in the future. If themed Tk is unavailable or undesired a reasonable facsimile of the tabbed notebook widget is used instead. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
Previously, when run in a subdirectory, gitk would show the name of this subdirectory as title, which was misleading. When run with GIT_DIR set, it would show the cwd, which is even more misleading. In case of non-bare repos, the .git suffix in the path is skipped. Signed-off-by: NZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-
- 08 10月, 2011 1 次提交
-
-
由 Jonathan Nieder 提交于
When commit 6e2dda35 (Add new keybindings, 2005-09-22) added vi-style keybindings to gitk (an excellent idea!), instead of adopting the usual "hjkl = left, down, up, right" bindings used by less, vi, rogue, and many other programs, it used "ijkl = up, left, down, right" to mimic the inverted-T formation of the arrow keys on a qwerty keyboard, in the style of Lode runner. So using 'j' and 'k' to scroll through commits produces utterly confusing results to the vi user, as 'k' moves down and 'j' moves to the previous commit. Luckily most non-vi-users are probably using an alternate set of keys (cursor keys or z/x + n/p) anyway. Switch to the expected vi/nethack convention. Requested-by: NJosh Triplett <josh@joshtriplett.org> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 24 7月, 2011 10 次提交
-
-
由 Yggy King 提交于
Gitk can search for commits touching a specified path. The search text is always treated as a regular expression, regardless of the matching option selected (Exact, IgnCase, or Regexp). In particular, backslashes escape the next character. This is inconvenient on Windows systems, where backslashes are the norm for path specifiers, for example when copy/pasting from Windows Explorer or a cmd shell -- these copy-pasted paths must be manually modified in the gitk search text edit box before they will work. This change uses the match option "Exact" to mean that a slash is a slash, not part of a regular expression. Backslashes are converted to frontslashes before searching, thus allowing easy copy/pasting of paths on Windows systems. If the previous behaviour of "touching paths" search is desired, simply select the "Regexp" search mode. One potential drawback is that the default setting for the match option ($findtype in the code) is "Exact", and so this change alters the default behaviour, which may confuse users and lead to bug reports. Signed-off-by: NYggy King <yggy@zeroandone.ca> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Martin von Zweigbergk 提交于
"git rev-parse --is-inside-work-tree" is currently used to determine whether to show modified files in gitk (the red and green fake commits). This does not work if the current directory is not inside the work tree, as can be the case e.g. if GIT_WORK_TREE is set. Instead, check if the repository is not bare and that we are not inside the .git directory. Signed-off-by: NMartin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Martin von Zweigbergk 提交于
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>
-
由 Paul Mackerras 提交于
Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 29 5月, 2011 3 次提交
-
-
由 Raphael Zimmerer 提交于
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>
-
由 Anders Kaseorg 提交于
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>
-
由 Anders Kaseorg 提交于
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>
-
- 09 4月, 2011 1 次提交
-
-
由 Anders Kaseorg 提交于
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>
-
- 09 3月, 2011 2 次提交
-
-
由 Pat Thoyts 提交于
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>
-
由 Paul Mackerras 提交于
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>
-
- 19 1月, 2011 2 次提交
-
-
由 Skip 提交于
Signed-off-by: NSkip <bsvskip@rambler.ru> Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Anders Kaseorg 提交于
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>
-
- 14 12月, 2010 1 次提交
-
-
由 Alexandre 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: NAlexandre Erwin Ittner <alexandre@ittner.com.br> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 12月, 2010 4 次提交
-
-
由 Stefan Haller 提交于
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>
-
由 Stefan 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: NStefan Haller <stefan@haller-berlin.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Thomas 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: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Peter Krefting 提交于
Signed-off-by: NPeter Krefting <peter@softwolves.pp.se> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 30 5月, 2010 1 次提交
-
-
由 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: NKirill Smelkov <kirr@mns.spb.ru> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 17 4月, 2010 1 次提交
-
-
由 Jens 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: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 20 3月, 2010 4 次提交
-
-
由 Pat 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: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Pat Thoyts 提交于
Help contributors use the correct indentation style. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Pat Thoyts 提交于
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>
-
由 Jonathan 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: NSteve Cotton <steve0001@s.cotton.clara.co.uk> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-