Merge branch 'developer-setup'
This commit is contained in:
Brad King
commit
fe0f7e362d
|
|
@ -0,0 +1,2 @@
|
||||||
|
/Git export-ignore
|
||||||
|
SetupForDevelopment.sh export-ignore
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
.git* export-ignore
|
||||||
|
|
||||||
|
# Exclude from source archives files specific to Git work tree.
|
||||||
|
* export-ignore
|
||||||
|
|
||||||
|
tips eol=lf whitespace=indent-with-non-tab
|
||||||
|
setup-* eol=lf whitespace=indent-with-non-tab
|
||||||
|
|
@ -0,0 +1,202 @@
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
Kitware Local Git Setup Scripts
|
||||||
|
Copyright 2010-2012 Kitware, Inc.
|
||||||
|
|
||||||
|
This product includes software developed at Kitware, Inc.
|
||||||
|
(http://www.kitware.com/).
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
Kitware Local Git Setup Scripts
|
||||||
|
|
||||||
|
|
||||||
|
Introduction
|
||||||
|
------------
|
||||||
|
|
||||||
|
This is a collection of local Git development setup scripts meant for
|
||||||
|
inclusion in project source trees to aid their development workflow.
|
||||||
|
Project-specific information needed by the scripts may be configured
|
||||||
|
in a "config" file added next to them in the project.
|
||||||
|
|
||||||
|
|
||||||
|
Import
|
||||||
|
------
|
||||||
|
|
||||||
|
A project may import these scripts into their source tree by
|
||||||
|
initializing a subtree merge. Bring up a Git prompt and set the
|
||||||
|
current working directory inside a clone of the target project.
|
||||||
|
Fetch the "setup" branch from the GitSetup repository:
|
||||||
|
|
||||||
|
$ git fetch ../GitSetup setup:setup
|
||||||
|
|
||||||
|
Prepare to merge the branch but place the content in a subdirectory.
|
||||||
|
Any prefix (with trailing '/') may be chosen so long as it is used
|
||||||
|
consistently within a project through the rest of these instructions:
|
||||||
|
|
||||||
|
$ git merge -s ours --no-commit setup
|
||||||
|
$ git read-tree -u --prefix=Utilities/GitSetup/ setup
|
||||||
|
|
||||||
|
Commit the merge with an informative message:
|
||||||
|
|
||||||
|
$ git commit
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
Merge branch 'setup'
|
||||||
|
|
||||||
|
Add Utilities/GitSetup/ directory using subtree merge from
|
||||||
|
the general GitSetup repository "setup" branch.
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
Configuration
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Read the "Project configuration instructions" comment in each script.
|
||||||
|
Add a "config" file next to the scripts with desired configuration
|
||||||
|
(optionally copy and modify "config.sample"). For example, to
|
||||||
|
configure the "setup-hooks" script:
|
||||||
|
|
||||||
|
$ git config -f Utilities/GitSetup/config hooks.url "$url"
|
||||||
|
|
||||||
|
where "$url" is the project repository publishing the "hooks" branch.
|
||||||
|
When finished, add and commit the configuration file:
|
||||||
|
|
||||||
|
$ git add Utilities/GitSetup/config
|
||||||
|
$ git commit
|
||||||
|
|
||||||
|
|
||||||
|
Update
|
||||||
|
------
|
||||||
|
|
||||||
|
A project may update these scripts from the GitSetup repository.
|
||||||
|
Bring up a Git prompt and set the current working directory inside a
|
||||||
|
clone of the target project. Fetch the "setup" branch from the
|
||||||
|
GitSetup repository:
|
||||||
|
|
||||||
|
$ git fetch ../GitSetup setup:setup
|
||||||
|
|
||||||
|
Merge the "setup" branch into the subtree:
|
||||||
|
|
||||||
|
$ git merge -X subtree=Utilities/GitSetup setup
|
||||||
|
|
||||||
|
where "Utilities/GitSetup" is the same prefix used during the import
|
||||||
|
setup, but without a trailing '/'.
|
||||||
|
|
||||||
|
|
||||||
|
License
|
||||||
|
-------
|
||||||
|
|
||||||
|
Distributed under the Apache License 2.0.
|
||||||
|
See LICENSE and NOTICE for details.
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
[hooks]
|
||||||
|
url = http://cmake.org/cmake.git
|
||||||
|
[ssh]
|
||||||
|
host = cmake.org
|
||||||
|
key = id_git_cmake
|
||||||
|
request-url = https://www.kitware.com/Admin/SendPassword.cgi
|
||||||
|
[stage]
|
||||||
|
url = git://cmake.org/stage/cmake.git
|
||||||
|
pushurl = git@cmake.org:stage/cmake.git
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
# Kitware Local Git Setup Scripts - Sample Project Configuration
|
||||||
|
#
|
||||||
|
# Copy to "config" and edit as necessary.
|
||||||
|
|
||||||
|
[hooks]
|
||||||
|
url = http://public.kitware.com/GitSetup.git
|
||||||
|
#branch = hooks
|
||||||
|
|
||||||
|
[ssh]
|
||||||
|
host = public.kitware.com
|
||||||
|
key = id_git_public
|
||||||
|
request-url = https://www.kitware.com/Admin/SendPassword.cgi
|
||||||
|
|
||||||
|
[stage]
|
||||||
|
#url = git://public.kitware.com/stage/Project.git
|
||||||
|
#pushurl = git@public.kitware.com:stage/Project.git
|
||||||
|
|
||||||
|
[gerrit]
|
||||||
|
#project = Project
|
||||||
|
site = http://review.source.kitware.com
|
||||||
|
# pushurl placeholder "$username" is literal
|
||||||
|
pushurl = $username@review.source.kitware.com:Project
|
||||||
|
|
@ -0,0 +1,142 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Run this script to set up the local Git repository to push to
|
||||||
|
# a Gerrit Code Review instance for this project.
|
||||||
|
|
||||||
|
# Project configuration instructions:
|
||||||
|
#
|
||||||
|
# - Run a Gerrit Code Review server
|
||||||
|
#
|
||||||
|
# - Populate adjacent "config" file with:
|
||||||
|
# gerrit.site = Top Gerrit URL (not project-specific)
|
||||||
|
# gerrit.project = Name of project in Gerrit
|
||||||
|
# gerrit.pushurl = Review site push URL with "$username" placeholder
|
||||||
|
# gerrit.remote = Gerrit remote name, if not "gerrit"
|
||||||
|
# gerrit.url = Gerrit project URL, if not "$site/p/$project"
|
||||||
|
|
||||||
|
die() {
|
||||||
|
echo 1>&2 "$@" ; exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Make sure we are inside the repository.
|
||||||
|
cd "${BASH_SOURCE%/*}" &&
|
||||||
|
|
||||||
|
# Load the project configuration.
|
||||||
|
site=$(git config -f config --get gerrit.site) &&
|
||||||
|
project=$(git config -f config --get gerrit.project) &&
|
||||||
|
pushurl_=$(git config -f config --get gerrit.pushurl) &&
|
||||||
|
remote=$(git config -f config --get gerrit.remote ||
|
||||||
|
echo "gerrit") &&
|
||||||
|
fetchurl=$(git config -f config --get gerrit.url ||
|
||||||
|
echo "$site/p/$project") ||
|
||||||
|
die 'This project is not configured to use Gerrit.'
|
||||||
|
|
||||||
|
# Get current gerrit push URL.
|
||||||
|
pushurl=$(git config --get remote."$remote".pushurl ||
|
||||||
|
git config --get remote."$remote".url || echo '') &&
|
||||||
|
|
||||||
|
# Tell user about current configuration.
|
||||||
|
if test -n "$pushurl"; then
|
||||||
|
echo 'Remote "'"$remote"'" is currently configured to push to
|
||||||
|
|
||||||
|
'"$pushurl"'
|
||||||
|
' &&
|
||||||
|
read -ep 'Reconfigure Gerrit? [y/N]: ' ans &&
|
||||||
|
if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
|
||||||
|
setup=1
|
||||||
|
else
|
||||||
|
setup=''
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo 'Remote "'"$remote"'" is not yet configured.
|
||||||
|
|
||||||
|
'"$project"' changes must be pushed to our Gerrit Code Review site:
|
||||||
|
|
||||||
|
'"$fetchurl"'
|
||||||
|
|
||||||
|
Register a Gerrit account and select a username (used below).
|
||||||
|
You will need an OpenID:
|
||||||
|
|
||||||
|
http://openid.net/get-an-openid/
|
||||||
|
' &&
|
||||||
|
read -ep 'Configure Gerrit? [Y/n]: ' ans &&
|
||||||
|
if [ "$ans" == "n" ] || [ "$ans" == "N" ]; then
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
setup=1
|
||||||
|
fi
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Perform setup if necessary.
|
||||||
|
if test -n "$setup"; then
|
||||||
|
echo 'Sign-in to Gerrit to get/set your username at
|
||||||
|
|
||||||
|
'"$site"'/#/settings
|
||||||
|
|
||||||
|
Add your SSH public keys at
|
||||||
|
|
||||||
|
'"$site"'/#/settings/ssh-keys
|
||||||
|
' &&
|
||||||
|
read -ep "Gerrit username? [$USER]: " gu &&
|
||||||
|
if test -z "$gu"; then
|
||||||
|
gu="$USER"
|
||||||
|
fi &&
|
||||||
|
if test -z "$pushurl"; then
|
||||||
|
git remote add "$remote" "$fetchurl"
|
||||||
|
else
|
||||||
|
git config remote."$remote".url "$fetchurl"
|
||||||
|
fi &&
|
||||||
|
pushurl="${pushurl_/\$username/$gu}" &&
|
||||||
|
git config remote."$remote".pushurl "$pushurl" &&
|
||||||
|
echo 'Remote "'"$remote"'" is now configured to push to
|
||||||
|
|
||||||
|
'"$pushurl"'
|
||||||
|
'
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Optionally test Gerrit access.
|
||||||
|
if test -n "$pushurl"; then
|
||||||
|
read -ep 'Test access to Gerrit (SSH)? [y/N]: ' ans &&
|
||||||
|
if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
|
||||||
|
echo -n 'Testing Gerrit access by SSH...'
|
||||||
|
if git ls-remote --heads "$pushurl" >/dev/null; then
|
||||||
|
echo 'passed.'
|
||||||
|
else
|
||||||
|
echo 'failed.' &&
|
||||||
|
die 'Could not access Gerrit. Add your SSH public keys at
|
||||||
|
|
||||||
|
'"$site"'/#/settings/ssh-keys
|
||||||
|
'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Set up GerritId hook.
|
||||||
|
hook=$(git config --get hooks.GerritId || echo '') &&
|
||||||
|
if test -z "$hook"; then
|
||||||
|
echo '
|
||||||
|
Enabling GerritId hook to add a "Change-Id" footer to commit
|
||||||
|
messages for interaction with Gerrit. Run
|
||||||
|
|
||||||
|
git config hooks.GerritId false
|
||||||
|
|
||||||
|
to disable this feature (but you will be on your own).' &&
|
||||||
|
git config hooks.GerritId true
|
||||||
|
else
|
||||||
|
echo 'GerritId hook already configured to "'"$hook"'".'
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Run this script to set up local Git hooks for this project.
|
||||||
|
|
||||||
|
# Project configuration instructions:
|
||||||
|
#
|
||||||
|
# - Publish a "hooks" branch in the project repository such that
|
||||||
|
# clones will have "refs/remotes/origin/hooks".
|
||||||
|
#
|
||||||
|
# - Populate adjacent "config" file with:
|
||||||
|
# hooks.url = Repository URL publishing "hooks" branch
|
||||||
|
# hooks.branch = Repository branch instead of "hooks"
|
||||||
|
|
||||||
|
egrep-q() {
|
||||||
|
egrep "$@" >/dev/null 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
die() {
|
||||||
|
echo 1>&2 "$@" ; exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Make sure we are inside the repository.
|
||||||
|
cd "${BASH_SOURCE%/*}" &&
|
||||||
|
|
||||||
|
# Select a hooks branch.
|
||||||
|
if url=$(git config --get hooks.url); then
|
||||||
|
# Fetch hooks from locally configured repository.
|
||||||
|
branch=$(git config hooks.branch || echo hooks)
|
||||||
|
elif git for-each-ref refs/remotes/origin/hooks 2>/dev/null |
|
||||||
|
egrep-q 'refs/remotes/origin/hooks$'; then
|
||||||
|
# Use hooks cloned from origin.
|
||||||
|
url=.. && branch=remotes/origin/hooks
|
||||||
|
elif url=$(git config -f config --get hooks.url); then
|
||||||
|
# Fetch hooks from project-configured repository.
|
||||||
|
branch=$(git config -f config hooks.branch || echo hooks)
|
||||||
|
else
|
||||||
|
die 'This project is not configured to install local hooks.'
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Populate ".git/hooks".
|
||||||
|
echo 'Setting up git hooks...' &&
|
||||||
|
git_dir=$(git rev-parse --git-dir) &&
|
||||||
|
cd "$git_dir/hooks" &&
|
||||||
|
if ! test -e .git; then
|
||||||
|
git init -q || die 'Could not run git init for hooks.'
|
||||||
|
fi &&
|
||||||
|
git fetch -q "$url" "$branch" &&
|
||||||
|
git reset -q --hard FETCH_HEAD || die 'Failed to install hooks'
|
||||||
|
|
@ -0,0 +1,111 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Run this script to set up ssh push access to the repository host.
|
||||||
|
|
||||||
|
# Project configuration instructions:
|
||||||
|
#
|
||||||
|
# - Populate adjacent "config" file with:
|
||||||
|
# ssh.host = Repository host name
|
||||||
|
# ssh.user = Username on host, if not "git"
|
||||||
|
# ssh.key = Local ssh key name
|
||||||
|
# ssh.request-url = Web page URL to request ssh access
|
||||||
|
|
||||||
|
egrep-q() {
|
||||||
|
egrep "$@" >/dev/null 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
die() {
|
||||||
|
echo 1>&2 "$@" ; exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Make sure we are inside the repository.
|
||||||
|
cd "${BASH_SOURCE%/*}" &&
|
||||||
|
|
||||||
|
# Load the project configuration.
|
||||||
|
host=$(git config -f config --get ssh.host) &&
|
||||||
|
user=$(git config -f config --get ssh.user || echo git) &&
|
||||||
|
key=$(git config -f config --get ssh.key) &&
|
||||||
|
request_url=$(git config -f config --get ssh.request-url) ||
|
||||||
|
die 'This project is not configured for ssh push access.'
|
||||||
|
|
||||||
|
# Check for existing configuration.
|
||||||
|
if test -r ~/.ssh/config &&
|
||||||
|
egrep-q 'Host[= ]'"${host//\./\\.}" ~/.ssh/config; then
|
||||||
|
echo 'Host "'"$host"'" is already in ~/.ssh/config' &&
|
||||||
|
setup= &&
|
||||||
|
question='Test'
|
||||||
|
else
|
||||||
|
echo 'Host "'"$host"'" not found in ~/.ssh/config' &&
|
||||||
|
setup=1 &&
|
||||||
|
question='Setup and test'
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Ask the user whether to make changes.
|
||||||
|
echo '' &&
|
||||||
|
read -ep "${question} push access by ssh to $user@$host? [y/N]: " access &&
|
||||||
|
if test "$access" != "y" -a "$access" != "Y"; then
|
||||||
|
exit 0
|
||||||
|
fi &&
|
||||||
|
|
||||||
|
# Setup host configuration if necessary.
|
||||||
|
if test -n "$setup"; then
|
||||||
|
if ! test -d ~/.ssh; then
|
||||||
|
mkdir -p ~/.ssh &&
|
||||||
|
chmod 700 ~/.ssh
|
||||||
|
fi &&
|
||||||
|
if ! test -f ~/.ssh/config; then
|
||||||
|
touch ~/.ssh/config &&
|
||||||
|
chmod 600 ~/.ssh/config
|
||||||
|
fi &&
|
||||||
|
ssh_config='Host='"$host"'
|
||||||
|
IdentityFile ~/.ssh/'"$key" &&
|
||||||
|
echo "Adding to ~/.ssh/config:
|
||||||
|
|
||||||
|
$ssh_config
|
||||||
|
" &&
|
||||||
|
echo "$ssh_config" >> ~/.ssh/config &&
|
||||||
|
if ! test -e ~/.ssh/"$key"; then
|
||||||
|
if test -f ~/.ssh/id_rsa; then
|
||||||
|
# Take care of the common case.
|
||||||
|
ln -s id_rsa ~/.ssh/"$key"
|
||||||
|
echo '
|
||||||
|
Assuming ~/.ssh/id_rsa is the private key corresponding to the public key for
|
||||||
|
|
||||||
|
'"$user@$host"'
|
||||||
|
|
||||||
|
If this is incorrect place private key at "~/.ssh/'"$key"'".'
|
||||||
|
else
|
||||||
|
echo '
|
||||||
|
Place the private key corresponding to the public key registered for
|
||||||
|
|
||||||
|
'"$user@$host"'
|
||||||
|
|
||||||
|
at "~/.ssh/'"$key"'".'
|
||||||
|
fi
|
||||||
|
read -e -n 1 -p 'Press any key to continue...'
|
||||||
|
fi
|
||||||
|
fi || exit 1
|
||||||
|
|
||||||
|
# Test access configuration.
|
||||||
|
echo 'Testing ssh push access to "'"$user@$host"'"...' &&
|
||||||
|
if ! ssh "$user@$host" info; then
|
||||||
|
die 'No ssh push access to "'"$user@$host"'". You may need to request access at
|
||||||
|
|
||||||
|
'"$request_url"'
|
||||||
|
'
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Run this script to set up the topic stage for pushing changes.
|
||||||
|
|
||||||
|
# Project configuration instructions:
|
||||||
|
#
|
||||||
|
# - Run a Topic Stage repository next to the main project repository.
|
||||||
|
#
|
||||||
|
# - Populate adjacent "config" file with:
|
||||||
|
# stage.url = Topic Stage repository URL
|
||||||
|
# stage.pushurl = Topic Stage push URL if not "$url"
|
||||||
|
|
||||||
|
egrep-q() {
|
||||||
|
egrep "$@" >/dev/null 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
die() {
|
||||||
|
echo 1>&2 "$@" ; exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Make sure we are inside the repository.
|
||||||
|
cd "${BASH_SOURCE%/*}" &&
|
||||||
|
|
||||||
|
# Load the project configuration.
|
||||||
|
url=$(git config -f config --get stage.url) &&
|
||||||
|
pushurl=$(git config -f config --get stage.pushurl || echo '') ||
|
||||||
|
die 'This project is not configured to use a topic stage.'
|
||||||
|
|
||||||
|
# Configure the remote if necessary.
|
||||||
|
if git config remote.stage.url >/dev/null; then
|
||||||
|
echo 'Topic stage already configured.'
|
||||||
|
else
|
||||||
|
echo 'Setting up the topic stage...' &&
|
||||||
|
git remote add stage "$url" &&
|
||||||
|
if test -n "$pushurl"; then
|
||||||
|
git config remote.stage.pushurl "$pushurl"
|
||||||
|
fi
|
||||||
|
fi || die 'Could not add the topic stage remote.'
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# Run this script to configure Git user info in this repository.
|
||||||
|
|
||||||
|
# Project configuration instructions: NONE
|
||||||
|
|
||||||
|
for (( ; ; )); do
|
||||||
|
user_name=$(git config user.name || echo '') &&
|
||||||
|
user_email=$(git config user.email || echo '') &&
|
||||||
|
if test -n "$user_name" -a -n "$user_email"; then
|
||||||
|
echo 'Your commits will record as Author:
|
||||||
|
|
||||||
|
'"$user_name <$user_email>"'
|
||||||
|
' &&
|
||||||
|
read -ep 'Is the author name and email address above correct? [Y/n] ' correct &&
|
||||||
|
if test "$correct" != "n" -a "$correct" != "N"; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
fi &&
|
||||||
|
read -ep 'Enter your full name e.g. "John Doe": ' name &&
|
||||||
|
read -ep 'Enter your email address e.g. "john@gmail.com": ' email &&
|
||||||
|
git config user.name "$name" &&
|
||||||
|
git config user.email "$email"
|
||||||
|
done
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2010-2012 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#=============================================================================
|
||||||
|
|
||||||
|
# This script makes optional suggestions for working with Git.
|
||||||
|
|
||||||
|
# Project configuration instructions: NONE
|
||||||
|
|
||||||
|
egrep-q() {
|
||||||
|
egrep "$@" >/dev/null 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
# Suggest color configuration.
|
||||||
|
if test -z "$(git config --get color.ui)"; then
|
||||||
|
echo '
|
||||||
|
One may enable color output from Git commands with
|
||||||
|
|
||||||
|
git config --global color.ui auto
|
||||||
|
'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Suggest bash completion.
|
||||||
|
if ! bash -i -c 'echo $PS1' | egrep-q '__git_ps1'; then
|
||||||
|
echo '
|
||||||
|
A dynamic, informative Git shell prompt can be obtained by sourcing
|
||||||
|
the git bash-completion script in your "~/.bashrc". Set the PS1
|
||||||
|
environmental variable as suggested in the comments at the top of the
|
||||||
|
bash-completion script. You may need to install the bash-completion
|
||||||
|
package from your distribution to obtain it.
|
||||||
|
'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Suggest merge tool.
|
||||||
|
if test -z "$(git config --get merge.tool)"; then
|
||||||
|
echo '
|
||||||
|
One may configure Git to load a merge tool with
|
||||||
|
|
||||||
|
git config merge.tool <toolname>
|
||||||
|
|
||||||
|
See "git help mergetool" for more information.
|
||||||
|
'
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
cd "${BASH_SOURCE%/*}/.." &&
|
||||||
|
Utilities/GitSetup/setup-user && echo &&
|
||||||
|
Utilities/GitSetup/setup-hooks && echo &&
|
||||||
|
Utilities/GitSetup/setup-stage && echo &&
|
||||||
|
(Utilities/GitSetup/setup-ssh ||
|
||||||
|
echo 'Failed to setup SSH. Run this again to retry.') && echo &&
|
||||||
|
Utilities/GitSetup/tips
|
||||||
|
|
||||||
|
# Rebase master by default
|
||||||
|
git config rebase.stat true
|
||||||
|
git config branch.master.rebase true
|
||||||
Loading…
Reference in New Issue