Permalink
Commits on Mar 25, 2011
  1. @patthoyts
  2. @patthoyts

    git-gui: detect the use of MUI langauge packs on Windows

    The Tcl msgcat package doesn't detect the use of a multi-lingual language
    pack on Windows 7. This means that a user may have their display language
    set to Japanese but the system installed langauge was English.
    This patch reads the relevent registry key to fix this before loading in
    the locale specific parts of git-gui.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Feb 18, 2011
Commits on Feb 27, 2011
  1. @sschuberth @gitster

    mergetool--lib: Add Beyond Compare 3 as a tool

    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sschuberth committed with gitster Feb 26, 2011
  2. @sschuberth @gitster

    mergetool--lib: Sort tools alphabetically for easier lookup

    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sschuberth committed with gitster Feb 26, 2011
Commits on Feb 24, 2011
  1. @patthoyts

    git-gui: fetch/prune all entry appears last

    The user might have got used to the order the remotes appeared previously.
    Lets add the all entry last so the all entry does not confuse previous
    users.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Tested-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 22, 2011
  2. @patthoyts

    git-gui: fetch/prune all entry only for more than one entry

    In case there is only one remote a fetch/prune all entry
    is redundant.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Tested-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 22, 2011
Commits on Feb 15, 2011
  1. @patthoyts

    git-gui: Include version check and test for tearoff menu entry

    The --all option for git fetch was added in v1.6.6 so ensure we have a usable version before adding
    the menu items.
    Sometimes people use tearoff menus and these offset the entry indices by one.
    
    Acked-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Feb 15, 2011
Commits on Feb 14, 2011
  1. @patthoyts

    git-gui: teach fetch/prune menu to do it for all remotes

    The commandline fetch already has this option for some time.  Since this
    was not available at the time git gui was written lets implement it now.
    
    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 13, 2011
  2. @patthoyts

    git-gui: refactor remote submenu creation into subroutine

    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 13, 2011
Commits on Feb 13, 2011
  1. @patthoyts

    git-gui: always default to the last merged branch in remote delete

    This is useful if you are directly working together with other
    developers pushing feature branches on a shared remote. You typically
    push feature branches to the remote so others can review. Once they are
    satisfied and the branch is merged into the main branch it needs to be
    deleted on the server.
    
    Since we did not yet have a preselected default branch in the remote
    delete dialog lets use the last merged branch if it is found on the
    server.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 12, 2011
  2. @patthoyts

    git-gui: fix deleting item from all_remotes variable

    lsearch and lreplace both take the variable content as argument and not
    just their name.
    
    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 12, 2011
Commits on Feb 6, 2011
  1. @patthoyts

    git-gui: instead of defaulting to home directory use working directory

    When starting git gui in a non-git directory it presents the user a
    dialog which asks to create, clone or open a repository. The filedialogs
    used to choose the path(s) would always default to the home directory of
    the user. This patch changes this behavior and uses the current working
    directory in which git gui was started as default.
    
    This is useful in various cases. First being that the user starts the
    gui in some directory and can go search to create, open or clone a
    repository from there. Another use case is that tools like filemanager
    context menues can transport a natural default when selected from a
    folder.
    
    Users who like to have their home folder as a default can fall back on
    starting git gui with its working directory set to the home folder.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 6, 2011
  2. @patthoyts

    git-gui: scroll down to default selection for push dialog

    If the list of remote/local branches is very long its inconvenient
    to scroll down and find the selected branch. This patch makes the
    widget automatically scroll down so its shown on the top.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 6, 2011
  3. @patthoyts

    git gui: keep selected branch when remote is changed in push dialog

    The selection of the branch to be pushed would be cleared when
    the remote was changed. This seems to be dependent on the fact that
    the selected content in the combobox was exported to the clipboard. It
    was only apparent when using the new ttk widget.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Heiko Voigt committed with patthoyts Feb 6, 2011
Commits on Jan 28, 2011
  1. @bertwesarg @patthoyts

    git-gui: handle meta diff header lines only in the header section

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  2. @bertwesarg @patthoyts

    git-gui: handle special content lines only in the diff header section

    These two also stop the diff header.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  3. @bertwesarg @patthoyts

    git-gui: always reset the current tag

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  4. @bertwesarg @patthoyts

    git-gui: move 3way diff autodetect up

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  5. @bertwesarg @patthoyts

    git-gui: there is no "mode *" diff header line

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  6. @bertwesarg @patthoyts

    git-gui: name also new symlinks so

    and rename them only in the diff header
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  7. @bertwesarg @patthoyts

    git-gui: handle index lines only in the diff header

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  8. @bertwesarg @patthoyts

    git-gui: rework handling of diff header

    The fix in ca53c3f (Fix diff parsing for lines starting with "--" or "++",
    2008-09-05) got a bug report from Johannes Sixt, that new files in the
    index now looks like:
    
      new file mode 100644
      --- /dev/null
      +++ b/foo
      @@ -0,0 +1 @@
      +foo
    
    The introduced problem was that the 'in-diff-header'-flag was unconditially
    disabled. Now it is only disabled when a hunk line is detected. And also
    re-enabled when we encounter a new diff header.
    
    The second part solves also the issue reported by me for diffs with file
    type changes (i.e. the ''error: Unhandled 2 way diff marker: {d}"', which
    comes from the second 'diff --git' line).
    
    Reported-by: Johannes Sixt <j.sixt@viscovery.net>
    Reported-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  9. @bertwesarg @patthoyts

    git-gui: learn more type change states

    Support the following states with type change in git-gui: AT, MT, TD, TM
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  10. @bertwesarg @patthoyts

    git-gui: remove 'no such variable' for s error when encounter unknown…

    … file states
    
    $s will be referenced in the error message. Which was broken since
    "git-gui: Automatically update-index all included files before commit"
    (bbe3b3b, 2006-11-16).
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
  11. @bertwesarg @patthoyts

    git-gui: fix typo in image data

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 9, 2010
Commits on Jan 27, 2011
  1. @ittner @patthoyts

    git-gui: add Brazilian Portuguese (pt-BR) translation

    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: Alexandre Erwin Ittner <alexandre@ittner.com.br>
    ittner committed with patthoyts Dec 13, 2010
Commits on Jan 24, 2011
  1. @raalkml @patthoyts

    git-gui: update russian translation

    Improve the translation of warning given by mergetool when staging files with
    conflict markers.
    
    Suggested-by: Alexey Shumkin <zapped@mail.ru>
    Tipping-vote-by: Dmitry Potapov <dpotapov@gmail.com>
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    raalkml committed with patthoyts Jan 19, 2011
  2. @raalkml @patthoyts

    git-gui: update russian translation

    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    raalkml committed with patthoyts Jan 17, 2011
  3. @Skip @patthoyts

    git-gui: spelling fixes in russian translation

    Signed-off-by: Skip <bsvskip@rambler.ru>
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Skip committed with patthoyts Jan 17, 2011
  4. @ftrvxmtrx @patthoyts

    git-gui: fix russian translation typos

    Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    ftrvxmtrx committed with patthoyts Jan 17, 2011
Commits on Dec 10, 2010
  1. @snaewe @patthoyts

    git-gui: use --exclude-standard to check for untracked files

    This fixes git-gui failing to display untracked files that are listed
    if core.excludefiles is set to ~/.gitexcludes
    
    [PT: added expansion of core.excludesfile value by tcl]
    
    Signed-off-by: Stefan Naewe <stefan.naewe@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    snaewe committed with patthoyts Dec 10, 2010
Commits on Dec 6, 2010
  1. @bertwesarg @patthoyts

    git-gui: Fix use of hunk tag for non-hunk content.

    The hunk tag d_@ lost its blue forground color in "apply color information
    from git diff output" (2010-10-22, 8f85599). But this tag was also used
    for non-hunk content like untracked file mime types or git submodules.
    
    Introduce a new tag for this type of content which has the blue forground
    again.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Dec 6, 2010
  2. @bertwesarg @patthoyts

    git-gui: Fix use of renamed tag.

    The d======= was renamed to d= in 4590307.
    
    Fix this.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Nov 29, 2010
Commits on Nov 22, 2010
  1. @bertwesarg @patthoyts

    git-gui: fix browsers [Up To Parent] in sub-sub-directories.

    browser_path used to end with a slash, so the regexp matches the empty string
    and therefore removes nothing.
    
    Fix this.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Nov 19, 2010
Commits on Nov 19, 2010
  1. @bertwesarg @patthoyts

    git-gui: respect conflict marker size

    Respect the conflict-marker-size attribute on paths when detecting merge
    conflicts.
    
    [PT: fixed problem with variable substitution in the regexps]
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    bertwesarg committed with patthoyts Nov 16, 2010