From 17a1200c70d67f0646fef6e1bc3abf0ac61b124d Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 13 Dec 2016 14:06:13 -0500
Subject: [PATCH] Convert developer setup scripts away from Gerrit Code Review
KWSys development is moving away from the Gerrit Code Review system.
Disable portions of `SetupForDevelopment.sh` related to Gerrit.
---
GitSetup/config | 8 +++-----
GitSetup/setup-aliases | 4 ++--
SetupForDevelopment.sh | 8 ++++++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/GitSetup/config b/GitSetup/config
index 0770214..cba4c14 100644
--- a/GitSetup/config
+++ b/GitSetup/config
@@ -1,6 +1,4 @@
[hooks]
- url = http://public.kitware.com/GitSetup.git
-[gerrit]
- project = KWSys
- site = http://review.source.kitware.com
- pushurl = $username@review.source.kitware.com:KWSys
+ url = https://gitlab.kitware.com/utils/gitsetup.git
+[upstream]
+ url = https://gitlab.kitware.com/utils/kwsys.git
diff --git a/GitSetup/setup-aliases b/GitSetup/setup-aliases
index c6a3246..98810ad 100755
--- a/GitSetup/setup-aliases
+++ b/GitSetup/setup-aliases
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo "Adding 'git prepush' alias" &&
git config alias.prepush 'log --graph --stat origin/master..' &&
-echo "Adding 'git gerrit-push' alias" &&
-git config alias.gerrit-push "!bash GitSetup/git-gerrit-push" &&
+gerrit_disabled="KWSys no longer uses Gerrit. Please use GitLab." &&
+git config alias.gerrit-push '!sh -c "echo '"${gerrit_disabled}"'"' &&
true
diff --git a/SetupForDevelopment.sh b/SetupForDevelopment.sh
index 520884b..c3a2b16 100755
--- a/SetupForDevelopment.sh
+++ b/SetupForDevelopment.sh
@@ -3,14 +3,18 @@
cd "${BASH_SOURCE%/*}" &&
GitSetup/setup-user && echo &&
GitSetup/setup-hooks && echo &&
-GitSetup/setup-gerrit && echo &&
GitSetup/setup-aliases && echo &&
+GitSetup/setup-upstream && echo &&
GitSetup/tips
# Rebase master by default
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}
--
GitLab