Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 18, 2008
  1. @spearce

    git-gui 0.12

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Dec 17, 2008
  1. @dscho @spearce

    git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL

    dscho authored spearce committed
    In dc87183(Only use GIT_CONFIG in "git config", not other programs),
    GIT_CONFIG_LOCAL was rested in peace, in favor of not reading
    /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Dec 10, 2008
  1. @spearce

    git-gui: Update Hungarian translation for 0.12

    Miklos Vajna authored spearce committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @nafmo @spearce

    git-gui: Fixed typos in Swedish translation.

    nafmo authored spearce committed
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Dec 9, 2008
  1. @nafmo @spearce

    git-gui: Updated Swedish translation (515t0f0u).

    nafmo authored spearce committed
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @spearce

    git gui: update Italian translation

    Michele Ballabio authored spearce committed
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @spearce

    git-gui: Update Japanese translation for 0.12

    Nanako Shiraishi authored spearce committed
    Adds translation for one new message string.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Dec 8, 2008
  1. @frsk @spearce

    git-gui: Starting translation for Norwegian

    frsk authored spearce committed
    This file have been used locally for some time, and is near
    completion. Will put an effort into completing it later on,
    or just leave it as an excercise for other Norwegians.
    
    Signed-off-by: Fredrik Skolmli <fredrik@frsk.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @cstim @spearce

    git-gui: Update German (completed) translation.

    cstim authored spearce committed
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @spearce

    git-gui: Update po template to include 'Mirroring %s' message

    spearce authored
    A late addition to the message library.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. @angavrilov @spearce

    git-gui: Fix commit encoding handling.

    angavrilov authored spearce committed
    Commits without an encoding header are supposed to
    be encoded in utf8. While this apparently hasn't always
    been the case, currently it is the active convention, so
    it is better to follow it; otherwise people who have to
    use commitEncoding on their machines are unable to read
    utf-8 commits made by others.
    
    I also think that it is preferrable to display the warning
    about an unsupported value of commitEncoding more prominently,
    because this condition may lead to surprising behavior and,
    eventually, to loss of data.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. @angavrilov @spearce

    git-gui: Fix handling of relative paths in blame.

    angavrilov authored spearce committed
    Currently using '..' or '.' in the file path for gui blame
    causes it to break, because the path is passed inside the
    SHA:PATH spec to cat-file, which apparently does not understand
    such items. As a result, cat-file returns nothing, and the
    viewer crashes because of an "index out of range" error.
    
    This commit adds a simple function that normalizes such paths.
    I choose not to use [file normalize], because it uses some data
    from the file system, e.g. dereferences symlinks, and creates
    an absolute path, while blame may be used to inspect historical
    information that bears no relation to the current filesystem state.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Dec 2, 2008
  1. @burto @spearce

    git-gui: Teach start_push_anywhere_action{} to notice when remote is …

    burto authored spearce committed
    …a mirror.
    
    When the destination repository is a mirror, this function goofed by still
    passing a refspec to git-push. Now it notices that the remote is a mirror
    and holds the refspec.
    
    Signed-off-by: Mark Burton <markb@ordern.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 26, 2008
  1. @spearce

    git-gui: update Japanese translation

    Nanako Shiraishi authored spearce committed
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 23, 2008
  1. @chriscool @spearce

    git-gui: french translation update

    chriscool authored spearce committed
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 21, 2008
  1. @nafmo @spearce

    Updated Swedish translation (514t0f0u).

    nafmo authored spearce committed
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 19, 2008
  1. @spearce

    git gui: update Italian translation

    Michele Ballabio authored spearce committed
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 18, 2008
  1. @spearce

    Update Hungarian translation. 100% completed.

    Miklos Vajna authored spearce committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 16, 2008
  1. @angavrilov @spearce

    git-gui: Fix the search bar destruction handler.

    angavrilov authored spearce committed
    Since delete_this is an ordinary function, it
    should not be passed to cb; otherwise it produces
    errors when blame windows are closed. Unfortunately,
    it is not noticeable when blame is shown in the
    master window, so I missed this bug.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @spearce

    Update the po template

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @angavrilov @spearce

    git-gui: Implement automatic rescan after Tool execution.

    angavrilov authored spearce committed
    The Tools menu is generally intended for commands that
    affect the working directory or repository state. Thus,
    the user would usually want to initiate rescan after
    execution of a tool. This commit implements it.
    
    In case somebody would want to avoid rescanning after
    certain tools, it also adds an option that controls it,
    although it is not made available through the Add dialog.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. @angavrilov @spearce

    git-gui: Allow Tools request arguments from the user.

    angavrilov authored spearce committed
    While static commands are already useful, some tools need
    additional parameters to reach maximum usability. This
    commit adds support for passing them one revision name
    parameter, and one arbitrary string. With this addition,
    the tools menu becomes flexible enough to implement basic
    rebase support:
    
    [core]
            editor = kwrite
    [guitool "Rebase/Abort"]
            cmd = git rebase --abort
            confirm = yes
    [guitool "Rebase/Continue"]
            cmd = git rebase --continue
    [guitool "Rebase/Skip Commit"]
            cmd = git rebase --skip
            confirm = yes
    [guitool "Rebase/Start..."]
            cmd = git rebase $ARGS $REVISION $CUR_BRANCH
            title = Start Rebase
            prompt = Rebase Current Branch
            argprompt = Flags
            revprompt = New Base
            revunmerged = yes
    
    Some of the options, like title or prompt, are intentionally
    not included in the Add dialog to avoid clutter. Also, the
    dialog handles argprompt and revprompt as boolean vars.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. @angavrilov @spearce

    git-gui: Add a Tools menu for arbitrary commands.

    angavrilov authored spearce committed
    Due to the emphasis on scriptability in the git
    design, it is impossible to provide 100% complete
    GUI. Currently unaccounted areas include git-svn
    and other source control system interfaces, TopGit,
    all custom scripts.
    
    This problem can be mitigated by providing basic
    customization capabilities in Git Gui. This commit
    adds a new Tools menu, which can be configured
    to contain items invoking arbitrary shell commands.
    
    The interface is powerful enough to allow calling
    both batch text programs like git-svn, and GUI editors.
    To support the latter use, the commands have access
    to the name of the currently selected file through
    the environment.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. @angavrilov @spearce

    git-gui: Fix the after callback execution in rescan.

    angavrilov authored spearce committed
    The rescan function receives a callback command
    as its parameter, which is supposed to be executed
    after the scan finishes. It is generally used to
    update status. However, rescan may initiate a
    loading of a diff, which always calls ui_ready after
    completion. If the after handler is called before
    that, ui_ready will override the new status.
    
    This commit ensures that the after callback is
    properly threaded through the diff machinery.
    
    Since it uncovered the fact that force_first_diff
    actually didn't work due to an undeclared global
    variable, and the desired effects appeared only
    because of the race condition between the diff
    system and the rescan callback, I also reimplement
    this function to make it behave as originally
    intended.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. @angavrilov @spearce

    git-gui: Implement system-wide configuration handling.

    angavrilov authored spearce committed
    With the old implementation any system-wide options appear
    to be set locally in the current repository. This commit
    adds explicit handling of system options, essentially
    interpreting them as customized default_config.
    
    The difficulty in interpreting system options stems from
    the fact that simple 'git config' lists all values, while
    'git config --global' only values set in ~/.gitconfig,
    excluding both local and system options.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. @Oblomov @spearce

    git-gui: try to provide a window icon under X

    Oblomov authored spearce committed
    When running under X, we try to set up a window icon by providing a
    hand-crafted 16x16 Tk photo image equivalent to the .ico. Wrap in a
    catch because the earlier Tcl/Tk 8.4 releases didn't provide the 'wm
    iconphoto' command.
    
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 11, 2008
  1. @angavrilov @spearce

    git-gui: Request blame metadata in utf-8.

    angavrilov authored spearce committed
    The blame builtin now supports automatic conversion of
    metadata encoding. By default it is converted to the
    character set specified by i18n.logoutputencoding.
    
    Since gui blame expects the data in utf-8, it is
    necessary to specify the desired encoding directly.
    An old version of the blame command will simply
    ignore the option.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @angavrilov @spearce

    git-gui: Add the Show SSH Key item to the clone dialog.

    angavrilov authored spearce committed
    The user might need to see the key before cloning a repository.
    This patch makes the relevant menu item available in the Select
    Repository/Clone dialog.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @angavrilov @spearce

    git-gui: Fix focus transition in the blame viewer.

    angavrilov authored spearce committed
    Now that the blame viewer has a search panel, it should be
    taken into account by the focus transition code. Otherwise
    showing a commit tip (by accidentally moving the mouse to
    the text frame) causes the focus to transfer away from the
    search field.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 2, 2008
  1. @cstim @spearce

    git-gui: Update German translation.

    cstim authored spearce committed
    Not yet completed, though.
    
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Nov 1, 2008
  1. @spearce

    git-gui: Do not munge conflict marker lines in a normal diff

    Johannes Sixt authored spearce committed
    Previously, conflict markers were highlighted in two ways: (1) They
    received a distinguishing color; and (2) they had the '+' removed at the
    beginning of the line. However, by doing (2), a hunk that contained
    conflict markers could not be staged or unstaged because the resulting
    patch was corrupted. With this change we no longer modify the diff text
    of a 2-way diff, so that "Stage Hunk" and friends work.
    
    Note that 3-way diff of a conflicted file is unaffected by this change,
    and '++' before conflict markers is still removed. But this has no negative
    impact because in this mode staging hunks or lines is disabled anyway.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @angavrilov @spearce

    git-gui: Add a simple implementation of SSH_ASKPASS.

    angavrilov authored spearce committed
    OpenSSH allows specifying an external program to use
    for direct user interaction. While most Linux systems
    already have such programs, some environments, for
    instance, msysgit, lack it. This patch adds a simple
    fallback Tcl implementation of the tool.
    
    In msysgit it is also necessary to set a fake value of
    the DISPLAY variable, because otherwise ssh won't even
    try to use SSH_ASKPASS handlers.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @angavrilov @spearce

    git-gui: Add a dialog that shows the OpenSSH public key.

    angavrilov authored spearce committed
    Generating a new SSH key or finding an existing one may
    be a difficult task for non-technical users, especially
    on Windows.
    
    This commit adds a new dialog that shows the public key,
    or allows the user to generate a new one if none were found.
    Since this is a convenience/informational feature for new
    users, and the dialog is mostly read-only, it is located
    in the Help menu.
    
    The command line used to invoke ssh-keygen is designed to
    force it to use SSH_ASKPASS if available, or accept empty
    passphrases, but _never_ wait for user response on the tty.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Oct 10, 2008
  1. @spearce

    git-gui: Mark-up strings in show_{other,unmerged}_diff() for localiza…

    Johannes Sixt authored spearce committed
    …tion
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @spearce

    git-gui: Show a round number of bytes of large untracked text files

    Johannes Sixt authored spearce committed
    If an untracked text file is selected, then its contents are displayed
    instead of a diff. If the file is large, then the following hint is
    inserted at the top:
    
      * Untracked file is 14774881 bytes.
      * Showing only first 131072 bytes.
    
    Why exactly 131072 bytes? With this patch it is 100000 bytes.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Something went wrong with that request. Please try again.