Permalink
Commits on Sep 14, 2010
  1. git-gui 0.13

    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Sep 14, 2010
Commits on Sep 13, 2010
  1. git-gui: avoid mis-encoding the copyright message on Windows.

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Sep 13, 2010
  2. git-gui: Update Swedish translation (521t).

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    nafmo committed with patthoyts Sep 12, 2010
Commits on Aug 18, 2010
  1. git-gui: ensure correct application termination in git-gui--askpass

    With Tk 8.5 the askpass utility can hang waiting for the wish shell
    implicit event loop to exit. This patch uses an explicit event loop
    to ensure correct application termination.
    
    Reported-by: Anders Kaseorg <andersk@mit.edu>
    Tested-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 18, 2010
Commits on Aug 12, 2010
  1. git-gui: handle textconv filter on Windows and in development

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 7, 2010
  2. git-gui: use shell to launch textconv filter in "blame"

    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: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    moy committed with patthoyts Aug 5, 2010
Commits on Aug 7, 2010
  1. git-gui: display error launching blame as a message box.

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 7, 2010
  2. git-gui: Make usage statement visible on Windows.

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 7, 2010
Commits on Aug 2, 2010
  1. git-gui: fix size and position of window panes on startup

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 2, 2010
  2. git-gui: mc cannot be used before msgcat has been loaded

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Aug 2, 2010
Commits on Jul 30, 2010
  1. git-gui: use textconv filter for diff and blame

    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: Clément Poulain <clement.poulain@ensimag.imag.fr>
    Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
    Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Clément Poulain committed with patthoyts Jul 30, 2010
  2. git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32

    On Windows the Control-C binding is used to copy and is mapped to the Tk
    virtual event <<Copy>>. In the initial git-gui dialog this is also bound
    as an accelerator for the Clone menu item. The effect is that both bindings
    run, copying the text but resetting the clone page or switching to the clone
    page when the user tries to copy text from one of the entry fields.
    This patch avoids this by using Control-L instead for Windows only.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Mar 8, 2010
  3. git-gui: fix shortcut creation on cygwin

    When the user tried to create a desktop icon with git gui on cygwin
    wscript was complaining about an unknown option and displaying the
    non-native path as such.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 27, 2010
  4. git-gui: fix PATH environment for mingw development environment

    When creating a desktop shortcut from the gui the shortcut directly
    starts wish with the git-gui script. In the msysgit development
    environment some dll's reside in the mingw/bin directory which causes
    that git can not start because libiconv2.dll is not found.
    
    When using such a link the error is even more cryptic stating:
    "child killed: unknown signal"
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 27, 2010
  5. git-gui: fix usage of _gitworktree when creating shortcut for windows

    This fixes msysGit issue 425.
    
    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 27, 2010
  6. git-gui: fix "Explore Working Copy" for Windows again

    It has already been fixed in commit 454efb4 (git-gui (Win): make
    "Explore Working Copy" more robust, 2009-04-01), but has been broken in
    commit 21985a1 (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: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    marcows committed with patthoyts Feb 25, 2010
Commits on Jul 10, 2010
  1. git-gui: fix usage of themed widgets variable

    There was one forgotten global so NS was not visible to the method
    which resulted in an error.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Heiko Voigt committed with patthoyts Feb 20, 2010
  2. git-gui: Handle failure of core.worktree to identify the working dire…

    …ctory.
    
    Commit 21985a1 '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: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Jul 10, 2010
Commits on Feb 8, 2010
  1. Merge branch 'maint'

    * maint:
      git-gui: check whether systems nice command works or disable it
    spearce committed Feb 8, 2010
  2. git-gui: check whether systems nice command works or disable it

    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: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Heiko Voigt committed with spearce Feb 7, 2010
Commits on Feb 2, 2010
  1. git-gui: update french translation

    Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Emmanuel Trillaud committed with spearce Feb 2, 2010
  2. git-gui: update Japanese translation

    Update ja.po to match 2010-01-26 version of pot file.
    
    Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Nanako Shiraishi committed with spearce Feb 2, 2010
Commits on Jan 29, 2010
  1. Merge branch 'maint'

    * maint:
      git-gui: fix shortcut for menu "Commit/Revert Changes"
    spearce committed Jan 29, 2010
  2. git-gui: fix shortcut for menu "Commit/Revert Changes"

    The shortcut was not properly recognized previously.
    
    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Heiko Voigt committed with spearce Jan 29, 2010
Commits on Jan 28, 2010
  1. git-gui: Quote git path when starting another gui in a submodule

    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: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    jlehmann committed with spearce Jan 28, 2010
  2. git-gui: update Italian translation

    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    chunga committed with spearce Sep 7, 2009
  3. git-gui: Update Swedish translation (520t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    nafmo committed with spearce Jan 28, 2010
  4. git-gui: use themed tk widgets with Tk 8.5

    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: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    patthoyts committed with spearce Jan 26, 2010
  5. git-gui: Update German translation (12 new or changed strings).

    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    cstim committed with spearce Jan 26, 2010
Commits on Jan 26, 2010
  1. git-gui: Update translation template

    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Jan 26, 2010
Commits on Jan 25, 2010
  1. git-gui: Remove unused icon file_parttick

    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: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Jan 25, 2010
  2. git-gui: use different icon for new and modified files in the index

    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: Peter Oberndorfer <kumbayo84@arcor.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    kumbayo committed with spearce Jan 24, 2010
Commits on Jan 24, 2010
  1. git-gui: set GIT_DIR and GIT_WORK_TREE after setup

    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: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Oblomov committed with spearce Jan 23, 2010
Commits on Jan 23, 2010
  1. git-gui: update shortcut tools to use _gitworktree

    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Oblomov committed with spearce Jan 23, 2010
  2. git-gui: handle bare repos correctly

    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: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Oblomov committed with spearce Jan 23, 2010