Ticket #27485: gitsync.2.patch

base/src/macports1.0/macports.tcl

@@ -1942 +1942 @@
         switch -regexp -- [macports::getprotocol $source] {
             {^file$} {
                 set portdir [macports::getportdir $source]
-                if {[file exists $portdir/.svn]} {
+
+                if {![catch {macports::findBinary git} result] &&
+                    ![catch {exec sh -c "cd ${portdir} && [macports::findBinary git] rev-parse --is-inside-work-tree"} result]} {
+                    # determine what type of git repository this is
+                    if {![catch {exec sh -c "cd ${portdir} && [macports::findBinary git] config --local --get svn-remote.svn.url"} result]} {
+                        set git_commandline "cd ${portdir}; [macports::findBinary git] stash save; [macports::findBinary git] svn rebase; [macports::findBinary git] stash pop"
+                    } else {
+                        set git_commandline "cd ${portdir}; [macports::findBinary git] pull"
+                    }
+                    ui_debug $git_commandline
+                    if {
+                        [catch {
+                            if {[getuid] == 0} {
+                                set euid [geteuid]
+                                set egid [getegid]
+                                ui_debug "changing euid/egid - current euid: $euid - current egid: $egid"
+                                setegid [name_to_gid [file attributes $portdir -group]]
+                                seteuid [name_to_uid [file attributes $portdir -owner]]
+                            }
+                            system $git_commandline
+                            if {[getuid] == 0} {
+                                seteuid $euid
+                                setegid $egid
+                            }
+                        }]
+                    } {
+                        ui_debug "$::errorInfo"
+                        ui_error "Synchronization of the local ports tree failed doing a git update"
+                        incr numfailed
+                        continue
+                    }
+                } elseif {[file exists $portdir/.svn]} {
                     set svn_commandline "[macports::findBinary svn] update --non-interactive ${portdir}"
                     ui_debug $svn_commandline
                     if {