Re: post-review with git-svn parent throwing error
Guys,
I had some time today to take a look at this again and figured out
that is a revision issue. Seems that something don't work ok with git
and svn revisions numbers.
I have a patch for the script but don't know the workflow from here.
Should I create a bug and attach the proposed patch to it? Should I
ask these questions in another list?
Thanks,
Martin
On Fri, Feb 11, 2011 at 18:15, marr...@gmail.com wrote:
> Well, I started with two new branches, topic_a and topic_b, to avoid
> any commit interference
>
> The work was:
>
> $ git checkout -b topic_a
> $ vim doc/AUTHORS.rst
> $ commit
> $ git checkout -b topic_b
> $ vim doc/INSTALL.rst
> $ commit
> $ git checkout topic_a
> $ post-review --guess-summary --guess-description
> Review request #2188 posted.
>
> http://review-board/r/2188
>
> $ git checkout topic_b
> $ post-review --guess-summary --guess-description --parent=topic_a
> Traceback (most recent call last):
> File "/usr/local/bin/post-review", line 9, in
> load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')()
> File
> "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
> line 2861, in main
> submit_as=options.submit_as)
> File
> "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
> line 2554, in tempt_fate
> parent_diff_content)
> File
> "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
> line 503, in upload_diff
> debug("Uploading diff, size: %d" % len(diff_content))
> TypeError: object of type 'NoneType' has no len()
>
> So now I run what you asked me, --debug and --output-diff
>
> $ post-review --guess-summary --guess-description --parent=topic_a
> --debug --output-diff
svn info
git rev-parse --git-dir
git symbolic-ref -q HEAD
git svn info
repository info: Path: http://svn_server/repos/backend, Base path: /trunk,
Supports changesets: False
git merge-base topic_a refs/heads/topic_b
git diff --no-color --no-prefix -r -u topic_a..
git svn find-rev topic_a
git diff --no-color --no-prefix -r -u
c253759707fc49d670409e15b0e5a9f92804cebf..topic_a
git svn find-rev c253759707fc49d670409e15b0e5a9f92804cebf
git log --pretty=format:%s HEAD^..
git log --pretty=format:%s%n%n%b topic_a..
> None
>
> But git diff shows me the difference between topic_b and topic_a
>
> $ git diff topic_a
> diff --git a/doc/INSTALL.rst b/doc/INSTALL.rst
> index 05236e4..3553220 100644
> --- a/doc/INSTALL.rst
> +++ b/doc/INSTALL.rst
> @@ -1,3 +1,5 @@
> +TEST TEST TEST
> +
> ==
> Installing
> ==
>
>
>
> Don't really know why the changes between the branches are not seen by
> the post-review. This weekend I will test it with a pure git
> repository just to be sure that is only that happening with git-svn
> (at least to me)
>
> Thanks,
>
> On Fri, Feb 11, 2011 at 17:46, Christian Hammond wrote:
>> Can you run with --output-diff and see if it gives you anything useful? Also
>> with --debug to see which commands it executes.
>>
>> Christian
>>
>> --
>> Christian Hammond - chip...@chipx86.com
>> Review Board - http://www.reviewboard.org
>> VMware, Inc. - http://www.vmware.com
>>
>>
>> On Fri, Feb 11, 2011 at 9:55 AM, Martin wrote:
>>>
>>> Hi everyone,
>>>
>>> I'm working with git-svn and the post-review command is failing when
>>> working on branches. I'm using the --parent and there are differences
>>> between the branches and the master.
>>>
>>> My repo is like this:
>>>
>>> * master -> The one that fetches from svn trunk
>>> mockito_refactor -> Branched from master
>>> mockito_refactor_models -> Branched from mockito-refactor
>>>
>>> I did a review between mockito-refactor and master as usual, but
>>> between mockito-refactor-models and mockito-refactor fails.
>>>
>>> This is what I'm running
>>> laptop15:~/dev/models/quijote.git:mockito_refactor_models$ post-review
>>> --parent=mockito_refactor --guess_summary --guess-description
>>>
>>> And this is the error:
>>> Traceback (most recent call last):
>>> File "/usr/local/bin/post-review", line 9, in
>>> load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')
>>> ()
>>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>>> rbtools/postreview.py", line 2861, in main
>>> submit_as=options.submit_as)
>>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>>> rbtools/postreview.py", line 2554, in tempt_fate
>>> parent_diff_content)
>>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>>> rbtools/postreview.py", line 503, in upload_diff
>>> debug("Uploading diff, size: %d" % len(diff_content))
>>> TypeError: object of type 'NoneType' has no len()
>>>
>>> If I run git diff between the branches I see all the differences.
>>>
>>> Does anyone knows why this is failing?
>>>
>>> The server runs 1.5.1 version.
>>>
>>> Thanks,
>>> Martin
>>>
>>> --
>>> Want to help the
Re: post-review with git-svn parent throwing error
Well, I started with two new branches, topic_a and topic_b, to avoid
any commit interference
The work was:
$ git checkout -b topic_a
$ vim doc/AUTHORS.rst
$ commit
$ git checkout -b topic_b
$ vim doc/INSTALL.rst
$ commit
$ git checkout topic_a
$ post-review --guess-summary --guess-description
Review request #2188 posted.
http://review-board/r/2188
$ git checkout topic_b
$ post-review --guess-summary --guess-description --parent=topic_a
Traceback (most recent call last):
File "/usr/local/bin/post-review", line 9, in
load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')()
File
"/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
line 2861, in main
submit_as=options.submit_as)
File
"/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
line 2554, in tempt_fate
parent_diff_content)
File
"/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/rbtools/postreview.py",
line 503, in upload_diff
debug("Uploading diff, size: %d" % len(diff_content))
TypeError: object of type 'NoneType' has no len()
So now I run what you asked me, --debug and --output-diff
$ post-review --guess-summary --guess-description --parent=topic_a
--debug --output-diff
>>> svn info
>>> git rev-parse --git-dir
>>> git symbolic-ref -q HEAD
>>> git svn info
>>> repository info: Path: http://svn_server/repos/backend, Base path: /trunk,
>>> Supports changesets: False
>>> git merge-base topic_a refs/heads/topic_b
>>> git diff --no-color --no-prefix -r -u topic_a..
>>> git svn find-rev topic_a
>>> git diff --no-color --no-prefix -r -u
>>> c253759707fc49d670409e15b0e5a9f92804cebf..topic_a
>>> git svn find-rev c253759707fc49d670409e15b0e5a9f92804cebf
>>> git log --pretty=format:%s HEAD^..
>>> git log --pretty=format:%s%n%n%b topic_a..
None
But git diff shows me the difference between topic_b and topic_a
$ git diff topic_a
diff --git a/doc/INSTALL.rst b/doc/INSTALL.rst
index 05236e4..3553220 100644
--- a/doc/INSTALL.rst
+++ b/doc/INSTALL.rst
@@ -1,3 +1,5 @@
+TEST TEST TEST
+
==
Installing
==
Don't really know why the changes between the branches are not seen by
the post-review. This weekend I will test it with a pure git
repository just to be sure that is only that happening with git-svn
(at least to me)
Thanks,
On Fri, Feb 11, 2011 at 17:46, Christian Hammond wrote:
> Can you run with --output-diff and see if it gives you anything useful? Also
> with --debug to see which commands it executes.
>
> Christian
>
> --
> Christian Hammond - chip...@chipx86.com
> Review Board - http://www.reviewboard.org
> VMware, Inc. - http://www.vmware.com
>
>
> On Fri, Feb 11, 2011 at 9:55 AM, Martin wrote:
>>
>> Hi everyone,
>>
>> I'm working with git-svn and the post-review command is failing when
>> working on branches. I'm using the --parent and there are differences
>> between the branches and the master.
>>
>> My repo is like this:
>>
>> * master -> The one that fetches from svn trunk
>> mockito_refactor -> Branched from master
>> mockito_refactor_models -> Branched from mockito-refactor
>>
>> I did a review between mockito-refactor and master as usual, but
>> between mockito-refactor-models and mockito-refactor fails.
>>
>> This is what I'm running
>> laptop15:~/dev/models/quijote.git:mockito_refactor_models$ post-review
>> --parent=mockito_refactor --guess_summary --guess-description
>>
>> And this is the error:
>> Traceback (most recent call last):
>> File "/usr/local/bin/post-review", line 9, in
>> load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')
>> ()
>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>> rbtools/postreview.py", line 2861, in main
>> submit_as=options.submit_as)
>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>> rbtools/postreview.py", line 2554, in tempt_fate
>> parent_diff_content)
>> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
>> rbtools/postreview.py", line 503, in upload_diff
>> debug("Uploading diff, size: %d" % len(diff_content))
>> TypeError: object of type 'NoneType' has no len()
>>
>> If I run git diff between the branches I see all the differences.
>>
>> Does anyone knows why this is failing?
>>
>> The server runs 1.5.1 version.
>>
>> Thanks,
>> Martin
>>
>> --
>> 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
>
> --
> 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/
> -~--~~~~--~~--~--~---
Re: post-review with git-svn parent throwing error
Can you run with --output-diff and see if it gives you anything useful? Also
with --debug to see which commands it executes.
Christian
--
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com
On Fri, Feb 11, 2011 at 9:55 AM, Martin wrote:
> Hi everyone,
>
> I'm working with git-svn and the post-review command is failing when
> working on branches. I'm using the --parent and there are differences
> between the branches and the master.
>
> My repo is like this:
>
> * master -> The one that fetches from svn trunk
> mockito_refactor -> Branched from master
> mockito_refactor_models -> Branched from mockito-refactor
>
> I did a review between mockito-refactor and master as usual, but
> between mockito-refactor-models and mockito-refactor fails.
>
> This is what I'm running
> laptop15:~/dev/models/quijote.git:mockito_refactor_models$ post-review
> --parent=mockito_refactor --guess_summary --guess-description
>
> And this is the error:
> Traceback (most recent call last):
> File "/usr/local/bin/post-review", line 9, in
>load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')
> ()
> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
> rbtools/postreview.py", line 2861, in main
>submit_as=options.submit_as)
> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
> rbtools/postreview.py", line 2554, in tempt_fate
>parent_diff_content)
> File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
> rbtools/postreview.py", line 503, in upload_diff
>debug("Uploading diff, size: %d" % len(diff_content))
> TypeError: object of type 'NoneType' has no len()
>
> If I run git diff between the branches I see all the differences.
>
> Does anyone knows why this is failing?
>
> The server runs 1.5.1 version.
>
> Thanks,
> Martin
>
> --
> 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
--
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
post-review with git-svn parent throwing error
Hi everyone,
I'm working with git-svn and the post-review command is failing when
working on branches. I'm using the --parent and there are differences
between the branches and the master.
My repo is like this:
* master -> The one that fetches from svn trunk
mockito_refactor -> Branched from master
mockito_refactor_models -> Branched from mockito-refactor
I did a review between mockito-refactor and master as usual, but
between mockito-refactor-models and mockito-refactor fails.
This is what I'm running
laptop15:~/dev/models/quijote.git:mockito_refactor_models$ post-review
--parent=mockito_refactor --guess_summary --guess-description
And this is the error:
Traceback (most recent call last):
File "/usr/local/bin/post-review", line 9, in
load_entry_point('RBTools==0.2', 'console_scripts', 'post-review')
()
File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
rbtools/postreview.py", line 2861, in main
submit_as=options.submit_as)
File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
rbtools/postreview.py", line 2554, in tempt_fate
parent_diff_content)
File "/usr/local/lib/python2.6/dist-packages/RBTools-0.2-py2.6.egg/
rbtools/postreview.py", line 503, in upload_diff
debug("Uploading diff, size: %d" % len(diff_content))
TypeError: object of type 'NoneType' has no len()
If I run git diff between the branches I see all the differences.
Does anyone knows why this is failing?
The server runs 1.5.1 version.
Thanks,
Martin
--
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
