diff options
| -rwxr-xr-x | git-gui/git-gui.sh | 1 | ||||
| -rw-r--r-- | git-gui/lib/branch_create.tcl | 3 | ||||
| -rw-r--r-- | git-gui/lib/branch_delete.tcl | 2 | ||||
| -rw-r--r-- | git-gui/lib/checkout_op.tcl | 24 | ||||
| -rw-r--r-- | git-gui/lib/database.tcl | 4 | ||||
| -rw-r--r-- | git-gui/lib/spellcheck.tcl | 14 | ||||
| -rw-r--r-- | git-gui/po/de.po | 26 |
7 files changed, 49 insertions, 25 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 7c25bb9808..9df49710e1 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -601,6 +601,7 @@ proc apply_config {} { } } +set default_config(branch.autosetupmerge) true set default_config(merge.diffstat) true set default_config(merge.summary) false set default_config(merge.verbosity) 2 diff --git a/git-gui/lib/branch_create.tcl b/git-gui/lib/branch_create.tcl index 53dfb4ce6b..3817771b94 100644 --- a/git-gui/lib/branch_create.tcl +++ b/git-gui/lib/branch_create.tcl @@ -183,6 +183,9 @@ method _create {} { if {$spec ne {} && $opt_fetch} { $co enable_fetch $spec } + if {$spec ne {}} { + $co remote_source $spec + } if {[$co run]} { destroy $w diff --git a/git-gui/lib/branch_delete.tcl b/git-gui/lib/branch_delete.tcl index 86c4f73370..ef1930b491 100644 --- a/git-gui/lib/branch_delete.tcl +++ b/git-gui/lib/branch_delete.tcl @@ -127,7 +127,7 @@ method _delete {} { foreach i $to_delete { set b [lindex $i 0] set o [lindex $i 1] - if {[catch {git update-ref -d "refs/heads/$b" $o} err]} { + if {[catch {git branch -D $b} err]} { append failed " - $b: $err\n" } } diff --git a/git-gui/lib/checkout_op.tcl b/git-gui/lib/checkout_op.tcl index 6e1411711b..caca88831b 100644 --- a/git-gui/lib/checkout_op.tcl +++ b/git-gui/lib/checkout_op.tcl @@ -16,6 +16,7 @@ field merge_base {}; # merge base if we have another ref involved field fetch_spec {}; # refetch tracking branch if used? field checkout 1; # actually checkout the branch? field create 0; # create the branch if it doesn't exist? +field remote_source {}; # same as fetch_spec, to setup tracking field reset_ok 0; # did the user agree to reset? field fetch_ok 0; # did the fetch succeed? @@ -44,6 +45,10 @@ method enable_fetch {spec} { set fetch_spec $spec } +method remote_source {spec} { + set remote_source $spec +} + method enable_checkout {co} { set checkout $co } @@ -145,7 +150,7 @@ method _finish_fetch {ok} { } method _update_ref {} { - global null_sha1 current_branch + global null_sha1 current_branch repo_config set ref $new_ref set new $new_hash @@ -172,6 +177,23 @@ method _update_ref {} { set reflog_msg "branch: Created from $new_expr" set cur $null_sha1 + + if {($repo_config(branch.autosetupmerge) eq {true} + || $repo_config(branch.autosetupmerge) eq {always}) + && $remote_source ne {} + && "refs/heads/$newbranch" eq $ref} { + + set c_remote [lindex $remote_source 1] + set c_merge [lindex $remote_source 2] + if {[catch { + git config branch.$newbranch.remote $c_remote + git config branch.$newbranch.merge $c_merge + } err]} { + _error $this [strcat \ + [mc "Failed to configure simplified git-pull for '%s'." $newbranch] \ + "\n\n$err"] + } + } } elseif {$create && $merge_type eq {none}} { # We were told to create it, but not do a merge. # Bad. Name shouldn't have existed. diff --git a/git-gui/lib/database.tcl b/git-gui/lib/database.tcl index d66aa3fe33..a18ac8b430 100644 --- a/git-gui/lib/database.tcl +++ b/git-gui/lib/database.tcl @@ -102,8 +102,8 @@ proc hint_gc {} { *]] if {$objects_current >= $object_limit} { - set objects_current [expr {$objects_current * 256}] - set object_limit [expr {$object_limit * 256}] + set objects_current [expr {$objects_current * 250}] + set object_limit [expr {$object_limit * 250}] if {[ask_popup \ [mc "This repository currently has approximately %i loose objects. diff --git a/git-gui/lib/spellcheck.tcl b/git-gui/lib/spellcheck.tcl index 9be748683c..78f344f08f 100644 --- a/git-gui/lib/spellcheck.tcl +++ b/git-gui/lib/spellcheck.tcl @@ -84,13 +84,19 @@ method _connect {pipe_fd} { regexp \ {International Ispell Version .* \(but really (Aspell .*?)\)$} \ $s_version _junk s_version + regexp {^Aspell (\d)+\.(\d+)} $s_version _junk major minor puts $pipe_fd ! ; # enable terse mode - puts $pipe_fd {$$cr master} ; # fetch the language - flush $pipe_fd - gets $pipe_fd s_lang - regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang + # fetch the language + if {$major > 0 || ($major == 0 && $minor >= 60)} { + puts $pipe_fd {$$cr master} + flush $pipe_fd + gets $pipe_fd s_lang + regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang + } else { + set s_lang {} + } if {$::default_config(gui.spellingdictionary) eq {} && [get_config gui.spellingdictionary] eq {}} { diff --git a/git-gui/po/de.po b/git-gui/po/de.po index 022b816ae1..f20955c185 100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-03-14 07:18+0100\n" -"PO-Revision-Date: 2008-02-16 21:52+0100\n" +"PO-Revision-Date: 2008-05-01 11:51+0200\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -1754,9 +1754,8 @@ msgid "Number of Diff Context Lines" msgstr "Anzahl der Kontextzeilen beim Vergleich" #: lib/option.tcl:127 -#, fuzzy msgid "Commit Message Text Width" -msgstr "Versionsbeschreibung:" +msgstr "Textbreite der Versionsbeschreibung" #: lib/option.tcl:128 msgid "New Branch Name Template" @@ -1895,40 +1894,36 @@ msgstr "Fehler beim Erstellen des Icons:" #: lib/spellcheck.tcl:57 msgid "Unsupported spell checker" -msgstr "" +msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" #: lib/spellcheck.tcl:65 -#, fuzzy msgid "Spell checking is unavailable" -msgstr "Rechtschreibprüfung fehlgeschlagen" +msgstr "Rechtschreibprüfung nicht verfügbar" #: lib/spellcheck.tcl:68 msgid "Invalid spell checking configuration" -msgstr "" +msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" #: lib/spellcheck.tcl:70 #, tcl-format msgid "Reverting dictionary to %s." -msgstr "" +msgstr "Wörterbuch auf %s zurückgesetzt." #: lib/spellcheck.tcl:73 -#, fuzzy msgid "Spell checker silently failed on startup" -msgstr "Rechtschreibprüfung fehlgeschlagen" +msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" #: lib/spellcheck.tcl:80 -#, fuzzy msgid "Unrecognized spell checker" -msgstr "Unbekannte Version von »aspell«" +msgstr "Unbekanntes Rechtschreibprüfungsprogramm" #: lib/spellcheck.tcl:180 msgid "No Suggestions" msgstr "Keine Vorschläge" #: lib/spellcheck.tcl:381 -#, fuzzy msgid "Unexpected EOF from spell checker" -msgstr "Unerwartetes EOF von »aspell«" +msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" #: lib/spellcheck.tcl:385 msgid "Spell Checker Failed" @@ -2002,6 +1997,3 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" #: lib/transport.tcl:168 msgid "Include tags" msgstr "Mit Markierungen übertragen" - -#~ msgid "Not connected to aspell" -#~ msgstr "Keine Verbindung zu »aspell«" |