Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-12-23 Thread reviewboard 

Updates:
Status: UserError

Comment #15 on issue 2437 by trowb...@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

My guess here is that the diffs are being generated against revisions which  
are not present in the remote repository. Please look into the  
--tracking-branch and --parent options and make sure that the parent  
revision for the diff is always something which has been pushed to the  
remote.


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-24 Thread reviewboard 


Comment #14 on issue 2437 by symphony...@gmail.com: View Diff  
cause patch didn't apply cleanly error when ReviewBoard is used with Git  
repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

We have a similar issue. Looking at the failed diffs, we noticed that  
source file being pulled from the git repo occasionally (when there is a  
failure) includes html that looks like an error page instead of the actual  
file contents.


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-12 Thread reviewboard 


Comment #13 on issue 2437 by honghua@gmail.com: View Diff  
cause patch didn't apply cleanly error when ReviewBoard is used with Git  
repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

The change to both file is to add following sentence.
/* test post-review */

But one is fail and the other is OK.

Attachments:
rb-error.JPG  127 KB

--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-11 Thread reviewboard 


Comment #11 on issue 2437 by honghua@gmail.com: View Diff  
cause patch didn't apply cleanly error when ReviewBoard is used with Git  
repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

Exactly if I add a new file and post the commit, 'View Diff' is OK.
If I change an existed file, the issue happen again.

Please refer to the repository configuration:
General Information
Name:sdk/u-boot.git

Repository Hosting
Hosting service: Custom
Repository type: Git
Path:/home/reviewboard/sdk/u-boot.git/.git


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-10 Thread reviewboard 


Comment #6 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

I tried to increase cache size up to 128MB and 2GB, but the issue still  
happen.

# memcached -u www-data -d -m 128 -l 127.0.0.1 -p 11211
# memcached -u www-data -d -m 2048 -l 127.0.0.1 -p 11211


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-10 Thread reviewboard 


Comment #7 on issue 2437 by trowb...@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

I'm pretty sure the cache miss isn't related. If there's a miss, it will  
then go and fetch the file from the source repository.


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-10 Thread reviewboard 


Comment #8 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

Thank you for the comments.
Then what do you think cause the exception that patch didn't apply cleanly?
It seemed that a small project works well. But it happen when 'view diff'  
of a big project like u-boot or linux.


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-10 Thread reviewboard 


Comment #10 on issue 2437 by trowb...@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

It looks like, from the contents of /tmp/reviewboard.4NIpTN/tmpf8d2eE_,  
that the server isn't returning the right data. In particular, it says Bad  
commit reference: 66648ccdba49bf63cc112f40cd35b50d9240273f, which suggests  
that the server is treating tho SHA1 as a commit ID instead of a blob ID.  
Can you explain how your repository is configured in RB?


--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-09 Thread reviewboard 


Comment #5 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

refer to the log file, we can find that some diff file failed to view  
because cache miss for the key.
2012-01-09 17:26:56,306 - DEBUG - Generating diff viewer page for filediff  
id 58
2012-01-09 17:26:56,308 - DEBUG - Begin: Generating diff file info for  
diffset id 58
2012-01-09 17:26:56,331 - DEBUG - End: Generating diff file info for  
diffset id 58
2012-01-09 17:26:56,332 - DEBUG - Generating diff file info for diffset id  
58 took 0.22316 seconds
2012-01-09 17:26:56,333 - DEBUG - Begin: Generating diff file info for  
diffset id 58, filediff 103
2012-01-09 17:26:56,355 - INFO - Cache miss for key  
gerrit.am.freescale.net:diff-sidebyside-hl-103.
2012-01-09 17:26:56,383 - DEBUG - Begin: Patching file  
arch/powerpc/kernel/setup_64.c
2012-01-09 17:26:56,405 - DEBUG - End: Patching file  
arch/powerpc/kernel/setup_64.c
2012-01-09 17:26:56,406 - DEBUG - Patching file  
arch/powerpc/kernel/setup_64.c took 0.22071 seconds


But exactly, some diff could be view successfully.
2012-01-09 17:33:27,518 - DEBUG - Generating diff viewer page for filediff  
id 38
2012-01-09 17:33:27,520 - DEBUG - Begin: Generating diff file info for  
diffset id 38
2012-01-09 17:33:27,544 - DEBUG - End: Generating diff file info for  
diffset id 38
2012-01-09 17:33:27,545 - DEBUG - Generating diff file info for diffset id  
38 took 0.24039 seconds
2012-01-09 17:33:27,547 - DEBUG - Begin: Generating diff file info for  
diffset id 38, filediff 79
2012-01-09 17:33:27,579 - DEBUG - End: Generating diff file info for  
diffset id 38, filediff 79
2012-01-09 17:33:27,580 - DEBUG - Generating diff file info for diffset id  
38, filediff 79 took 0.31687 seconds
2012-01-09 17:33:27,765 - DEBUG - Done generating diff viewer page for  
filediff id 38



--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-05 Thread reviewboard 

Status: New
Owner: 
Labels: Type-Defect Priority-Medium

New issue 2437 by honghua@gmail.com: View Diff cause patch didn't  
apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

* NOTE: Do not post confidential information in this bug report. *
*   If you need immediate support, please contact*
*   reviewbo...@googlegroups.com *

What version are you running?
ReviewBoard-1.6

What's the URL of the page containing the problem?
http://gerrit.am.freescale.net/r/49/diff/#index_header

What steps will reproduce the problem?
1. Send diff using rbtools

$post-review --guess-description --guess-summary
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 66648cc..6a98051 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -65,6 +65,7 @@
 #include asm/kexec.h
 #include asm/mmu_context.h
 #include asm/code-patching.h
+#include asm/hugetlb.h

 #include setup.h


2. Visit URL which generated review diff  
https://reviewboard.instance/r/49/diff/#index_header
3. when I click View Diff button on the review page, I get the following  
stack trace:


The patch to 'arch/powerpc/kernel/setup_64.c' didn't apply cleanly. The  
temporary files have been left in '/tmp/reviewboard.4NIpTN' for debugging  
purposes. `patch` returned: patching file /tmp/reviewboard.4NIpTN/tmpf8d2eE  
Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file  
/tmp/reviewboard.4NIpTN/tmpf8d2eE-new.rej


Traceback (most recent call last):
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/views.py,  
line 151, in view_diff

interdiffset, highlighting, True)
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py,  
line 1071, in get_diff_files

large_data=True)
   
File /usr/local/lib/python2.6/dist-packages/Djblets-0.6.10-py2.6.egg/djblets/util/misc.py,  
line 155, in cache_memoize

data = lookup_callable()
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py,  
line 1070, in lambda

enable_syntax_highlighting)),
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py,  
line 552, in get_chunks

new = get_patched_file(old, filediff)
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py,  
line 374, in get_patched_file

return patch(filediff.diff, buffer, filediff.dest_file)
   
File /usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py,  
line 242, in patch

(filename, tempdir, patch_output))
Exception: The patch to 'arch/powerpc/kernel/setup_64.c' didn't apply  
cleanly. The temporary files have been left in '/tmp/reviewboard.4NIpTN'  
for debugging purposes.

`patch` returned: patching file /tmp/reviewboard.4NIpTN/tmpf8d2eE
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file  
/tmp/reviewboard.4NIpTN/tmpf8d2eE-new.rej



What is the expected output? What do you see instead?


What operating system are you using? What browser?
ReviewBoard Server - Ubuntu 10.04.2 LTS
FireFox browser 3.6.24 - Windows




--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-05 Thread reviewboard 


Comment #1 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

/tmp/reviewboard.4NIpT/setup_64.c.diff

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index  
66648ccdba49bf63cc112f40cd35b50d9240273f..6a98051bf803ed7cb3d2a1de1be22684be420ae0  
100644

--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -65,6 +65,7 @@
 #include asm/kexec.h
 #include asm/mmu_context.h
 #include asm/code-patching.h
+#include asm/hugetlb.h

 #include setup.h

--
1.5.4.3



--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-05 Thread reviewboard 


Comment #2 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

/tmp/reviewboard.4NIpTN/tmpf8d2eE_

!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
  http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'
head
titlelinux.git - linux
/title
meta name='generator' content='cgit v0.9.0.2-39-g756e'/
meta name='robots' content='index, nofollow'/
link rel='stylesheet' type='text/css' href='/gitolite/cgit.css'/
link rel='shortcut icon' href='/gitolite/favicon.ico'/
link rel='alternate' title='Atom feed'  
href='http://git.am.freescale.net/gitolite/gitweb.cgi/sdk/linux.git/atom/?h=master'  
type='application/atom+xml'/

/head
body
div id='cgit'table id='header'
tr
td class='logo' rowspan='2'a href='/gitolite/gitweb.cgi/'img  
src='/gitolite/cgit-fsl.png' alt='cgit logo'//a/td
td class='main'a href='/gitolite/gitweb.cgi/'index/a : a  
title='linux.git'  
href='/gitolite/gitweb.cgi/sdk/linux.git/'linux.git/a/tdtd  
class='form'form method='get' action=''
input type='hidden' name='id'  
value='66648ccdba49bf63cc112f40cd35b50d9240273f'/select name='h'  
onchange='this.form.submit();'

option value='dpaa-v1.0.x'dpaa-v1.0.x/option
option value='dpaa-v1.1.x'dpaa-v1.1.x/option
option value='master' selected='selected'master/option
option value='qman'qman/option
option value='qoriq-v1.0.x'qoriq-v1.0.x/option
/select input type='submit' name='' value='switch'//form/td/tr
trtd class='sub'linux
/tdtd class='sub right'Kumar Gala/td/tr/table
table class='tabs'trtd
a href='/gitolite/gitweb.cgi/sdk/linux.git/'summary/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/refs/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'refs/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/log/'log/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/tree/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'tree/aa  
class='active'  
href='/gitolite/gitweb.cgi/sdk/linux.git/commit/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'commit/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/diff/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'diff/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/stats/'stats/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/about/'about/a/tdtd  
class='form'form class='right' method='get'  
action='/gitolite/gitweb.cgi/sdk/linux.git/log/'
input type='hidden' name='id'  
value='66648ccdba49bf63cc112f40cd35b50d9240273f'/select name='qt'

option value='grep'log msg/option
option value='author'author/option
option value='committer'committer/option
option value='range'range/option
/select
input class='txt' type='text' size='10' name='q' value=''/
input type='submit' value='search'/
/form
/td/tr/table
div class='content'div class='error'Bad commit reference:  
66648ccdba49bf63cc112f40cd35b50d9240273f/div

/div !-- class=content --
div class='footer'generated  by cgit v0.9.0.2-39-g756e at 2012-01-05  
07:41:25 (GMT)/div

/div !-- id=cgit --
/body
/html

--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Re: Issue 2437 in reviewboard: View Diff cause patch didn't apply cleanly error when ReviewBoard is used with Git repository

2012-01-05 Thread reviewboard 


Comment #3 on issue 2437 by honghua@gmail.com: View Diff cause patch  
didn't apply cleanly error when ReviewBoard is used with Git repository

http://code.google.com/p/reviewboard/issues/detail?id=2437

/tmp/reviewboard.4NIpTN/tmpf8d2eE_-new

!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
  http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'
head
titlelinux.git - linux
/title
meta name='generator' content='cgit v0.9.0.2-39-g756e'/
meta name='robots' content='index, nofollow'/
link rel='stylesheet' type='text/css' href='/gitolite/cgit.css'/
link rel='shortcut icon' href='/gitolite/favicon.ico'/
link rel='alternate' title='Atom feed'  
href='http://git.am.freescale.net/gitolite/gitweb.cgi/sdk/linux.git/atom/?h=master'  
type='application/atom+xml'/

/head
body
div id='cgit'table id='header'
tr
td class='logo' rowspan='2'a href='/gitolite/gitweb.cgi/'img  
src='/gitolite/cgit-fsl.png' alt='cgit logo'//a/td
td class='main'a href='/gitolite/gitweb.cgi/'index/a : a  
title='linux.git'  
href='/gitolite/gitweb.cgi/sdk/linux.git/'linux.git/a/tdtd  
class='form'form method='get' action=''
input type='hidden' name='id'  
value='66648ccdba49bf63cc112f40cd35b50d9240273f'/select name='h'  
onchange='this.form.submit();'

option value='dpaa-v1.0.x'dpaa-v1.0.x/option
option value='dpaa-v1.1.x'dpaa-v1.1.x/option
option value='master' selected='selected'master/option
option value='qman'qman/option
option value='qoriq-v1.0.x'qoriq-v1.0.x/option
/select input type='submit' name='' value='switch'//form/td/tr
trtd class='sub'linux
/tdtd class='sub right'Kumar Gala/td/tr/table
table class='tabs'trtd
a href='/gitolite/gitweb.cgi/sdk/linux.git/'summary/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/refs/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'refs/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/log/'log/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/tree/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'tree/aa  
class='active'  
href='/gitolite/gitweb.cgi/sdk/linux.git/commit/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'commit/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/diff/?id=66648ccdba49bf63cc112f40cd35b50d9240273f'diff/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/stats/'stats/aa  
href='/gitolite/gitweb.cgi/sdk/linux.git/about/'about/a/tdtd  
class='form'form class='right' method='get'  
action='/gitolite/gitweb.cgi/sdk/linux.git/log/'
input type='hidden' name='id'  
value='66648ccdba49bf63cc112f40cd35b50d9240273f'/select name='qt'

option value='grep'log msg/option
option value='author'author/option
option value='committer'committer/option
option value='range'range/option
/select
input class='txt' type='text' size='10' name='q' value=''/
input type='submit' value='search'/
/form
/td/tr/table
div class='content'div class='error'Bad commit reference:  
66648ccdba49bf63cc112f40cd35b50d9240273f/div

/div !-- class=content --
div class='footer'generated  by cgit v0.9.0.2-39-g756e at 2012-01-05  
07:41:25 (GMT)/div

/div !-- id=cgit --
/body
/html

--
You received this message because you are subscribed to the Google Groups 
reviewboard-issues group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.