git-gui: add a part about format strings in po/README

[git.git] / lib / checkout_op.tcl

diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index f07262ca00876d885954ae15310a0faa197aa5ff..caca88831b7066c573917542d24a52e832dcff34 100644 (file)
--- a/lib/checkout_op.tcl
+++ b/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 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?
 
 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
 }
 
        set fetch_spec $spec
 }
 

+method remote_source {spec} {
+       set remote_source $spec
+}
+

 method enable_checkout {co} {
        set checkout $co
 }
 method enable_checkout {co} {
        set checkout $co
 }


@@ -124,7 +129,7 @@ method _finish_fetch {ok} {
                }
                if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
                        set ok 0
                }
                if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
                        set ok 0

-                       $w_cons insert "fatal: Cannot resolve $l_trck"
+                       $w_cons insert [mc "fatal: Cannot resolve %s" $l_trck]

                        $w_cons insert $err
                }
        }
                        $w_cons insert $err
                }
        }


@@ -145,7 +150,7 @@ method _finish_fetch {ok} {
 }
 
 method _update_ref {} {
 }
 
 method _update_ref {} {

-       global null_sha1 current_branch
+       global null_sha1 current_branch repo_config

 
        set ref $new_ref
        set new $new_hash
 
        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
 
                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.
        } elseif {$create && $merge_type eq {none}} {
                # We were told to create it, but not do a merge.
                # Bad.  Name shouldn't have existed.


@@ -236,7 +258,7 @@ method _update_ref {} {
                if {[catch {
                                git update-ref -m $reflog_msg $ref $new $cur
                        } err]} {
                if {[catch {
                                git update-ref -m $reflog_msg $ref $new $cur
                        } err]} {

-                       _error $this [append [mc "Failed to update '%s'." $newbranch] "\n\n$err"]
+                       _error $this [strcat [mc "Failed to update '%s'." $newbranch] "\n\n$err"]

                        return 0
                }
        }
                        return 0
                }
        }


@@ -280,7 +302,7 @@ The rescan will be automatically started now.
        } elseif {[is_config_true gui.trustmtime]} {
                _readtree $this
        } else {
        } elseif {[is_config_true gui.trustmtime]} {
                _readtree $this
        } else {

-               ui_status {Refreshing file status...}
+               ui_status [mc "Refreshing file status..."]

                set fd [git_read update-index \
                        -q \
                        --unmerged \
                set fd [git_read update-index \
                        -q \
                        --unmerged \


@@ -319,8 +341,8 @@ method _readtree {} {
 
        set readtree_d {}
        $::main_status start \
 
        set readtree_d {}
        $::main_status start \

-               "Updating working directory to '[_name $this]'..." \
-               {files checked out}
+               [mc "Updating working directory to '%s'..." [_name $this]] \
+               [mc "files checked out"]

 
        set fd [git_read --stderr read-tree \
                -m \
 
        set fd [git_read --stderr read-tree \
                -m \


@@ -351,7 +373,7 @@ method _readtree_wait {fd} {
                set err $readtree_d
                regsub {^fatal: } $err {} err
                $::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
                set err $readtree_d
                regsub {^fatal: } $err {} err
                $::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]

-               warn_popup [append [mc "File level merge required."] "
+               warn_popup [strcat [mc "File level merge required."] "

 
 $err
 
 
 $err
 


@@ -443,11 +465,11 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che
                $ui_comm delete 0.0 end
                $ui_comm edit reset
                $ui_comm edit modified false
                $ui_comm delete 0.0 end
                $ui_comm edit reset
                $ui_comm edit modified false

-               rescan [list ui_status "Checked out '$name'."]
+               rescan [list ui_status [mc "Checked out '%s'." $name]]

        } else {
                repository_state commit_type HEAD MERGE_HEAD
                set PARENT $HEAD
        } else {
                repository_state commit_type HEAD MERGE_HEAD
                set PARENT $HEAD

-               ui_status "Checked out '$name'."
+               ui_status [mc "Checked out '%s'." $name]

        }
        delete_this
 }
        }
        delete_this
 }


@@ -575,7 +597,7 @@ method _toplevel {title} {
 }
 
 method _fatal {err} {
 }
 
 method _fatal {err} {

-       error_popup [append [mc "Failed to set current branch.
+       error_popup [strcat [mc "Failed to set current branch.

 
 This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.
 
 
 This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.