summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* git-gui: avoid an error message when removing the last remotePat Thoyts2013-06-151-2/+4
| | | | | | | | | | When the last remote is removed on a system that has tearoff menu items the code that adjusts the fetch and prune menus may raise an error when probing the menu entry for a non-existing -label option. Check the entry type to avoid this fault. Reported-by: Vedran Miletić <rivanvx@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: change dialog button positions for Windows to suit platform.Pat Thoyts2013-05-171-1/+3
| | | | | | On windows it is more common to have cancel furthest on the right. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: allow "\ No newline at end of file" for linewise stagingHeiko Voigt2013-05-161-2/+9
| | | | | | | | | Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss <tobias.preuss@googlemail.com> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix the mergetool launcher for the Beyond Compare tool.Pat Thoyts2013-02-221-2/+2
| | | | | | | | | When using Beyond Compare as the mergetool it fails to save the merged result correctly due to a quoting problem when executing the tool. This patch solves the quoting problem. Signed-off-by: Warren Falk <warren@warrenfalk.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: remove .git/CHERRY_PICK_HEAD after committingBeat Bolli2012-09-171-0/+1
| | | | | | | | | | | Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Fix a loose/lose mistakeBeat Bolli2012-09-171-1/+1
| | | | | | Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix git-gui crash due to uninitialized variableClemens Buchacher2012-01-221-0/+1
| | | | | | | | | Recently, a clone initiated via git gui on Windows crashed on me due to an "unknown variable cdone". It turns out that there is a code path where this variable is used uninitialized. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: handle shell script text filters when loading for blame.Pat Thoyts2011-12-091-11/+8
| | | | | | | | | | | | | | When loading a file into the blame window git-gui does all the work and must handle the text conversion filters if defined. On Windows it is necessary to detect the need for a shell script explicitly. Such filter commands are run using non-blocking I/O but this has the unfortunate side effect of losing any error that might be reported when the pipe is closed. Switching to blocking mode just before closing enables reporting of errors in the filter scripts to the user. Tested-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: don't warn for detached head when rebasingBert Wesarg2011-11-051-1/+3
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: make config gui.warndetachedcommit a booleanBert Wesarg2011-11-052-1/+2
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: add config value gui.diffopts for passing additional diff optionsTilman Vogel2011-11-052-0/+2
| | | | | Signed-off-by: Tilman Vogel <tilman.vogel@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: sort the numeric ansi codesPat Thoyts2011-11-041-1/+1
| | | | | | This ensures that underline does not conflict with inverse colors. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: support underline style when parsing diff outputPat Thoyts2011-11-041-1/+1
| | | | | Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix spelling error in sshkey.tclDejan Ribič2011-10-311-1/+1
| | | | | | | | Spelling error originally reported to Ubuntu as launchpad bug #879427. Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Dejan Ribič <dejan.ribic@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: include the file path in guitools confirmation dialogBert Wesarg2011-10-211-2/+8
| | | | | | | | | | For those guitools that require a filename, display this filename when asking the user to confirm the tool launch. [PT: modified to use positional parameters for i18n] Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: span widgets over the full file output area in the blame viewBert Wesarg2011-10-211-3/+6
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: use a tristate to control the case mode in the searchbarBert Wesarg2011-10-211-7/+17
| | | | | | | | | | | The config is now called gui.search.case and can have the three values: no/yes/smart. yes is the default. It also resets the case detection in smart mode, when the entry field was cleared by the use. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: set suitable extended window manager hints.Pat Thoyts2011-10-195-0/+5
| | | | | | | | This patch uses recent Tk attributes support to specify the intended use of new toplevels by setting the correct EWMH hint. This helps modern window managers to apply sensible decoration for the tooltip and dialogs. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix display of path in browser titleBert Wesarg2011-10-191-1/+7
| | | | | | | | Ensure the browser path is shown on the title with a / suffix and escape any backslashes or newlines in path elements before display. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* Merge branch 'bw/searching'gitgui-0.15.0Pat Thoyts2011-10-193-17/+196
|\
| * git-gui: enable the smart case sensitive search only if gui.search.smartcase ↵Pat Thoyts2011-10-191-3/+7
| | | | | | | | | | | | is true Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: catch invalid or complete regular expressions and treat as no match.Pat Thoyts2011-10-191-7/+9
| | | | | | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: theme the search and line-number entry fields on blame screenPat Thoyts2011-10-193-8/+100
| | | | | | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: add search history to searchbarBert Wesarg2011-10-181-0/+60
| | | | | | | | | | | | | | Use the up/down keys to browse the history. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: add regexp search mode to the searchbarBert Wesarg2011-10-181-1/+11
| | | | | | | | | | | | | | It's off by default, but can be enabled via the config gui.search.regexp. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: add smart case search mode in searchbarBert Wesarg2011-10-181-1/+12
| | | | | | | | | | | | | | | | | | | | Setting config gui.search.smartcase to true, the search mode in the searchbar (from the blame view) is by default case-insensitive. But entering an upper case letter into the search field activates the case- sensitive search mode. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: include the number of untracked files to stage when asking the userPat Thoyts2011-10-181-1/+2
| | | | | | | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: new config to control staging of untracked filesBert Wesarg2011-10-182-1/+31
| | | | | | | | | | | | | | The default is the current "ask". Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: use "untracked" for files which are not known to gitBert Wesarg2011-10-181-5/+5
| | | | | | | | | | | | | | | | "untracked" is the right phrase for files new to git. For example git-status uses this phrase. Also make the question shorter. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: fix unintended line break in message stringBert Wesarg2011-10-181-2/+1
|/ | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: incremental goto line in blame viewBert Wesarg2011-10-151-4/+11
| | | | | | | The view jumps now to the given line number after each key press. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: clear the goto line input when hidingBert Wesarg2011-10-151-0/+1
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: only accept numbers in the goto-line inputBert Wesarg2011-10-151-2/+11
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: search and linenumber input are mutual exclusive in the blame viewBert Wesarg2011-10-151-6/+16
| | | | | | | | It was possible to open the search input (Ctrl+S) and the goto-line input (Ctrl+G) at the same time. Prevent this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: deal with unknown files when pressing the "Stage Changed" buttonHeiko Voigt2011-10-061-0/+9
| | | | | | | | | | | As a shortcut the "Stage Changed" button can be used to stage all current changes in the worktree which are not set to ignore. Previously unknown files would be ignored. The user might want to say: "Just save everything in my worktree". To support this workflow we now ask whether the user also wants to stage the unknown files if there are some present. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.Pat Thoyts2011-07-191-2/+0
| | | | | | | The 'n' binding should cause the next match to be selected but results in the search field gaining focus and additional 'n's being appended. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Add keyboard shortcuts for search and goto commands in blame view.David Fries2011-07-192-1/+7
| | | | | | | | | | | Use forward-slash or Control-S to bring up the search dialog. In the blame view, Enter or 'n' jump to the next selected region while Shift-Enter or Shift-n will jump to the previous selected region. Within the search control, hitting Enter will now jump to the next matching region. Signed-off-by: David Fries <David@Fries.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Enable jumping to a specific line number in blame view.David Fries2011-07-192-0/+75
| | | | | | | | | | This patch adds a goto control similar to the search control currently available. The goto control permits the user to specify a line number to jump to. When in blame, Control-G is bound to display this control. Signed-off-by: David Fries <David@Fries.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* Fix tooltip display with multiple monitors on windows.Pat Thoyts2011-07-112-4/+4
| | | | | | | | | On Windows the position of a window may be negative on a monitor to the left of the primary display. A plus sign is used as the separator between the width and height and the positional parts of the geometry so always include the plus sign even for negative positions on this platform. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: warn when trying to commit on a detached headHeiko Voigt2011-05-201-0/+15
| | | | | | | | | The commandline is already warning when checking out a detached head. Since the only thing thats potentially dangerous is to create commits on a detached head lets warn in case the user is about to do that. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0Pat Thoyts2011-03-251-47/+54
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-271-0/+7
| | | | | | | | | | Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-271-47/+47
| | | | | | | | | | Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-gui: fetch/prune all entry appears lastHeiko Voigt2011-02-241-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>
* | git-gui: fetch/prune all entry only for more than one entryHeiko Voigt2011-02-241-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>
* | git-gui: Include version check and test for tearoff menu entryPat Thoyts2011-02-151-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>
* | git-gui: teach fetch/prune menu to do it for all remotesHeiko Voigt2011-02-142-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>
* | git-gui: refactor remote submenu creation into subroutineHeiko Voigt2011-02-141-16/+24
| | | | | | | | | | Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: always default to the last merged branch in remote deleteHeiko Voigt2011-02-132-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: fix deleting item from all_remotes variableHeiko Voigt2011-02-131-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>
View Lorry Controller Status