Update contributors guide to use rbt patch.

Review Request #231 — Created April 15, 2014 and discarded

travis
pants
pants-reviews
lahosken
Use "./rbt patch" to commit changes on master rather than merging a branch. This ensures you commit what has been reviewed, and works when you don't have a local branch with the change (community contribution for example). I've been using this workflow for some time and it works really well.


LA
  1. Oh cool, I have a ship-it on one of my branches, so I can try this workflow out right now. *battens down hatches*
  2. 
      
LA
  1. :-(
    
    Patch is being applied from request 191 with diff revision  1.
    Failed to execute command: ['git', 'commit', '-m', u'docs: some twitter/commons cleanup; pingpong->hello\n\nThere were some mentions of twitter/commons that became pants\nThere were some "../.." that became ".."\n\nUse examples/hello as sample code instead of examples/pingpong. Pingpong\'s a great program to show off twitter/commons; it\'s not so great for a simple Pants example\n\nTesting Done:\nDoc generation now has many fewer failed-include warnings, yay\n\nReviewed at https://rbcommons.com/s/twitter/r/191/\n', u'--author="larry hosken (Twitter) <mister@lahosken.san-francisco.ca.us>"']
    1. What does --debug  mode say?
    2. oh, that --debug sure is useful, it mentions where it didn't like the patch:
      
      $ ./rbt patch --debug -c 191
      >>> RBTools 0.6
      >>> Python 2.7.6 (default, Dec 27 2013, 13:28:54) 
      [GCC 4.2.1 (Apple Inc. build 5666) (dot 3)]
      >>> Running on Darwin-13.1.0-x86_64-i386-64bit
      >>> Home = /Users/lhosken
      >>> Current directory = /Users/lhosken/workspace/pants
      >>> Checking for a Subversion repository...
      >>> Running: svn info --non-interactive
      >>> Command exited with rc 1: ['svn', 'info', '--non-interactive']
      svn: E155007: '/Users/lhosken/workspace/pants' is not a working copy
      ---
      >>> Checking for a Git repository...
      >>> Running: git rev-parse --git-dir
      >>> Running: git config core.bare
      >>> Running: git rev-parse --show-toplevel
      >>> Running: git symbolic-ref -q HEAD
      >>> Running: git config --get branch.master.merge
      >>> Running: git config --get branch.master.remote
      >>> Running: git config --get remote.origin.url
      >>> repository info: Path: git@github.com:pantsbuild/pants.git, Base path: , Supports changesets: False
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/review-requests/191/diffs/
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/review-requests/191/diffs/1/
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/review-requests/191/diffs/1/
      >>> Running: git status --porcelain --untracked-files=no
      Patch is being applied from request 191 with diff revision  1.
      >>> Running: git apply --index /var/folders/0q/hcrr86js0t59yx9qpxhl4dcw0000gp/T/tmpwbavqW
      >>> Command exited with rc 1: ['git', 'apply', '--index', '/var/folders/0q/hcrr86js0t59yx9qpxhl4dcw0000gp/T/tmpwbavqW']
      error: patch failed: src/python/pants/docs/3rdparty_jvm.rst:129
      error: src/python/pants/docs/3rdparty_jvm.rst: patch does not apply
      ---
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/review-requests/191/?force-text-type=plain
      >>> Making HTTP GET request to https://rbcommons.com/s/twitter/api/users/lahosken/
      >>> Running: git commit -m "docs: some twitter/commons cleanup; pingpong->hello
      
      There were some mentions of twitter/commons that became pants
      There were some \"../..\" that became \"..\"
      
      Use examples/hello as sample code instead of examples/pingpong. Pingpong's a great program to show off twitter/commons; it's not so great for a simple Pants example
      
      Testing Done:
      Doc generation now has many fewer failed-include warnings, yay
      
      Reviewed at https://rbcommons.com/s/twitter/r/191/
      " "--author=\"larry hosken (Twitter) <mister@lahosken.san-francisco.ca.us>\""
      Failed to execute command: ['git', 'commit', '-m', u'docs: some twitter/commons cleanup; pingpong->hello\n\nThere were some mentions of twitter/commons that became pants\nThere were some "../.." that became ".."\n\nUse examples/hello as sample code instead of examples/pingpong. Pingpong\'s a great program to show off twitter/commons; it\'s not so great for a simple Pants example\n\nTesting Done:\nDoc generation now has many fewer failed-include warnings, yay\n\nReviewed at https://rbcommons.com/s/twitter/r/191/\n', u'--author="larry hosken (Twitter) <mister@lahosken.san-francisco.ca.us>"']
      On branch master
      Your branch is up-to-date with 'origin/master'.
      
      nothing to commit, working directory clean
      
      
    3. Any brilliant ideas on how I can call "rbt patch" so that it
      
      + tells me if/where there's a problem; but
      + doesn't spew quite so much output as --debug
      
      ?
    4. Since "rbt patch" doesn't work in all cases I'll discard this review.
  2. 
      
TR
Review request changed

Status: Discarded

Loading...