You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2013/12/06 21:37:49 UTC
git commit: Update rbt to unstable version and update docs.
Updated Branches:
refs/heads/master 4be8749bb -> f34ba1e0c
Update rbt to unstable version and update docs.
This change updates rbt for automatically-generated commit message
(./rbt patch --commit) support. It also updates the contributor
documentation to suggest its use for all commits to master.
Testing Done:
This review was posted using the new workflow.
Verified that ./rbt works in a clean repo and one with an old version of
rbtools bootstrapped.
Reviewed at https://reviews.apache.org/r/16073/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/f34ba1e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/f34ba1e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/f34ba1e0
Branch: refs/heads/master
Commit: f34ba1e0c37d63b2ad94e706d44dadc6c04c5861
Parents: 4be8749
Author: Kevin Sweeney <ke...@apache.org>
Authored: Fri Dec 6 12:37:10 2013 -0800
Committer: Kevin Sweeney <ke...@apache.org>
Committed: Fri Dec 6 12:37:10 2013 -0800
----------------------------------------------------------------------
docs/contributing.md | 14 ++++++++------
rbt | 17 ++++++++++++-----
2 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f34ba1e0/docs/contributing.md
----------------------------------------------------------------------
diff --git a/docs/contributing.md b/docs/contributing.md
index cac4429..d337da2 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -22,17 +22,19 @@ fields in your browser and hit Publish.
Merging Your Own Review (Committers)
------------------------------------
-Once you have shipits from the right committers, merge your changes in a single squash commit
-and mark the review as submitted. The typical workflow is
+Once you have shipits from the right committers, merge your changes in a single commit and mark
+the review as submitted. The typical workflow is:
git checkout master
git pull origin master
- git merge --squash my_feature_branch
- git commit
- git show master # Verify everything looks sane
+ ./rbt patch -c <RB_ID> # Verify the automatically-generated commit message looks sane,
+ # editing if necessary.
+ git show master # Verify everything looks sane
git push origin master
./rbt close <RB_ID>
- git branch -d my_feature_branch
+
+Note that even if you're developing using feature branches you will not use `git merge` - each
+commit will be an atomic change accompanied by a ReviewBoard entry.
Merging Someone Else's Review
-----------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f34ba1e0/rbt
----------------------------------------------------------------------
diff --git a/rbt b/rbt
index 8f01ff9..7efe58c 100755
--- a/rbt
+++ b/rbt
@@ -1,12 +1,19 @@
#!/bin/sh -e
# Wrapper script for self-bootstrapping rbt.
-# TODO(ksweeney): Use ./pants py here instead of virtualenv.
-if ! [ -f build-support/rbtools/BOOTSTRAPPED ]; then
- echo Bootstrapping rbtools
+
+# TODO(kevints): Pin to stable version after patch --commit is available.
+# Stable version of the release-0.5.x branch
+RBTOOLS_VERSION=51b488bc72686c7db46189e4b41eae42a5500cc8
+if ! [ -f build-support/rbtools/BOOTSTRAPPED ] || \
+ [ x`cat build-support/rbtools/BOOTSTRAPPED` != x$RBTOOLS_VERSION ]; then
+
+ echo Bootstrapping rbtools @ $RBTOOLS_VERSION
+ rm -fr build-support/rbtools
./build-support/virtualenv build-support/rbtools
source build-support/rbtools/bin/activate
- pip install RBTools==0.5
- touch build-support/rbtools/BOOTSTRAPPED
+ pip install -e "git+https://github.com/reviewboard/rbtools@$RBTOOLS_VERSION#egg=RBTools"
+ echo $RBTOOLS_VERSION > build-support/rbtools/BOOTSTRAPPED
fi
source build-support/rbtools/bin/activate
+# TODO(kevints): Use ./pants py here instead of virtualenv.
exec rbt "$@"