Re: git and diffs against branches

2009-10-23 Thread Dan Savilonis

Lobby for http://reviews.reviewboard.org/r/1144/ to get committed and
you should be all set. :) For now, the only options are to use the web
form or specify a revision range manually.

Can you explain more about the error with the web form? You mentioned
git diff, and if you meant that literally, that would end up diffing
your working copy changes against whatever is your HEAD. If your HEAD
is not a revision in the remote repository, RB won't understand what
you are diffing against.

Dan

On Oct 23, 2:10 pm, Chris Clark chris.cl...@ingres.com wrote:
 Whilst I use other distributed SCM's I've only just started with git (as
 ReviewBoard uses it) and I think I'm having some trouble understanding
 git (and reviewboard).

 What I'd like to do is post for review changes/diffs against a branch
 (not master/bleeding edge).

 E.g.

     git clone git://github.com/reviewboard/reviewboard.git
     git checkout release-1.0.5.1
     ## hack on stuff, e.g. git add myfile
     postreview.py --server=http://reviews.reviewboard.org/ --debug

 Here is my output (note headrevs of rbtools and this is actually posted
 explictly with -r1177):

   svn info
   git rev-parse --git-dir
   git svn info
   git svn --version
   git config --get svn-remote.svn.url
   git remote show origin
   repository info: Path:
 git://github.com/reviewboard/reviewboard.git, Base path: , Supports
 changesets: False
   git diff --no-color --full-index master
   Looking for 'reviews.reviewboard.org /' cookie in
 /home/ingres/.post-review-cookies.txt
   Loaded valid cookie -- no login required
   HTTP GETting api/json/reviewrequests/1177/
   Uploading diff, size: 467617
   HTTP POSTing 
 tohttp://reviews.reviewboard.org/api/json/reviewrequests/1177/diff/new/:{}
 Error uploading diff: One or more fields had errors (105)
   {u'fields': {u'path': [u'int argument required']}, u'stat':
 u'fail', u'err': {u'msg': u'One or more fields had errors', u'code': 105}}
 Your review request still exists, but the diff is not attached.

  From the instructions near the end 
 ofhttp://www.reviewboard.org/docs/codebase/dev/getting-started/#getting...
 (Posting Changes for Review) I get the impression this is not allowed?
 The checkout is based on master but it is a different branch,

 I guess this maybe a bug report too as it fails to post but does create
 an empty review without printing out the review number. I ended up
 browsinghttp://reviews.reviewboard.org/r/and looking at the top to
 work out it had created one. Similar behavior if I just do a git diff
 and try and use the web interface (i.e. get int arg required error).

 Help!

 Chris
--~--~-~--~~~---~--~~
Want to help the Review Board project? Donate today at
http://www.reviewboard.org/donate/
Happy user? Let us know at
http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/reviewboard?hl=en
-~--~~~~--~~--~--~---



Re: git and diffs against branches

2009-10-23 Thread Christian Hammond
Make sure you also use --full-index on git diff.

I've been really busy the last couple weeks. In and out of town, busy work
work, etc. I want that change in as much as anyone, just haven't been able
to give it the attention it needs. Soon :)

Christian

-- 
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com


On Fri, Oct 23, 2009 at 2:08 PM, Chris Clark chris.cl...@ingres.com wrote:


 Dan Savilonis wrote:
  Lobby for http://reviews.reviewboard.org/r/1144/ to get committed and
  you should be all set. :) For now, the only options are to use the web
  form or specify a revision range manually.
 

 Consider this me +1 for this ;-)

  Can you explain more about the error with the web form? You mentioned
  git diff, and if you meant that literally, that would end up diffing
  your working copy changes against whatever is your HEAD. If your HEAD
  is not a revision in the remote repository, RB won't understand what
  you are diffing against.
 

 Thanks to your hint I (think I) have this working now (I have a review
 ready to go). So this was user error/trouble learning git.

 I was assuming a diff was all I needed (and the branch would be
 assumed), what I needed to do was:


git diff HEAD file1 file2.

 i.e. add the HEAD.

 Thanks again!

 Chris

  To unsubscribe from this group, send email to
 reviewboard+unsubscr...@googlegroups.comreviewboard%2bunsubscr...@googlegroups.com
 For more options, visit this group at
 http://groups.google.com/group/reviewboard?hl=en
 -~--~~~~--~~--~--~---



--~--~-~--~~~---~--~~
Want to help the Review Board project? Donate today at
http://www.reviewboard.org/donate/
Happy user? Let us know at
http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/reviewboard?hl=en
-~--~~~~--~~--~--~---