summaryrefslogtreecommitdiffstats
path: root/lib/win32_shortcut.js (unfollow)
AgeCommit message (Collapse)AuthorFilesLines
2011-02-27mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth1-0/+7
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-27mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth1-47/+47
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-24git-gui: fetch/prune all entry appears lastHeiko Voigt1-12/+10
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>
2011-02-24git-gui: fetch/prune all entry only for more than one entryHeiko Voigt1-2/+2
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>
2011-02-15git-gui: Include version check and test for tearoff menu entryPat Thoyts1-10/+14
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>
2011-02-14git-gui: teach fetch/prune menu to do it for all remotesHeiko Voigt2-0/+74
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>
2011-02-14git-gui: refactor remote submenu creation into subroutineHeiko Voigt1-16/+24
Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-02-13git-gui: always default to the last merged branch in remote deleteHeiko Voigt3-1/+14
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>
2011-02-13git-gui: fix deleting item from all_remotes variableHeiko Voigt1-2/+2
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>
2011-02-06git-gui: instead of defaulting to home directory use working directoryHeiko Voigt1-11/+3
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>
2011-02-06git-gui: scroll down to default selection for push dialogHeiko Voigt1-0/+1
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>
2011-02-06git gui: keep selected branch when remote is changed in push dialogHeiko Voigt1-1/+3
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>
2011-01-28git-gui: handle meta diff header lines only in the header sectionBert Wesarg1-7/+2
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-28git-gui: handle special content lines only in the diff header sectionBert Wesarg1-6/+9
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>
2011-01-28git-gui: always reset the current tagBert Wesarg1-1/+2
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-28git-gui: move 3way diff autodetect upBert Wesarg1-3/+4
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-28git-gui: there is no "mode *" diff header lineBert Wesarg1-2/+1
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-28git-gui: name also new symlinks soBert Wesarg1-3/+5
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>
2011-01-28git-gui: handle index lines only in the diff headerBert Wesarg1-2/+2
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-28git-gui: rework handling of diff headerBert Wesarg1-3/+15
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>
2011-01-28git-gui: learn more type change statesBert Wesarg3-5/+19
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>
2011-01-28git-gui: remove 'no such variable' for s error when encounter unknown file ↵Bert Wesarg1-1/+2
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>
2011-01-28git-gui: fix typo in image dataBert Wesarg1-2/+2
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-27git-gui: add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner2-0/+2737
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>
2011-01-24git-gui: update russian translationAlex Riesen1-1/+1
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>
2011-01-24git-gui: update russian translationAlex Riesen1-288/+307
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-01-24git-gui: spelling fixes in russian translationSkip1-12/+12
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>
2011-01-24git-gui: fix russian translation typosSerge Ziryukin1-2/+2
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>
2010-12-10git-gui: use --exclude-standard to check for untracked filesStefan Naewe1-7/+11
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>
2010-12-06git-gui: Fix use of hunk tag for non-hunk content.Bert Wesarg2-7/+9
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>
2010-12-06git-gui: Fix use of renamed tag.Bert Wesarg1-4/+4
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>
2010-11-22git-gui: fix browsers [Up To Parent] in sub-sub-directories.Bert Wesarg1-1/+1
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>
2010-11-19git-gui: respect conflict marker sizeBert Wesarg2-7/+25
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>
2010-11-19git-gui: fix ANSI-color parsingBert Wesarg1-2/+10
git diff always outputs color reset commands, even when the color for the current part is disabled (ie. normal). But the current ANSI-color parsing code assumes that color start and reset commands appear in matching pairs. Relax this assumption. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-27git-gui: apply color information from git diff outputPat Thoyts2-2/+42
This patch extracts the ANSI color sequences from git diff output and applies these to the diff view window. This ensures that the gui view makes use of the current git configuration for whitespace display. ANSI codes may include attributes, foreground and background in a single sequence. Handle this and support bold and reverse attributes. Ignore all other attributes. Suggested-by: Tor Arvid Lund <torarvid@gmail.com> Suggested-by: Junio C Hamano <gitster@pobox.com> Tested-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-27git-gui: use wordprocessor tab style to ensure tabs work as expectedPat Thoyts1-0/+1
The Tk text widget tab style is tabular where the first tab will align to the first tabstop and if that position is left of the current location then just a single character space is used. With the wordprocessor style a tab moves the next character position to the next rightmost tabstop as expected for viewing code. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-20git-gui: correct assignment of work-treePat Thoyts1-5/+14
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: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-07git-gui: use full dialog width for old name when renaming branchPat Thoyts1-1/+1
Let the combobox/option menu expand to fill the width of the dialog. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-07git-gui: generic version trimmingPat Thoyts1-5/+12
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: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-05git-gui: enable the Tk console when tracing/debugging on WindowsPat Thoyts1-0/+2
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: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-05git-gui: show command-line errors in a messagebox on WindowsPat Thoyts1-10/+16
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-10-05On Windows, avoid git-gui to call Cygwin's nice utilitySebastian Schuberth1-0/+2
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: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-09-14git-gui 0.13gitgui-0.13.0Pat Thoyts1-1/+1
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-09-13git-gui: avoid mis-encoding the copyright message on Windows.Pat Thoyts1-2/+2
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>
2010-09-13git-gui: Update Swedish translation (521t).Peter Krefting1-399/+403
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2010-08-18git-gui: ensure correct application termination in git-gui--askpassPat Thoyts1-6/+13
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>
2010-08-12git-gui: handle textconv filter on Windows and in developmentPat Thoyts2-3/+15
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>
2010-08-12git-gui: use shell to launch textconv filter in "blame"Matthieu Moy3-1/+10
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>
2010-08-08git-gui: display error launching blame as a message box.Pat Thoyts1-1/+6
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>
2010-08-08git-gui: Make usage statement visible on Windows.Pat Thoyts1-1/+7
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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-15 16:55:39 +0000