Sorry the command I tested was...

git diff --no-color --no-prefix --no-ext-diff -r -u feature-x..develop

...which outputted a diff. (I'd put the wrong branch name in the command I 
pasted here, I.e. testing..develop when it should have been 
feature-x..develop).

Cheers,
Alex

On Tuesday, 30 July 2013 10:00:07 UTC+1, Alex Lewis wrote:
>
> Hi Christian,
>   Thank you for your help! Sorry I completely missed the new rbt-post 
> tool. I've re-run the command and the output is below. I've also provided 
> the Commit hash ID's in case it helps...
>
> * 1c94727 - (HEAD, feature-x) temporary commit, testing
> * 5fe45c3 - (develop) snapshot versions.
> * b0e6883 - version bump.
> * 046b485 - (git-svn, master) Bug fix #1234
>
> > rbt post --parent=develop --debug -o
> DEBUG:root:Checking for a Subversion repository...
> DEBUG:root:Running: svn info --non-interactive
> DEBUG:root:Command exited with rc 1: ['svn', 'info', '--non-interactive']
> svn: E155007: '/path/to/dev/dir' is not a working copy
> ---
> DEBUG:root:Checking for a Git repository...
> DEBUG:root:Running: git rev-parse --git-dir
> DEBUG:root:Running: git config core.bare
> DEBUG:root:Running: git rev-parse --show-toplevel
> DEBUG:root:Running: git symbolic-ref -q HEAD
> DEBUG:root:Running: git svn info
> DEBUG:root:repository info: Path: http://someserver/svn/repo, Base path: 
> /trunk, Supports changesets: False
> DEBUG:root:Making HTTP GET request to 
> https://ourcodereviewserver.host.net/api/
> DEBUG:root:Making HTTP GET request to https://ourcodereviewserver.host.net
> /api/info/
> DEBUG:root:Running: git merge-base develop refs/heads/feature-x
> DEBUG:root:Running: git diff --no-color --no-prefix --no-ext-diff -r -u 
> develop
> DEBUG:root:Running: git svn find-rev develop
> DEBUG:root:Running: git diff --no-color --no-prefix --no-ext-diff -r -u 
> 5fe45c363bc8600ef727d0b4a441c8ed30e76c84..develop
> DEBUG:root:Running: git svn find-rev 
> 5fe45c363bc8600ef727d0b4a441c8ed30e76c84
> Traceback (most recent call last):
>   File "/usr/local/bin/rbt", line 9, in <module>
>     load_entry_point('RBTools==0.5.1', 'console_scripts', 'rbt')()
>   File 
> "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.1-py2.7.egg/rbtools/commands/main.py",
>  
> line 99, in main
>     command.run_from_argv([RB_MAIN] + args)
>   File 
> "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.1-py2.7.egg/rbtools/commands/__init__.py",
>  
> line 158, in run_from_argv
>     exit_code = self.main(*args) or 0
>   File 
> "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.1-py2.7.egg/rbtools/commands/post.py",
>  
> line 473, in main
>     if len(diff) == 0:
> TypeError: object of type 'NoneType' has no len()
>
>
>    1. git merge-base develop refs/heads/feature-x - Outputs hash id - 
>    5fe45c363bc8600ef727d0b4a441c8ed30e76c84
>    2. git diff --no-color --no-prefix --no-ext-diff -r -u develop - Diff 
>    output.
>    3. git svn find-rev develop - No output.
>    4. git diff --no-color --no-prefix --no-ext-diff -r -u 
>    5fe45c363bc8600ef727d0b4a441c8ed30e76c84..develop - No output.
>    5. git svn find-rev 5fe45c363bc8600ef727d0b4a441c8ed30e76c84 - Still 
>    no output.
>
>
> A couple of things that might help...
>
>    - I'n using Git 1.8.3.4 on Ubuntu 13.04
>    - I noticed is that *git diff* doesn't have a "-r" option as far as I 
>    could see from the man page, it does -R and --raw though. The -r is not 
>    having any affect on the output though (as far as I can tell). 
>    - I did git diff --no-color --no-prefix --no-ext-diff -r -u 
>    testing..develop and that worked fine, well it outputted the diff so 
>    it looked ok to me :)
>
> Just to confirm what I'd like to achieve. I'm using git-svn locally 
> against an SVN server, using branches to do my work that I'd like to submit 
> for review. I'll amend, squash, rebase, etc. to incorporate the changes 
> into my local branch as per the review and to keep the commits tidy. Once I 
> get enough *Ship It* responses on the final diff I'll commit the code to 
> SVN in it's final state, with a commit message pointing to the review.
>
> Thanks again for your help.
>
> Cheers,
> Alex
>
> On Monday, 29 July 2013 19:14:47 UTC+1, Christian Hammond wrote:
>>
>> This looks like a bug, and not something you're doing wrong.
>>
>> Would you mind trying this with rbt-post instead of post-review (same 
>> arguments) and seeing what the failure case is?
>>
>> rbt-post is the successor to post-review.
>>
>> Christian
>>
>>
>> On Jul 29, 2013, at 8:48, Alex Lewis <alex.l...@gmail.com> wrote:
>>
>> Hi,
>>   Please forgive me for raising this issue as I believe it has been 
>> raised a couple of times over the years but I didn't see a resolution to 
>> those issues and I'm seeing it with post-review 0.5.1. I hope you don't 
>> mind.
>>
>>   I have the following branch setup...
>>
>>   |- xxx (feature-x)
>>   |- xxx
>>   |- xxx
>>   |- yyy (develop)
>>   |- yyy
>>   |- zzz (master) (git-svn)
>>
>> ...where xxx, yyy and zzz are commits.
>>
>> As far as I understand it, to post a review of just the changes 
>> introduced by feature-x excluding the changes introduced by develop I use 
>> the --parent flag set to "develop". If I do this the command fails with an 
>> error about a NoneType (see debug output below). I believe the cause of the 
>> issue is that post-review tries to do a git svn find-rev on the yyy commits 
>> which aren't in SVN, so the find-rev returns nothing and post-review fails.
>>
>> Am I doing the right with the parent flag and if I am is there any chance 
>> that post-review could support this case in the future?
>>
>> I can work around this issue by creating a new branch from feature-x and 
>> rebasing that branch directly on master and raise the review from that 
>> branch without supplying the parent flag. Although this workaround exists 
>> the workflow is not ideal. Apologies if it's just me doing something stupid.
>>
>> Thanks for your help.
>>
>> Cheers,
>> Alex
>>
>> (Please note I've changed some of the path values in the debug below to 
>> obfuscate private info)
>> >>> RBTools 0.5.1
>> >>> Python 2.7.4 (default, Apr 19 2013, 18:28:01) 
>> [GCC 4.7.3]
>> >>> Running on Linux-3.8.0-26-generic-x86_64-with-Ubuntu-13.04-raring
>> >>> Home = /home/alex
>> >>> Current Directory = /path/to/dev/dir
>> >>> Checking the repository type. Errors shown below are mostly harmless.
>> DEBUG:root:Checking for a Subversion repository...
>> DEBUG:root:Running: svn info --non-interactive
>> DEBUG:root:Command exited with rc 1: ['svn', 'info', '--non-interactive']
>> svn: E155007: '/path/to/dev/dir' is not a working copy
>> ---
>> DEBUG:root:Checking for a Git repository...
>> DEBUG:root:Running: git rev-parse --git-dir
>> DEBUG:root:Running: git config core.bare
>> DEBUG:root:Running: git rev-parse --show-toplevel
>> DEBUG:root:Running: git symbolic-ref -q HEAD
>> DEBUG:root:Running: git svn info
>> DEBUG:root:repository info: Path: http://someserver/svn/repo, Base path: 
>> /trunk, Supports changesets: False
>> >>> Finished checking the repository type.
>> >>> HTTP GETting api/info/
>> DEBUG:root:Running: git merge-base develop refs/heads/feature-x
>> DEBUG:root:Running: git diff --no-color --no-prefix --no-ext-diff -r -u 
>> develop
>> DEBUG:root:Running: git svn find-rev develop
>> DEBUG:root:Running: git diff --no-color --no-prefix --no-ext-diff -r -u 
>> 5fe45c363bc8600ef727d0b4a441c8ed30e76c84..develop
>> DEBUG:root:Running: git svn find-rev 
>> 5fe45c363bc8600ef727d0b4a441c8ed30e76c84
>> Traceback (most recent call last):
>>   File "/usr/local/bin/post-review", line 9, in <module>
>>     load_entry_point('RBTools==0.5.1', 'console_scripts', 'post-review')()
>>   File 
>> "/usr/local/lib/python2.7/dist-packages/RBTools-0.5.1-py2.7.egg/rbtools/postreview.py",
>>  
>> line 1334, in main
>>     if len(diff) == 0:
>> TypeError: object of type 'NoneType' has no len()
>>
>> -- 
>> 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...@googlegroups.com
>> For more options, visit this group at 
>> http://groups.google.com/group/reviewboard?hl=en
>> --- 
>> You received this message because you are subscribed to the Google Groups 
>> "reviewboard" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to reviewboard...@googlegroups.com.
>> For more options, visit https://groups.google.com/groups/opt_out.
>>  
>>  
>>
>>

-- 
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
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to