[GRASS-SVN] r74499 - grass-addons/tools/svn2git

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-05-16 09:21:38 -0700 (Thu, 16 May 2019)
New Revision: 74499

Modified:
   grass-addons/tools/svn2git/0-migrate-fetch.sh
   grass-addons/tools/svn2git/1-migrate-core.sh
   grass-addons/tools/svn2git/3-rewrite-messages.sh
Log:
svn2git tools finalization before migration

Modified: grass-addons/tools/svn2git/0-migrate-fetch.sh
===================================================================
--- grass-addons/tools/svn2git/0-migrate-fetch.sh	2019-05-16 16:03:54 UTC (rev 74498)
+++ grass-addons/tools/svn2git/0-migrate-fetch.sh	2019-05-16 16:21:38 UTC (rev 74499)
@@ -12,8 +12,8 @@
     mkdir $DIR
     cd $DIR
     repo=`echo $1 | sed 's/-fetch//g' | sed 's/-legacy//g'`
-    # git svn init $OPT https://svn.osgeo.org/grass/$repo
-    git svn init $OPT file:///opt/osgeo/svn/repos/grass/$repo
+    git svn init $OPT https://svn.osgeo.org/grass/$repo
+    # git svn init $OPT file:///opt/osgeo/svn/repos/grass/$repo
     git svn $RANGE --authors-file=${SCRIPTPATH}/AUTHORS.txt fetch
     cd ..
 }
@@ -21,6 +21,6 @@
 # r31142 GRASS 7.0.0 development started
 fetch "grass-fetch" "--stdlayout" "-r31142:75000"
 # r72631 last commit to releasebranch_6_4
-fetch "grass-legacy-fetch" "--stdlayout" "-r1:72361"
+# fetch "grass-legacy-fetch" "--stdlayout" "-r1:72361"
 fetch "grass-addons-fetch"
 fetch "grass-promo-fetch"

Modified: grass-addons/tools/svn2git/1-migrate-core.sh
===================================================================
--- grass-addons/tools/svn2git/1-migrate-core.sh	2019-05-16 16:03:54 UTC (rev 74498)
+++ grass-addons/tools/svn2git/1-migrate-core.sh	2019-05-16 16:21:38 UTC (rev 74499)
@@ -13,12 +13,12 @@
     else
         branch_filter="releasebranch_[0-6]"
     fi
-    for branch in `git branch -r | grep $branch_filter | sed 's#  origin/##g'`; do
-        git branch $branch origin/$branch
+    for branch in `git branch -r | grep $branch_filter`; do
+        git branch $branch $branch
         git checkout $branch
     done
     git branch -D master
-    git branch master origin/trunk
+    git branch master trunk
     git checkout master
 
     # Rename tags
@@ -28,11 +28,11 @@
         tag_filter="grass_[0-6]"
     fi
     for i in `git branch -r | grep tags | grep $tag_filter`; do
-        b=`echo $i | sed 's#origin/##'`
+        b=`echo $i`
         if [ `echo $i | grep -c release` -gt 0 ] ; then
-            j=`echo $i | sed 's#origin/tags/release_[0-9]\+_##g'`
+            j=`echo $i | sed 's#tags/release_[0-9]\+_##g'`
         else
-            j=`echo $i | sed 's#origin/tags/##g'`
+            j=`echo $i | sed 's#tags/##g'`
         fi
         git branch $b $i
         d=`git log -1 --format=%cd --date=iso $b`
@@ -54,4 +54,4 @@
 }
 
 migrate_git "grass"
-migrate_git "grass-legacy"
+# migrate_git "grass-legacy"

Modified: grass-addons/tools/svn2git/3-rewrite-messages.sh
===================================================================
--- grass-addons/tools/svn2git/3-rewrite-messages.sh	2019-05-16 16:03:54 UTC (rev 74498)
+++ grass-addons/tools/svn2git/3-rewrite-messages.sh	2019-05-16 16:21:38 UTC (rev 74499)
@@ -31,6 +31,6 @@
 }
 
 rewrite_msg "grass"
-rewrite_msg "grass-legacy"
+# rewrite_msg "grass-legacy"
 rewrite_msg "grass-addons"
 rewrite_msg "grass-promo"