Changeset 2801


Ignore:
Timestamp:
Dec 28, 2009, 1:35:21 PM (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/invirt-dev/invirtibuilder

    r2593 r2801  
    88If the build succeeds, the new version of the package is uploaded to
    99the apt repository, tagged in its git repository, and the Invirt
    10 superrepo is updated to point at the new version.
     10superproject is updated to point at the new version.
    1111
    1212If the build fails, the Invirtibuilder sends mail with the build log.
     
    174174
    175175
    176 def updateSuperrepo(pocket, package, commit, principal):
    177     """Update the superrepo.
     176def updateSuperproject(pocket, package, commit, principal):
     177    """Update the superproject.
    178178
    179179    This will create a new commit on the branch for the given pocket
     
    181181
    182182    Note that there's no locking issue here, because we disallow all
    183     pushes to the superrepo.
    184     """
    185     superrepo = os.path.join(b._REPO_DIR, 'invirt/packages.git')
     183    pushes to the superproject.
     184    """
     185    superproject = os.path.join(b._REPO_DIR, 'invirt/packages.git')
    186186    branch = b.pocketToGit(pocket)
    187187    tree = c.captureOutput(['git', 'ls-tree', branch],
    188                          cwd=superrepo)
     188                         cwd=superproject)
    189189
    190190    new_tree = re.compile(
     
    194194
    195195    new_tree_id = c.captureOutput(['git', 'mktree'],
    196                                 cwd=superrepo,
     196                                cwd=superproject,
    197197                                stdin_str=new_tree)
    198198
     
    203203    new_commit = c.captureOutput(
    204204        ['git', 'commit-tree', new_tree_hash, '-p', branch],
    205         cwd=superrepo,
     205        cwd=superproject,
    206206        env=env,
    207207        stdin_str=commit_msg)
     
    209209    c.captureOutput(
    210210        ['git', 'update-ref', 'refs/heads/%s' % branch, new_commit],
    211         cwd=superrepo)
     211        cwd=superproject)
    212212
    213213
     
    330330                    db.failed_stage = 'updating submodule branches'
    331331                    updateSubmoduleBranch(pocket, package, commit)
    332                     db.failed_stage = 'updating superrepo'
    333                     updateSuperrepo(pocket, package, commit, principal)
     332                    db.failed_stage = 'updating superproject'
     333                    updateSuperproject(pocket, package, commit, principal)
    334334                    db.failed_stage = 'uploading packages to apt repo'
    335335                    uploadBuild(pocket, workdir)
  • trunk/scripts/git-hooks/notes

    r2498 r2801  
    66  zephyr
    77
    8 superrepo heads are dev and prod
    9 on push to superrepo:
    10   error - no pushes to superrepo
     8superproject heads are dev and prod
     9on push to superproject:
     10  error - no pushes to superproject
    1111
    1212on remctl xvm repo (dev|prod) package SHA-1:
     
    2525  upload to apt repo
    2626  tag submodule with version
    27   commit superrepo with updated submodule
     27  commit superproject with updated submodule
    2828  clean up build files
    2929  zephyr
  • trunk/scripts/git-migration/git-migrate-fast.sh

    r2745 r2801  
    9292    echo 'committer Invirt Git Import <invirt@mit.edu> now'
    9393    echo 'data <<EOF'
    94     echo 'Initial superrepo creation.'
     94    echo 'Initial superproject creation.'
    9595    echo 'EOF'
    9696    for r in $(ls ../packages); do
Note: See TracChangeset for help on using the changeset viewer.