diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-17 03:06:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-17 03:06:55 (GMT) |
| commit | fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c (patch) | |
| tree | e09f2a46099de99a00e1a256b5dfad02927c7ad9 /git-gui/lib | |
| parent | 0dbd81251dbc516bb3bf07862c369fc582a4e5e0 (diff) | |
| parent | 8a383db4b28059becc3ebfd1b402299e34c3151f (diff) | |
| download | git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.zip git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.gz git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.bz2 | |
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
git-gui 0.18.0
* tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
Diffstat (limited to 'git-gui/lib')
| -rw-r--r-- | git-gui/lib/choose_repository.tcl | 4 | ||||
| -rw-r--r-- | git-gui/lib/diff.tcl | 11 | ||||
| -rw-r--r-- | git-gui/lib/mergetool.tcl | 4 | ||||
| -rw-r--r-- | git-gui/lib/remote.tcl | 6 |
4 files changed, 18 insertions, 7 deletions
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index 657f7d5..ee58981 100644 --- a/git-gui/lib/choose_repository.tcl +++ b/git-gui/lib/choose_repository.tcl @@ -286,7 +286,9 @@ method _next {action} { destroy $w_body if {![winfo exists $w_next]} { ${NS}::button $w_next -default active - pack $w_next -side right -padx 5 -before $w_quit + set pos -before + if {[tk windowingsystem] eq "win32"} { set pos -after } + pack $w_next -side right -padx 5 $pos $w_quit } _do_$action $this } diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index ec44055..30d9a79 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -764,8 +764,15 @@ proc apply_range_or_line {x y} { # context line set ln [$ui_diff get $i_l $next_l] set patch "$patch$pre_context$ln" - set n [expr $n+1] - set m [expr $m+1] + # Skip the "\ No newline at end of + # file". Depending on the locale setting + # we don't know what this line looks + # like exactly. The only thing we do + # know is that it starts with "\ " + if {![string match {\\ *} $ln]} { + set n [expr $n+1] + set m [expr $m+1] + } set pre_context {} } elseif {$c1 eq $to_context} { # turn change line into context line diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 3c8e73b..120bc40 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl @@ -189,9 +189,9 @@ proc merge_resolve_tool2 {} { } bc3 { if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"] + set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "-mergeoutput=$MERGED"] } else { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"] + set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "-mergeoutput=$MERGED"] } } ecmerge { diff --git a/git-gui/lib/remote.tcl b/git-gui/lib/remote.tcl index 5e4e7f4..4e5c784 100644 --- a/git-gui/lib/remote.tcl +++ b/git-gui/lib/remote.tcl @@ -245,7 +245,8 @@ proc update_all_remotes_menu_entry {} { set prune_m $remote_m.prune if {$have_remote > 1} { make_sure_remote_submenues_exist $remote_m - if {[$fetch_m entrycget end -label] ne "All"} { + if {[$fetch_m type end] eq "command" \ + && [$fetch_m entrycget end -label] ne "All"} { $fetch_m insert end separator $fetch_m insert end command \ @@ -259,7 +260,8 @@ proc update_all_remotes_menu_entry {} { } } else { if {[winfo exists $fetch_m]} { - if {[$fetch_m entrycget end -label] eq "All"} { + if {[$fetch_m type end] eq "command" \ + && [$fetch_m entrycget end -label] eq "All"} { delete_from_menu $fetch_m end delete_from_menu $fetch_m end |