def test_diff_converter(self):
comment_lines = [
"Hey people,\n",
"\n",
"See my awesome patch below!\n",
"\n",
" - Cool Hacker\n",
"\n",
]
revision_lines = [
"Subversion Revision 289799\n",
]
svn_diff_lines = [
"Index: Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
"===================================================================\n",
"--- Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
"+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
"@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
]
self.assertEqual(diff_parser.get_diff_converter(svn_diff_lines),
diff_parser.svn_diff_to_svn_diff)
self.assertEqual(
diff_parser.get_diff_converter(comment_lines + svn_diff_lines),
diff_parser.svn_diff_to_svn_diff)
self.assertEqual(
diff_parser.get_diff_converter(revision_lines + svn_diff_lines),
diff_parser.svn_diff_to_svn_diff)
git_diff_lines = [
("diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py "
"b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n"),
"index 3c5b45b..0197ead 100644\n",
"--- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
"+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
"@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
]
self.assertEqual(diff_parser.get_diff_converter(git_diff_lines),
diff_parser.git_diff_to_svn_diff)
self.assertEqual(
diff_parser.get_diff_converter(comment_lines + git_diff_lines),
diff_parser.git_diff_to_svn_diff)
self.assertEqual(
diff_parser.get_diff_converter(revision_lines + git_diff_lines),
diff_parser.git_diff_to_svn_diff)
def convert_to_svn(cls, diff):
lines = StringIO.StringIO(diff).readlines()
convert = diff_parser.get_diff_converter(lines)
return "".join(convert(x) for x in lines)
def convert_to_svn(cls, diff):
lines = StringIO.StringIO(diff).readlines()
convert = diff_parser.get_diff_converter(lines)
return "".join(convert(x) for x in lines)
