- 20 10月, 2010 1 次提交
-
-
由 Pat Thoyts 提交于
git-gui currently uses its own logic to determine the work-tree setting but 'git rev-parse --toplevel' directly returns git's work-tree value by calling get_git_work_tree() and is therefore always correct. This fixes an inability to handle some repository configurations. In particular where .git is a file containing a path to the real directory (a cross-platform symbolic link). To continue to support older versions than 1.7.0, setting the work-tree by normalizing the --show-cdup value is more reliable as git-dir might be outside the work-tree entirely. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 08 10月, 2010 1 次提交
-
-
由 Pat Thoyts 提交于
Rather than attempting to trim off all the non-version number suffixes from the 'git version' result, let us scan along from the beginning until we find a non-numeric part and stop there. Any such dot-version number will be compatible with the Tcl package version comparison command which is the aim of this code. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 06 10月, 2010 2 次提交
-
-
由 Pat Thoyts 提交于
Without any standard channels the trace option is pretty useless on Win32 unless you can show the Tk console which captures such output. This also permits introspection of the running application to assist in debugging. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Pat Thoyts 提交于
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 05 10月, 2010 1 次提交
-
-
由 Sebastian Schuberth 提交于
It's a common case for Windows developers to have both Cygwin and msysGit installed. Unfortunately, some scenarios also require to have Cygwin in PATH. By default, Cygwin comes with nice.exe, while msysGit does not. Since git-gui calls nice if it is in PATH, this results in Cygwin's nice.exe being called from msysGit's git-gui. Mixing Cygwin and msysGit generally is not a good idea, and in this particular case it causes differences not being correctly detected. So we only call nice.exe on Windows if it is in the same directory as git.exe. This way, this work-around does neither affect a pure Cygwin environment, or the case when nice.exe will be shipped with msysGit at some point in time. This fixes msysGit issue 394. Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 14 9月, 2010 1 次提交
-
-
由 Pat Thoyts 提交于
On Windows the tcl script file will use the system encoding and attempting to convert the copyright mis-encodes the string. Instead, keep the message as ASCII and substitute in the correct unicode character when running. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 13 8月, 2010 2 次提交
-
-
由 Pat Thoyts 提交于
When developing/testing we run git-gui.sh directly and the makefile configured variables are not properly set. Configure the new shellpath accessor to handle this case. On Windows we may not find the shell so in this case revert to simply executing the filter command without the shell intermediate. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Matthieu Moy 提交于
The textconv filters may include multiple arguments and may make use of unix shell features. To maintain compatibility with 'git blame' ensure these commands are passed through bash. Reported-by: NKirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 08 8月, 2010 2 次提交
-
-
由 Pat Thoyts 提交于
This does not appear to Windows users and can follow the form of the fatal error messages near the top of the script file. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Pat Thoyts 提交于
On Windows stdout and stderr are not connected to anything so the usage statement is never shown to the user when an error is made with a command line like 'git gui browser'. Use a messagebox on windows. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 02 8月, 2010 2 次提交
-
-
由 Pat Thoyts 提交于
The themed panedwindow needs to have the sash position set after the widget has been mapped therefore apply this setting in the Map event binding. To avoid visible redraws as the application is constructed the main window should be withdrawn until all the widgets have been added Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Pat Thoyts 提交于
If someone attempts to use an older version that Tk 8.4 the error was masked by the lack of a mc command. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 30 7月, 2010 2 次提交
-
-
由 Clément Poulain 提交于
Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options. If checked and if the driver for the concerned file exists, git-gui calls diff and blame with --textconv option Signed-off-by: NClément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: NDiane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: NAxel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Markus Heidelberg 提交于
It has already been fixed in commit 454efb47 (git-gui (Win): make "Explore Working Copy" more robust, 2009-04-01), but has been broken in commit 21985a11 (git-gui: handle non-standard worktree locations, 2010-01-23) by accidentally replacing too much with a new variable. The problem can be reproduced when starting git-gui from within a subdirectory. The solution is to convert the path name, explorer.exe is invoked with, to a platform native name. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 11 7月, 2010 1 次提交
-
-
由 Pat Thoyts 提交于
Commit 21985a11 'git-gui: handle non-standard worktree locations' attempts to use either GIT_WORK_TREE or core.worktree to set the _gitworktree variable but these may not be set which leads to a failure to launch gitk to review history. Use _gitdir to set the location for a standard git layout where the parent of the .git directory is the working tree. Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 08 2月, 2010 1 次提交
-
-
由 Heiko Voigt 提交于
This fixes issue 394 from msysgit. It seems that the Gnuwin32 project provides a nice command but it returns a "not implemented" error. To help users we now try to execute once and disable it in case it fails. Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 29 1月, 2010 2 次提交
-
-
由 Heiko Voigt 提交于
The shortcut was not properly recognized previously. Signed-off-by: NHeiko Voigt <heiko.voigt@mahr.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jens Lehmann 提交于
In do_git_gui the path of the git executable has to be put into a list, otherwise calling it will fail when when spaces are present in its path. Reported-by: NHeiko Voigt <hvoigt@hvoigt.net> Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 28 1月, 2010 1 次提交
-
-
由 Pat Thoyts 提交于
This patch enables the use of themed Tk widgets with Tk 8.5 and above. These make a significant difference on Windows in making the application appear native. On Windows and MacOSX ttk defaults to the native look as much as possible. On X11 the user may select a theme using the TkTheme XRDB resource class by adding an line to the .Xresources file. The set of installed theme names is available using the Tk command 'ttk::themes'. The default on X11 is similar to the current un-themed style - a kind of thin bordered motif look. A new git config variable 'gui.usettk' may be set to disable this if the user prefers the classic Tk look. Using Tk 8.4 will also avoid the use of themed widgets as these are only available since 8.5. Some support is included for Tk 8.6 features (themed spinbox and native font chooser for MacOSX and Windows). Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 25 1月, 2010 2 次提交
-
-
由 Shawn O. Pearce 提交于
This icon hasn't been used in git gui. I think it dates back to the original set of icons I took from Paul Mackerras' prototype that I turned into git gui. Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Peter Oberndorfer 提交于
This allows to quickly differentiate between new and modified files in the index without selecting the file and looking at the diff. Signed-off-by: NPeter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 24 1月, 2010 8 次提交
-
-
由 Giuseppe Bilotta 提交于
Rather than juggling with the env var GIT_DIR around the invocation of gitk, set it and GIT_WORK_TREE after finishing setup, ensuring that any external tool works with the setup we're running with. This also allows us to remove a couple of conditionals when running gitk or git gui in a submodule, as we know that the variables are present and have to be unset and reset before and after the invocation. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Giuseppe Bilotta 提交于
Refactor checking for a bare repository into its own proc, that relies on git rev-parse --is-bare-repository if possible. For older versions of git we fall back to a logic such that the repository is considered bare if: * either the core.bare setting is true * or the worktree is not set and the directory name ends with .git The error message for the case of an unhandled bare repository is also updated to reflect the fact that the problem is not the funny name but the bareness. The new refactored proc is also used to disable the menu entry to explore the working copy, and to skip changing to the worktree before the gitk invocation. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Giuseppe Bilotta 提交于
Don't rely on the git worktree being the updir of the gitdir, since it might not be. Instead, define (and use) a new _gitworktree global variable, setting it to $GIT_WORK_TREE if present, falling back to core.worktree if defined, and finally to whatever we guess the correct worktree is. Getting core.worktree requires the config from the alleged git dir _gitdir to be loaded early. Supporting non-standard worktree locations also breaks the git-gui assumption (made when calling gitk) that the worktree was the dirname of $_gitdir and that, by consequence, the git dir could be set to the tail of $_gitdir once we changed to the worktree root directory. Therefore, we need to export a GIT_DIR environment variable set to the full, normalized path of $_gitdir instead. We also skip changing to the worktree directory if it's empty (i.e. if we're working on a bare repository). Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jeff Epler 提交于
Multiple lines can be selected in the diff viewer and applied all at once, rather than selecting "Stage Line For Commit" on each individual line. Signed-off-by: NJeff Epler <jepler@unpythonic.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jens Lehmann 提交于
To make it easier for users to deal with submodules, a special diff popup menu has been added for submodules. The "Show Less Context" and "Show More Context" entries have been removed, as they don't make any sense for a submodule summary. Four new entries are added to the top of the popup menu to gain access to more detailed information about the changes in a submodule than the plain summary does offer. These are: - "Visualize These Changes In The Submodule" starts gitk showing the selected commit range - "Visualize These Changes In The Submodule" starts gitk showing the whole submodule history of the current branch - "Visualize All Branch History In The Submodule" starts gitk --all in the submodule - "Start git gui In The Submodule" guess what :-) Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Giuseppe Bilotta 提交于
When git-gui is run from a .git dir, _gitdir would be set to "." by rev-parse, something that confuses the worktree detection. Fix by expanding the value of _gitdir to pwd in this special case. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jens Lehmann 提交于
When unstaging a partly staged file or submodule, the file_states list was not updated properly (unless unstaged linewise). Its index_info part did not contain the former head_info as it should have but kept its old value. This seems not to have had any bad effects but diminishes the value of the file_states list for future enhancements. Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Peter Krefting 提交于
When trying to run gitk on a branch name whose name matches a local file, it will toss an error saying that the name is ambiguous. Adding a pair of dashes will make gitk parse the options to the left of it as branch names. Since wish eats the first pair of dashes we throw at it, we need to add a second one to ensure they get through. Signed-off-by: NPeter Krefting <peter@softwolves.pp.se> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 07 1月, 2010 1 次提交
-
-
由 Vitaly _Vi Shukela 提交于
Signed-off-by: NVitaly _Vi Shukela <public_vi@tut.by> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 07 12月, 2009 1 次提交
-
-
由 Jindrich Makovicka 提交于
Due to a bug in Tk, git-gui almost always (unless git-gui is closed right after starting) produces an X window error message on exit, something like: X Error of failed request: RenderBadPicture (invalid Picture parameter) Major opcode of failed request: 150 (RENDER) Minor opcode of failed request: 7 (RenderFreePicture) Picture id in failed request: 0x3a000dc Serial number of failed request: 1965 Current serial number in output stream: 1980 Respective Tk bug report is here: http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 This bug is triggered only when the send command is blocked via rename send {} . The following patch re-enables send just before quiting git-gui to suppress the error. Signed-off-by: NJindrich Makovicka <makovick@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 28 10月, 2009 1 次提交
-
-
由 Vietor Liu 提交于
When the main window is maximized, if the screen height is shorter (e.g. Netbook screen 1024x600), both the partial commit pane and the status bar are hidden. The diff pane is resizable, so that it can use less vertical height, allowing the overall window to be shorter and still display both the entire commit pane and status bar. Signed-off-by: NVietor Liu <vietor@vxwo.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 26 9月, 2009 1 次提交
-
-
由 Jens Lehmann 提交于
This fixes a bug introduced by the "display summary when showing diff of a submodule" patch. It lead to a "no such variable" error when opening the diff context menu while no diff was shown. Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 13 9月, 2009 1 次提交
-
-
由 Alexey Borzenkov 提交于
I often close git gui window when it is maximized, and when I reopen it next time the it would usually become out of place (e.g. a huge window with a top-left corner somewhere close to the center of the screen). Fix it by storing and restoring wm state in config, as well as setting wm state to normal before retrieving wm geometry info. Signed-off-by: NAlexey Borzenkov <snaury@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 12 8月, 2009 1 次提交
-
-
由 Dan Zwell 提交于
When there is a large number of new or modified files, "display_all_files" takes a long time, and git-gui appears to hang. This change limits the number of files that are displayed. This limit can be set as gui.maxfilesdisplayed, and is 5000 by default. A warning is shown the first time the list of files is truncated in this GUI session. Subsequent truncations are not mentioned to the user. Signed-off-by: NDan Zwell <dzwell@zwell.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 10 8月, 2009 1 次提交
-
-
由 Jens Lehmann 提交于
As it is hard to say what changed in a submodule by looking at the hashes, let's show the colored submodule summary instead. Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 02 5月, 2009 1 次提交
-
-
由 Daniel A. Steffen 提交于
- detect more Tk.framework variants - fix apple menu setup, use native preferences menu item - don't set menu font Signed-off-by: NDaniel A. Steffen <das@users.sourceforge.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 08 4月, 2009 2 次提交
-
-
由 Ferry Huberts 提交于
In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: NFerry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Joerg Bornemann 提交于
Commit 584fa9cc introduced the global variable diff_empty_count, which is used in diff.tcl. This variable wasn't declared anywhere which resulted in an ugly error message box instead of the intended informative message. Signed-off-by: NJoerg Bornemann <joerg.bornemann@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 06 4月, 2009 1 次提交
-
-
由 Markus Heidelberg 提交于
Starting the Explorer from the git-gui menu "Explore Working Copy" didn't work, when git-gui was started via Windows Explorer shell extension (Git GUI Here) from a directory within the project. The Explorer raised an error message like this: Path "C:/somedir/worktree" is not available or not a directory It worked when started from the project directory itself, because then the path argument for the Explorer was just '.' (current directory) without any problematic forward slashes. To make it work, convert the path given as argument to explorer.exe to its native format with backslashes. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-