Summary

Fix diff download for patches with Windows line endings

Review Request #10090 — Created July 16, 2018 and discarded Aug. 4, 2024, 10:44 a.m.

Information

Owner

easyb

Repository

Review Board

Branch

release-3.0.x

Bugs

Depends On

Reviewers

Groups

reviewboard

People

Description

Review Board normalizes line endings to LF. This is a problem on Windows
where files have CRLF line endings. A downloaded raw diff file should
have the same line endings as the uploaded diff.

Bugs closed: 2916

Testing Done

Sucessfully ran unit tests.

flake8 passed.

JSHint passed.

Testing Done:: ~
Relevant unit tests pass.
~
Ran unit tests. Currently failing:
+
+
reviewboard.reviews.tests.test_comment_diff_fragments_view.CommentDiffFragmentsViewTests.test_get_with_unicode
+
reviewboard.scmtools.tests.test_cvs.CVSTests.test_unicode_diff
+
reviewboard.scmtools.tests.test_git.GitTests.test_diff_with_unicode
+
reviewboard.scmtools.tests.test_hg.MercurialTests.test_diff_parser_unicode
+
reviewboard.scmtools.tests.test_hg.MercurialTests.test_git_diff_parsing_unicode
+
reviewboard.scmtools.tests.test_perforce.PerforceTests.test_unicode_diff
+
reviewboard.scmtools.tests.test_svn.SubvertpyTests.test_unicode_diff

Testing Done:

~		Ran unit tests. Currently failing:
	~	Sucessfully ran unit tests.
-
-		reviewboard.reviews.tests.test_comment_diff_fragments_view.CommentDiffFragmentsViewTests.test_get_with_unicode
-		reviewboard.scmtools.tests.test_cvs.CVSTests.test_unicode_diff
-		reviewboard.scmtools.tests.test_git.GitTests.test_diff_with_unicode
-		reviewboard.scmtools.tests.test_hg.MercurialTests.test_diff_parser_unicode
-		reviewboard.scmtools.tests.test_hg.MercurialTests.test_git_diff_parsing_unicode
-		reviewboard.scmtools.tests.test_perforce.PerforceTests.test_unicode_diff
-		reviewboard.scmtools.tests.test_svn.SubvertpyTests.test_unicode_diff

Commit:

558606a2bb184a6f4736cf45548cf255e09a980b

1f3a6869c9fecffd24085d791316bb74a42d587c

Diff:

Revision 2 (+69 -3)

Show changes

	reviewboard/diffviewer/managers.py
	reviewboard/diffviewer/models.py
	reviewboard/diffviewer/parser.py
	reviewboard/diffviewer/evolutions/__init__.py
	reviewboard/diffviewer/evolutions/crlf.py
	reviewboard/diffviewer/tests/test_diff_parser.py
	reviewboard/reviews/tests/test_download_raw_diff_view.py
	reviewboard/testing/testcase.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Change Summary:

fix

Commit:

1f3a6869c9fecffd24085d791316bb74a42d587c

ff319308a65f549d518546d01b850db2693e060d

Diff:

Revision 3 (+69 -3)

Show changes

	reviewboard/diffviewer/managers.py
	reviewboard/diffviewer/models.py
	reviewboard/diffviewer/parser.py
	reviewboard/diffviewer/evolutions/__init__.py
	reviewboard/diffviewer/evolutions/crlf.py
	reviewboard/diffviewer/tests/test_diff_parser.py
	reviewboard/reviews/tests/test_download_raw_diff_view.py
	reviewboard/testing/testcase.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

reviewboard/diffviewer/models.py (Diff revision 3)

The DileDiff.diff property is not only called when downloading diffs. Is this a problem? Alternatively, we could introduce a new property.

Status:: Discarded

~		Relevant unit tests pass.
	~	Ran unit tests. Currently failing:
	+
	+	reviewboard.reviews.tests.test_comment_diff_fragments_view.CommentDiffFragmentsViewTests.test_get_with_unicode
	+	reviewboard.scmtools.tests.test_cvs.CVSTests.test_unicode_diff
	+	reviewboard.scmtools.tests.test_git.GitTests.test_diff_with_unicode
	+	reviewboard.scmtools.tests.test_hg.MercurialTests.test_diff_parser_unicode
	+	reviewboard.scmtools.tests.test_hg.MercurialTests.test_git_diff_parsing_unicode
	+	reviewboard.scmtools.tests.test_perforce.PerforceTests.test_unicode_diff
	+	reviewboard.scmtools.tests.test_svn.SubvertpyTests.test_unicode_diff