Ticket #29093: portfetch.tcl.3.diff

portfetch.tcl

@@ -61 +61 @@
 commands bzr
 commands cvs
 commands svn
+commands git
+commands hg
 
 # Defaults
 default extract.suffix .tar.gz
@@ -97 +99 @@
 
 default git.cmd {[findBinary git $portutil::autoconf::git_path]}
 default git.dir {${workpath}}
-default git.branch {}
+default git.branch {HEAD}
+default git.pre_args ""
+default git.args ""
+default git.post_args {"${git.url} ${distname}"}
 
 default hg.cmd {[findBinary hg $portutil::autoconf::hg_path]}
 default hg.dir {${workpath}}
 default hg.tag {tip}
+default hg.args {"clone --rev ${hg.tag} ${hg.url} ${workpath}/${distname}"}
 
 # Set distfiles
 default distfiles {[portfetch::suffix $distname]}
@@ -369 +375 @@
 
 # Perform a git fetch
 proc portfetch::gitfetch {args} {
-    global worksrcpath
-    global git.url git.branch git.sha1 git.cmd
+    global distname
+    global git.dir git.args git.post_args git.branch
 
-    set options "-q"
-    if {[string length ${git.branch}] == 0} {
-        # if we're just using HEAD, we can make a shallow repo
-        set options "$options --depth=1"
-    }
-    set cmdstring "${git.cmd} clone $options ${git.url} ${worksrcpath} 2>&1"
-    ui_debug "Executing: $cmdstring"
-    if {[catch {system $cmdstring} result]} {
+    set git.args "clone -q -n"
+    if {[catch {command_exec git "" "2>&1"} result]} {
         return -code error [msgcat::mc "Git clone failed"]
     }
 
-    if {[string length ${git.branch}] > 0} {
-        set env "GIT_DIR=${worksrcpath}/.git GIT_WORK_TREE=${worksrcpath}"
-        set cmdstring "$env ${git.cmd} checkout -q ${git.branch} 2>&1"
-        ui_debug "Executing $cmdstring"
-        if {[catch {system $cmdstring} result]} {
-            return -code error [msgcat::mc "Git checkout failed"]
-        }
+    set git.dir ${git.dir}/${distname}
+    set git.args "checkout -q -b ${git.branch}"
+    set git.post_args ""
+    if {[catch {command_exec git "" "2>&1"} result]} {
+        return -code error [msgcat::mc "Git checkout failed"]
     }
 
     if {[info exists patchfiles]} {
@@ -401 +399 @@
 
 # Perform a mercurial fetch.
 proc portfetch::hgfetch {args} {
-    global worksrcpath prefix_frozen
-    global hg.url hg.tag hg.cmd
-
-    set cmdstring "${hg.cmd} clone --rev ${hg.tag} ${hg.url} ${worksrcpath} 2>&1"
-    ui_debug "Executing: $cmdstring"
-    if {[catch {system $cmdstring} result]} {
+    if {[catch {command_exec hg "" "2>&1"} result]} {
         return -code error [msgcat::mc "Mercurial clone failed"]
     }