Commit b1a0f22e authored by Brad King's avatar Brad King

Switch developer setup to use the GitLab workflow

In SetupForDevelopment, switch from setup-gerrit to setup-gitlab.
Also invoke setup-upstream to switch the "origin" remote to GitLab.
Update the version of the SetupForDevelopment script so that existing
work tree hooks will ask developers to run the script again.
parent ac802c7c
......@@ -60,7 +60,7 @@ list(APPEND ExternalData_URL_TEMPLATES
# Data published by MIDAS
"http://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"
# Data published by developers using git-gerrit-push.
# Data published by developers using git-gitlab-push.
"http://www.vtk.org/files/ExternalData/%(algo)/%(hash)"
)
......
[hooks]
url = http://vtk.org/VTK.git
[ssh]
host = vtk.org
key = id_git_vtk
request-url = https://www.kitware.com/Admin/SendPassword.cgi
[gerrit]
project = VTK
site = http://review.source.kitware.com
pushurl = $username@review.source.kitware.com:VTK
url = https://gitlab.kitware.com/vtk/vtk.git
[upstream]
url = https://gitlab.kitware.com/vtk/vtk.git
[gitlab]
host = gitlab.kitware.com
group-path = vtk
group-name = VTK
project-path = vtk
project-name = VTK
......@@ -17,4 +17,7 @@ git config alias.stage-merge '!sh -c "echo '"${stage_disabled}"'"' &&
gerrit_disabled="VTK no longer uses Gerrit. Please use GitLab." &&
git config alias.gerrit-push '!sh -c "echo '"${gerrit_disabled}"'"' &&
# Alias to push the current topic branch to GitLab
git config alias.gitlab-push '!bash Utilities/GitSetup/git-gitlab-push' &&
true
......@@ -4,8 +4,9 @@ cd "${BASH_SOURCE%/*}/.." &&
Utilities/GitSetup/setup-user && echo &&
Utilities/GitSetup/setup-hooks && echo &&
Utilities/Scripts/SetupGitAliases.sh && echo &&
(Utilities/GitSetup/setup-gerrit ||
echo 'Failed to setup Gerrit. Run this again to retry.') && echo &&
Utilities/GitSetup/setup-upstream && echo &&
(Utilities/GitSetup/setup-gitlab ||
echo 'Failed to setup GitLab. Run this again to retry.') && echo &&
Utilities/Scripts/SetupExternalData.sh && echo &&
Utilities/GitSetup/tips
......@@ -13,6 +14,10 @@ Utilities/GitSetup/tips
git config rebase.stat true
git config branch.master.rebase true
# Disable Gerrit hook explicitly so the commit-msg hook will
# not complain even if some gerrit remotes are still configured.
git config hooks.GerritId false
# Record the version of this setup so Scripts/pre-commit can check it.
SetupForDevelopment_VERSION=1
SetupForDevelopment_VERSION=2
git config hooks.SetupForDevelopment ${SetupForDevelopment_VERSION}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment