Revision: 76465
http://sourceforge.net/p/brlcad/code/76465
Author: starseeker
Date: 2020-07-24 13:46:02 +0000 (Fri, 24 Jul 2020)
Log Message:
-----------
Making scripts better reflect conversion process
If at all avoidable, we don't want to have to manually update the custom commit
information again now that repowork allows for post-conversion email
manipulation. However, we also want account-map to be accurate. The secondary
repositories in the SVN repository (rt3, geomcore, etc.) will eventually be
converted with svn-fast-export - they do not use the custom process developed
for the main history. Consequently, they will need a correct account-map file
with the most current addresses.
To handle this, we specifically stash the versions of the maps that match the
custom commits currently checked in and update the conversion scripts to
reference
them specifically. Also stash the email mapping file used by repowork, so we
can make sure we're capturing all updates made between the start of the
conversion
and the final post-processing.
Modified Paths:
--------------
brlcad/trunk/misc/CMakeLists.txt
brlcad/trunk/misc/repoconv/CONVERT.sh
brlcad/trunk/misc/repoconv/RESUME.sh
Added Paths:
-----------
brlcad/trunk/misc/repoconv/account-map_svnfexport.txt
brlcad/trunk/misc/repoconv/cvs_authormap_svnfexport.txt
brlcad/trunk/misc/repoconv/email_fixups.txt
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2020-07-24 12:58:09 UTC (rev 76464)
+++ brlcad/trunk/misc/CMakeLists.txt 2020-07-24 13:46:02 UTC (rev 76465)
@@ -115,7 +115,6 @@
repoconv/CONVERT.sh
repoconv/NOTES
repoconv/RESUME.sh
- repoconv/account-map
repoconv/audit_merges/audit_merges.cxx
repoconv/audit_merges/commit_list.txt
repoconv/checkout_dercs.sh
@@ -207,7 +206,11 @@
repoconv/custom/r29886_cvs_svn_rel-5-1-branch_sync.fi
repoconv/custom/r29886_cvs_svn_trunk_sync.fi
repoconv/custom/r29886_tags.fi
+ repoconv/account-map
+ repoconv/account-map_svnfexport.txt
repoconv/cvs_authormap
+ repoconv/cvs_authormap_svnfexport.txt
+ repoconv/email_fixups.txt
repoconv/cvs_repaired/sphflake.pix,v
repoconv/gitattributes
repoconv/gitignore.tar.gz
Modified: brlcad/trunk/misc/repoconv/CONVERT.sh
===================================================================
--- brlcad/trunk/misc/repoconv/CONVERT.sh 2020-07-24 12:58:09 UTC (rev
76464)
+++ brlcad/trunk/misc/repoconv/CONVERT.sh 2020-07-24 13:46:02 UTC (rev
76465)
@@ -56,7 +56,7 @@
sed -i 's/$Locker:[^$;"]*/$Locker/' src/other/URToolkit/tools/mallocNd.c,v
echo "Running cvs-fast-export $PWD"
-find . | ../../cvs-fast-export/cvs-fast-export -A ../../cvs_authormap >
../../brlcad_cvs_git.fi
+find . | ../../cvs-fast-export/cvs-fast-export -A
../../cvs_authormap_svnfexport.txt > ../../brlcad_cvs_git.fi
cd ../
../cvs-fast-export/cvsconvert -n brlcad 2>
../cvs_git_info/cvs_all_fast_export_audit.txt
cd ../
@@ -144,7 +144,7 @@
echo "Start main conversion"
REPODERCSDIR="$PWD/repo_dercs"
-./svnfexport ./brlcad_full_dercs.dump account-map $REPODERCSDIR
+./svnfexport ./brlcad_full_dercs.dump account-map_svnfexport.txt $REPODERCSDIR
# Create an svn revision to author map
svn log file://$REPODIR | grep "|" | grep "^r[0-9][0-9 ]" | grep -v \(no\
author\) | awk -F "|" '{print $1 $2}' | sed -e 's/r//' | sed -e 's/ $//' | sed
-e 's/ / /' > rev_map
@@ -153,7 +153,7 @@
# original ids if we're going to process the git notes down into
# the commit messages.
cd cvs_git && git fast-export --show-original-ids --all > ../brlcad_raw.fi &&
cd ..
-repowork -t -w -e brlcad_map -n -r cvs_git -s rev_map ~/brlcad_raw.fi
brlcad_final.fi
+repowork -t -w -e email_fixups.txt -n -r cvs_git -s rev_map ~/brlcad_raw.fi
brlcad_final.fi
mkdir brlcad_final.git && cd brlcad_final.git && git init
cat ../brlcad_final.fi | git fast-import
Modified: brlcad/trunk/misc/repoconv/RESUME.sh
===================================================================
--- brlcad/trunk/misc/repoconv/RESUME.sh 2020-07-24 12:58:09 UTC (rev
76464)
+++ brlcad/trunk/misc/repoconv/RESUME.sh 2020-07-24 13:46:02 UTC (rev
76465)
@@ -26,7 +26,7 @@
echo "Start main conversion"
REPODERCSDIR="$PWD/repo_dercs"
-./svnfexport ./brlcad_full_dercs.dump account-map $REPODERCSDIR
+./svnfexport ./brlcad_full_dercs.dump account-map_svnfexport.txt $REPODERCSDIR
# Clear previous "final" conversion
rm -rf brlcad_final.git brlcad_final.tar.gz
@@ -38,7 +38,7 @@
# original ids if we're going to process the git notes down into
# the commit messages.
cd cvs_git && git fast-export --show-original-ids --all > ../brlcad_raw.fi &&
cd ..
-repowork -t -w -e brlcad_map -n -r cvs_git -s rev_map ~/brlcad_raw.fi
brlcad_final.fi
+repowork -t -w -e email_fixups.txt -n -r cvs_git -s rev_map ~/brlcad_raw.fi
brlcad_final.fi
mkdir brlcad_final.git && cd brlcad_final.git && git init
cat ../brlcad_final.fi | git fast-import
Added: brlcad/trunk/misc/repoconv/account-map_svnfexport.txt
===================================================================
--- brlcad/trunk/misc/repoconv/account-map_svnfexport.txt
(rev 0)
+++ brlcad/trunk/misc/repoconv/account-map_svnfexport.txt 2020-07-24
13:46:02 UTC (rev 76465)
@@ -0,0 +1,102 @@
+Abhi2011 Abhijit Nandy <[email protected]>
+abhi2011 Abhijit Nandy <[email protected]>
+adam Adam Ross <[email protected]>
+agkphysics Aaron Keesing <[email protected]>
+andrecastelo André Castelo <[email protected]>
+anrgmrty Anurag Murty <[email protected]>
+bharder Brad Harder <[email protected]>
+bhinesley Brandon Hinesley <[email protected]>
+bob1961 Robert Parker <[email protected]>
+bparker Robert Parker <[email protected]>
+brlcad Christopher Sean Morrison <[email protected]>
+butler Lee Butler <[email protected]>
+caen23 Cezar El-Nazli <[email protected]>
+carlmoore Carl Moore <[email protected]>
+cjohnson Christopher Johnson <[email protected]>
+cnuzman Carl Nuzman <[email protected]>
+cprecup Cristina Precup <[email protected]>
+crdueck Chris Dueck <[email protected]>
+d_rossberg Daniel Rossberg <[email protected]>
+davidloman David Loman <[email protected]>
+ddreeves70 David Reeves <[email protected]>
+dgodbey David Godbey <[email protected]>
+dhoward Doug Howard <[email protected]>
+dpk Douglas Kingston <[email protected]>
+dtremenak Daniel Remenak <[email protected]>
+ebautu Elena Bautu <[email protected]>
+ejno Jonathan Engbert <[email protected]>
+erikg Erik Greenwald <[email protected]>
+erikgreenwald Erik Greenwald <[email protected]>
+g2asc Charles Kennedy <[email protected]>
+gabbar1947 Shubham Rathore <[email protected]>
+gdurf Glenn Durfee <[email protected]>
+gwyn Douglas Gwyn <[email protected]>
+hartley Robert Hartley <[email protected]>
+homovulgaris Dawn Thomas <[email protected]>
+iiizzzaaakkk Isacc Kamga <[email protected]>
+indianlarry Keith Boman <[email protected]>
+irpguardian Stephen Kennedy <[email protected]>
+j-schulte Johannes Schulte <[email protected]>
+jdoliner Joe Doliner <[email protected]>
+jebbly Jeffrey Liu <[email protected]>
+jehunt Jim Hunt <[email protected]>
+jgrosh John Grosh <[email protected]>
+jimhunt Jim Hunt <[email protected]>
+jlowens Jason Owens <[email protected]>
+jlowenz Jason Owens <[email protected]>
+joevalleyfield Timothy Myers <[email protected]>
+johnranderson John Anderson <[email protected]>
+jordisayol Jordi Sayol <[email protected]>
+jra John Anderson <[email protected]>
+justin Justin Shumaker <[email protected]>
+kermit Charles Kennedy <[email protected]>
+kunigami Guilherme Kunigami <[email protected]>
+lbutler Lee Butler <[email protected]>
+louipc Loui Chang <[email protected]>
+mafm Manuel Montecelo <[email protected]>
+maths22 Jacob Burroughs <[email protected]>
+mccarty Cormac McCarty <[email protected]>
+mdtwenty Marco da Silva Domingues <[email protected]>
+mendesr Roger Mendes <[email protected]>
+merritt Don Merritt <[email protected]>
+mgillich Michael Gillich <[email protected]>
+mike Michael John Muuss <[email protected]>
+mjgillich Michael Gillich <[email protected]>
+mm Michael Markowski <[email protected]>
+mmark Michael Markowski <[email protected]>
+mohitdaga Mohit Daga <[email protected]>
+morrison Christopher Sean Morrison <[email protected]>
+moss Gary Moss <[email protected]>
+n_reed Nicholas Reed <[email protected]>
+pacman87 Timothy Van Ruitenbeek <[email protected]>
+peter-sa Peter Amidon <[email protected]>
+phil Phillip Dykstra <[email protected]>
+phoenixyjll Wu Jianbang <[email protected]>
+pjt Paul Tanenbaum <[email protected]>
+poolio Ben Poole <[email protected]>
+popescuandrei Andrei-Constantin Popescu <[email protected]>
+prasad_silva Prasad Prometheus Silva <[email protected]>
+r_weiss Richard Weiss <[email protected]>
+ralith Benjamin Saunders <[email protected]>
+rbowers Ronald Bowers <[email protected]>
+reschly Robert Reschly <[email protected]>
+ronaldbowers Ronald Bowers <[email protected]>
+root root <[email protected]>
+sammy Samuel Hocevar <[email protected]>
+scoates Susan Coates <[email protected]>
+sharannyn Saran Narayan <[email protected]>
+starseeker Clifford Yapp <[email protected]>
+stay Paul Stay <[email protected]>
+stebich Armin Stebich <[email protected]>
+stefanmirea Stefan Mirea <[email protected]>
+steveb Stephen Buckley <[email protected]>
+sue Susanne Muuss <[email protected]>
+tbrowder2 Thomas Browder <[email protected]>
+tcs Terry Slattery <[email protected]>
+tossup tossup <[email protected]>
+tranese TraNese Christy <[email protected]>
+twingy Justin Shumaker <[email protected]>
+vasco_costa Vasco Alexandre da Silva Costa
<[email protected]>
+vladbogo Vlad Bogolin <[email protected]>
+wm William Mermagen <[email protected]>
+zhaoanqing Zhao Anqing <[email protected]>
Property changes on: brlcad/trunk/misc/repoconv/account-map_svnfexport.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/cvs_authormap_svnfexport.txt
===================================================================
--- brlcad/trunk/misc/repoconv/cvs_authormap_svnfexport.txt
(rev 0)
+++ brlcad/trunk/misc/repoconv/cvs_authormap_svnfexport.txt 2020-07-24
13:46:02 UTC (rev 76465)
@@ -0,0 +1,102 @@
+Abhi2011 = Abhijit Nandy <[email protected]>
+abhi2011 = Abhijit Nandy <[email protected]>
+adam = Adam Ross <[email protected]>
+agkphysics = Aaron Keesing <[email protected]>
+andrecastelo = André Castelo <[email protected]>
+anrgmrty = Anurag Murty <[email protected]>
+bharder = Brad Harder <[email protected]>
+bhinesley = Brandon Hinesley <[email protected]>
+bob1961 = Robert Parker <[email protected]>
+bparker = Robert Parker <[email protected]>
+brlcad = Christopher Sean Morrison <[email protected]>
+butler = Lee Butler <[email protected]>
+caen23 = Cezar El-Nazli <[email protected]>
+carlmoore = Carl Moore <[email protected]>
+cjohnson = Christopher Johnson <[email protected]>
+cnuzman = Carl Nuzman <[email protected]>
+cprecup = Cristina Precup <[email protected]>
+crdueck = Chris Dueck <[email protected]>
+d_rossberg = Daniel Rossberg <[email protected]>
+davidloman = David Loman <[email protected]>
+ddreeves70 = David Reeves <[email protected]>
+dgodbey = David Godbey <[email protected]>
+dhoward = Doug Howard <[email protected]>
+dpk = Douglas Kingston <[email protected]>
+dtremenak = Daniel Remenak <[email protected]>
+ebautu = Elena Bautu <[email protected]>
+ejno = Jonathan Engbert <[email protected]>
+erikg = Erik Greenwald <[email protected]>
+erikgreenwald = Erik Greenwald <[email protected]>
+g2asc = Charles Kennedy <[email protected]>
+gabbar1947 = Shubham Rathore <[email protected]>
+gdurf = Glenn Durfee <[email protected]>
+gwyn = Douglas Gwyn <[email protected]>
+hartley = Robert Hartley <[email protected]>
+homovulgaris = Dawn Thomas <[email protected]>
+iiizzzaaakkk = Isacc Kamga <[email protected]>
+indianlarry = Keith Boman <[email protected]>
+irpguardian = Stephen Kennedy <[email protected]>
+j-schulte = Johannes Schulte
<[email protected]>
+jdoliner = Joe Doliner <[email protected]>
+jebbly = Jeffrey Liu <[email protected]>
+jehunt = Jim Hunt <[email protected]>
+jgrosh = John Grosh <[email protected]>
+jimhunt = Jim Hunt <[email protected]>
+jlowens = Jason Owens <[email protected]>
+jlowenz = Jason Owens <[email protected]>
+joevalleyfield = Timothy Myers <[email protected]>
+johnranderson = John Anderson <[email protected]>
+jordisayol = Jordi Sayol <[email protected]>
+jra = John Anderson <[email protected]>
+justin = Justin Shumaker <[email protected]>
+kermit = Charles Kennedy <[email protected]>
+kunigami = Guilherme Kunigami <[email protected]>
+lbutler = Lee Butler <[email protected]>
+louipc = Loui Chang <[email protected]>
+mafm = Manuel Montecelo <[email protected]>
+maths22 = Jacob Burroughs <[email protected]>
+mccarty = Cormac McCarty <[email protected]>
+mdtwenty = Marco da Silva Domingues <[email protected]>
+mendesr = Roger Mendes <[email protected]>
+merritt = Don Merritt <[email protected]>
+mgillich = Michael Gillich <[email protected]>
+mike = Michael John Muuss <[email protected]>
+mjgillich = Michael Gillich <[email protected]>
+mm = Michael Markowski <[email protected]>
+mmark = Michael Markowski <[email protected]>
+mohitdaga = Mohit Daga <[email protected]>
+morrison = Christopher Sean Morrison <[email protected]>
+moss = Gary Moss <[email protected]>
+n_reed = Nicholas Reed <[email protected]>
+pacman87 = Timothy Van Ruitenbeek <[email protected]>
+peter-sa = Peter Amidon <[email protected]>
+phil = Phillip Dykstra <[email protected]>
+phoenixyjll = Wu Jianbang <[email protected]>
+pjt = Paul Tanenbaum <[email protected]>
+poolio = Ben Poole <[email protected]>
+popescuandrei = Andrei-Constantin Popescu <[email protected]>
+prasad_silva = Prasad Prometheus Silva <[email protected]>
+r_weiss = Richard Weiss <[email protected]>
+ralith = Benjamin Saunders <[email protected]>
+rbowers = Ronald Bowers <[email protected]>
+reschly = Robert Reschly <[email protected]>
+ronaldbowers = Ronald Bowers <[email protected]>
+root = root <[email protected]>
+sammy = Samuel Hocevar <[email protected]>
+scoates = Susan Coates <[email protected]>
+sharannyn = Saran Narayan <[email protected]>
+starseeker = Clifford Yapp <[email protected]>
+stay = Paul Stay <[email protected]>
+stebich = Armin Stebich <[email protected]>
+stefanmirea = Stefan Mirea <[email protected]>
+steveb = Stephen Buckley <[email protected]>
+sue = Susanne Muuss <[email protected]>
+tbrowder2 = Thomas Browder <[email protected]>
+tcs = Terry Slattery <[email protected]>
+tossup = tossup <[email protected]>
+tranese = TraNese Christy <[email protected]>
+twingy = Justin Shumaker <[email protected]>
+vasco_costa = Vasco Alexandre da Silva Costa
<[email protected]>
+vladbogo = Vlad Bogolin <[email protected]>
+wm = William Mermagen <[email protected]>
+zhaoanqing = Zhao Anqing <[email protected]>
Property changes on: brlcad/trunk/misc/repoconv/cvs_authormap_svnfexport.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/email_fixups.txt
===================================================================
--- brlcad/trunk/misc/repoconv/email_fixups.txt (rev 0)
+++ brlcad/trunk/misc/repoconv/email_fixups.txt 2020-07-24 13:46:02 UTC (rev
76465)
@@ -0,0 +1,6 @@
+Ben Poole <[email protected]>;Ben Poole <[email protected]>
+Carl Moore <[email protected]>;Carl Moore <[email protected]>
+Daniel Rossberg <[email protected]>;Daniel Rossberg
<[email protected]>
+Jason Owens <[email protected]>;Jason Owens <[email protected]>
+John Grosh <[email protected]>;John Grosh <[email protected]>
+Phillip Dykstra <[email protected]>;Phillip Dykstra <[email protected]>
Property changes on: brlcad/trunk/misc/repoconv/email_fixups.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
