Issue 1741 in reviewboard: Stray control characters with perforce diff
Status: New
Owner:
Labels: Type-Defect Priority-Medium
New issue 1741 by December1981: Stray control characters with perforce diff
http://code.google.com/p/reviewboard/issues/detail?id=1741
*NOTE: Do not post confidential information in this bug report.*
What version are you running?
1.0.9
What steps will reproduce the problem?
1. Add, say, a carriage return character \r directly to a file under
perforce
2. Post a review with this edited file in the perforce changelist
3. patch will have trouble understanding the diff, as it will have \n\n in
the middle of the diff
Please provide any additional information below.
I got round this by adding the two lines below (after line 104 in
diffutils.py)
diff = convert_line_endings(diff)
--# filter any strings of \n characters = 2 in the middle of the diff
--diff = re.sub(r'\n{2,}(.)', r'\n\1', diff)
This was a temporary fix for me - it doesn't capture the additions to the
file in this pathological case, but it stops the exception generated when
patch returns a failure (and if there were other genuine differences in the
file, these would appear normally in the diff view)
I also noticed that diffutils.py has the following lines of code at line 79
temp = data.replace('\r\r\n', '\n')
temp = data.replace('\r\n', '\n')
temp = temp.replace('\r', '\n')
Shouldn't the second line be ?
temp = temp.replace('\r\n', '\n')
--
You received this message because you are subscribed to the Google Groups
reviewboard-issues group.
To post to this group, send email to reviewboard-iss...@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 1742 in reviewboard: Awkward workflow when reviewing code.
Status: New Owner: Labels: Type-Defect Priority-Medium New issue 1742 by earthling: Awkward workflow when reviewing code. http://code.google.com/p/reviewboard/issues/detail?id=1742 What version are you running? 1.0.9 What's the URL of the page containing the problem? It starts by clicking the link in the review request. What steps will reproduce the problem? 1. Click the link in the review request. 2. It's completely unapparent what you're supposed to do. What is the expected output? What do you see instead? I usually click the review button. But then you're taken to an overlay that has a checkbox ship it and an unlabeled text area. Clicking the back button doesn't work, so you have to go back to your email and click the request link again or navigate there some other way. Clicking the view diff button is actually what you want. When you do that, the diff shows up, but then there's no obvious way to approve the diff. A big approve or diff button that looks like a submit button would really help. Instead, you have to click on a little tab in the upper right that says review. What operating system are you using? What browser? Please provide any additional information below. One possible quick and dirty solution might be to go straight to the diff from the email link. Then a prominent way to approve the diff would make the whole process more obvious. -- You received this message because you are subscribed to the Google Groups reviewboard-issues group. To post to this group, send email to reviewboard-iss...@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.
