Issue 4070 - Correctly handle multiline commit messages in the mercurial hook

sitescripts/hg/test/update_issues.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 121 matching lines @@
             'Fixes 1337 no dash'
         ], warning_count=7)
 
     def test_noissue_commits_ignored(self):
         self._run_hook(['Noissue - Foo', 'noissue - Bar'])  # No updates.
 
     def test_single_issue_referenced(self):
         updates = self._run_hook(['Issue 1337 - Foo'], update_count=1)
         self.assertEqual(updates[0][0][0], 1337)
 
+    def test_multiline_commit_message(self):
+        updates = self._run_hook(['Issue 1337 - Foo\nBar',
+                                  'Issue 1337 - Bar.\nBaz',
+                                  'Fixes 2448 - Foo\n\nBar',
+                                  'Fixes 2448 - Bar\n \nBaz'],
+                                 update_count=2)
+        comment_1337 = updates[0][0][1]
+        self.assertIn('Issue 1337 - Foo...]', comment_1337)
+        self.assertIn('Issue 1337 - Bar...]', comment_1337)
+        comment_2448 = updates[1][0][1]
+        self.assertIn('Fixes 2448 - Foo]', comment_2448)
+        self.assertIn('Fixes 2448 - Bar]', comment_2448)
+
+    def test_multiline_commit_message_crlf(self):
+        updates = self._run_hook(['Issue 1337 - Foo\r\nBar',
+                                  'Issue 1337 - Bar.\r\nBaz',
+                                  'Fixes 2448 - Foo\r\n\r\nBar',
+                                  'Fixes 2448 - Bar\r\n \r\nBaz'],
+                                 update_count=2)
+        comment_1337 = updates[0][0][1]
+        self.assertIn('Issue 1337 - Foo...]', comment_1337)
+        self.assertIn('Issue 1337 - Bar...]', comment_1337)
+        comment_2448 = updates[1][0][1]
+        self.assertIn('Fixes 2448 - Foo]', comment_2448)
+        self.assertIn('Fixes 2448 - Bar]', comment_2448)
+
     def test_missing_issue_referenced(self):
         self._run_hook(['Issue 42 - Bar'], warning_count=1)
 
     def test_multiple_issues_referenced(self):
         updates = self._run_hook(['Issue 1337, fixes 2448 - Foo'],
                                  update_count=2)
         self.assertEqual(updates[0][0][0], 1337)
         self.assertEqual(updates[1][0][0], 2448)
 
     def test_multiple_commits_for_issue(self):
@@ skipping 55 matching lines @@
 
     def test_fix_nonexistent(self):
         self._run_hook(['Fixes 7331 - Foo'], warning_count=1)
 
     def test_fix_closed_with_assigned_milestone(self):
         self._run_hook(['fixes 3559 - Foo'])  # No updates.
 
 
 if __name__ == '__main__':
     unittest.main()