| OLD | NEW |
| 1 # Copyright (C) 2009 Google Inc. All rights reserved. | 1 # Copyright (C) 2009 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 "===================================================================
\n", | 98 "===================================================================
\n", |
| 99 "--- Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", | 99 "--- Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", |
| 100 "+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", | 100 "+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", |
| 101 "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n", | 101 "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n", |
| 102 ] | 102 ] |
| 103 self.assertEqual(diff_parser.get_diff_converter(svn_diff_lines), diff_pa
rser.svn_diff_to_svn_diff) | 103 self.assertEqual(diff_parser.get_diff_converter(svn_diff_lines), diff_pa
rser.svn_diff_to_svn_diff) |
| 104 self.assertEqual(diff_parser.get_diff_converter(comment_lines + svn_diff
_lines), diff_parser.svn_diff_to_svn_diff) | 104 self.assertEqual(diff_parser.get_diff_converter(comment_lines + svn_diff
_lines), diff_parser.svn_diff_to_svn_diff) |
| 105 self.assertEqual(diff_parser.get_diff_converter(revision_lines + svn_dif
f_lines), diff_parser.svn_diff_to_svn_diff) | 105 self.assertEqual(diff_parser.get_diff_converter(revision_lines + svn_dif
f_lines), diff_parser.svn_diff_to_svn_diff) |
| 106 | 106 |
| 107 git_diff_lines = [ | 107 git_diff_lines = [ |
| 108 "diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", | 108 ("diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
" |
| 109 "b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n"), |
| 109 "index 3c5b45b..0197ead 100644\n", | 110 "index 3c5b45b..0197ead 100644\n", |
| 110 "--- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", | 111 "--- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", |
| 111 "+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", | 112 "+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n", |
| 112 "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n", | 113 "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n", |
| 113 ] | 114 ] |
| 114 self.assertEqual(diff_parser.get_diff_converter(git_diff_lines), diff_pa
rser.git_diff_to_svn_diff) | 115 self.assertEqual(diff_parser.get_diff_converter(git_diff_lines), diff_pa
rser.git_diff_to_svn_diff) |
| 115 self.assertEqual(diff_parser.get_diff_converter(comment_lines + git_diff
_lines), diff_parser.git_diff_to_svn_diff) | 116 self.assertEqual(diff_parser.get_diff_converter(comment_lines + git_diff
_lines), diff_parser.git_diff_to_svn_diff) |
| 116 self.assertEqual(diff_parser.get_diff_converter(revision_lines + git_dif
f_lines), diff_parser.git_diff_to_svn_diff) | 117 self.assertEqual(diff_parser.get_diff_converter(revision_lines + git_dif
f_lines), diff_parser.git_diff_to_svn_diff) |
| 117 | 118 |
| 118 def test_git_mnemonicprefix(self): | 119 def test_git_mnemonicprefix(self): |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 A | 168 A |
| 168 B | 169 B |
| 169 C | 170 C |
| 170 +D | 171 +D |
| 171 E | 172 E |
| 172 F | 173 F |
| 173 """) | 174 """) |
| 174 | 175 |
| 175 self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_di
ff(x) for x in shortfmt.readlines())) | 176 self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_di
ff(x) for x in shortfmt.readlines())) |
| 176 self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_di
ff(x) for x in inputfmt.readlines())) | 177 self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_di
ff(x) for x in inputfmt.readlines())) |
| OLD | NEW |