Changeset 2801 for trunk

Timestamp:

Dec 28, 2009, 1:35:21 PM (15 years ago)

Author:

broder

Message:

Superproject, not superrepo, is git's term for a repo that contains
submodules.

Make that replacement everywhere.

Location:

trunk

Files:

• packages/invirt-dev/invirtibuilder (modified) (7 diffs)
• scripts/git-hooks/notes (modified) (2 diffs)
• scripts/git-migration/git-migrate-fast.sh (modified) (1 diff)

trunk/packages/invirt-dev/invirtibuilder

@@ -8 +8 @@
 If the build succeeds, the new version of the package is uploaded to
 the apt repository, tagged in its git repository, and the Invirt
-superrepo is updated to point at the new version.
+superproject is updated to point at the new version.
 
 If the build fails, the Invirtibuilder sends mail with the build log.
@@ -174 +174 @@
 
 
-def updateSuperrepo(pocket, package, commit, principal):
-    """Update the superrepo.
+def updateSuperproject(pocket, package, commit, principal):
+    """Update the superproject.
 
     This will create a new commit on the branch for the given pocket
@@ -181 +181 @@
 
     Note that there's no locking issue here, because we disallow all
-    pushes to the superrepo.
-    """
-    superrepo = os.path.join(b._REPO_DIR, 'invirt/packages.git')
+    pushes to the superproject.
+    """
+    superproject = os.path.join(b._REPO_DIR, 'invirt/packages.git')
     branch = b.pocketToGit(pocket)
     tree = c.captureOutput(['git', 'ls-tree', branch],
-                         cwd=superrepo)
+                         cwd=superproject)
 
     new_tree = re.compile(
@@ -194 +194 @@
 
     new_tree_id = c.captureOutput(['git', 'mktree'],
-                                cwd=superrepo,
+                                cwd=superproject,
                                 stdin_str=new_tree)
 
@@ -203 +203 @@
     new_commit = c.captureOutput(
         ['git', 'commit-tree', new_tree_hash, '-p', branch],
-        cwd=superrepo,
+        cwd=superproject,
         env=env,
         stdin_str=commit_msg)
@@ -209 +209 @@
     c.captureOutput(
         ['git', 'update-ref', 'refs/heads/%s' % branch, new_commit],
-        cwd=superrepo)
+        cwd=superproject)
 
 
@@ -330 +330 @@
                     db.failed_stage = 'updating submodule branches'
                     updateSubmoduleBranch(pocket, package, commit)
-                    db.failed_stage = 'updating superrepo'
-                    updateSuperrepo(pocket, package, commit, principal)
+                    db.failed_stage = 'updating superproject'
+                    updateSuperproject(pocket, package, commit, principal)
                     db.failed_stage = 'uploading packages to apt repo'
                     uploadBuild(pocket, workdir)

trunk/scripts/git-hooks/notes

@@ -6 +6 @@
   zephyr
 
-superrepo heads are dev and prod
-on push to superrepo:
-  error - no pushes to superrepo
+superproject heads are dev and prod
+on push to superproject:
+  error - no pushes to superproject
 
 on remctl xvm repo (dev|prod) package SHA-1:
@@ -25 +25 @@
   upload to apt repo
   tag submodule with version
-  commit superrepo with updated submodule
+  commit superproject with updated submodule
   clean up build files
   zephyr

trunk/scripts/git-migration/git-migrate-fast.sh

@@ -92 +92 @@
     echo 'committer Invirt Git Import <invirt@mit.edu> now'
     echo 'data <<EOF'
-    echo 'Initial superrepo creation.'
+    echo 'Initial superproject creation.'
     echo 'EOF'
     for r in $(ls ../packages); do