[Debtags-commits] [svn] r1613 - tagdb

[Enrico Zini]

Author: enrico
Date: Thu Mar  2 00:37:56 2006
New Revision: 1613

Modified:
   tagdb/mkoverrides
   tagdb/process
Log:
Added more documentation about the editing process
Use the new '--patch-with=directory' feature of tagcoll 1.6


Modified: tagdb/mkoverrides
==============================================================================
--- tagdb/mkoverrides	(original)
+++ tagdb/mkoverrides	Thu Mar  2 00:37:56 2006
@@ -2,6 +2,8 @@
 
 # Create override files from the tag database
 
+# TODO: {}-compress long tag lines
+
 rm -f tag tag.{contrib,non-free}
 
 tagcoll --remove-unfaceted --remove-tags='special::not-yet-tagged* || special::invalid-tag || *::TODO || special::completely-tagged' copy tags | \

Modified: tagdb/process
==============================================================================
--- tagdb/process	(original)
+++ tagdb/process	Thu Mar  2 00:37:56 2006
@@ -4,6 +4,47 @@
 # Interactive tool to do manual verification of tag database changes
 #
 
+# There are 6 elements:
+#
+# Central database version
+# Subversion version
+# Unchecked version
+#   A copy of the tag database previously downloaded from the central database
+#   file: "tags-unchecked"
+# Undergoing editing
+#   A subset of unchecked that is being hand-edited
+#   file: "editing-{bytag/byfacet}-{facet or tag name}"
+# Approved
+#   Changes between subversion and the central database that have been approved
+#   file: approved/*
+# Hand patches
+#   Reverse patch for those changes that have not been approved
+#   file: corrections/*
+
+# Procedures:
+#
+# Downloading
+#  1) download from central database
+#  2) remove data from those packages that do not exist anymore
+#  3) apply the existing hand patches
+#  4) save to unchecked
+#  
+# Editing
+#  1) extract the subset to edit from the unchecked/svn patch
+#  2) invoke editor (repeat as long as needed)
+#  3) compare again with the unchecked/svn patch and generate a new addition
+#     for approved and hand patches
+#  4) svn += approved
+#  5) central database += hand patches
+#  6) unchecked += hand patches
+#  7) remove editing copy
+#
+
+
+
+
+
+
 #
 # A $TOCHECK file is downloaded from $TOCHECK_URL and compared against
 # $CHECKED.  Checked is under svn revision control.
@@ -58,15 +99,12 @@
 	echo "Downloading new version from $TOCHECK_URL ..."
 	wget -O- "$TOCHECK_URL" | gunzip > $TOCHECK
 
-	echo "Applying the existing corrections..."
 	if [ -d $PATCHDIR ]
 	then
-		for patch in `find $PATCHDIR`
-		do
-			TMPCOLL=`mktemp`
-			tagcoll --patch-with=$patch copy $TOCHECK > $TMPCOLL
-			mv $TMPCOLL $TOCHECK
-		done
+		echo "Applying the existing corrections..."
+		TMPCOLL=`mktemp`
+		tagcoll --patch-with=$PATCHDIR copy $TOCHECK > $TMPCOLL
+		mv $TMPCOLL $TOCHECK
 	fi
 
 	echo "Rebuilding the main patch"