Merge lp:~jugmac00/loggerhead/fix-viewing-large-files into lp:loggerhead

[Jürgen Gmach]

Fix highlighting for large files

[Jelmer Vernooij (jelmer)]

Still LGTM, thanks!

review: Approve

[Jürgen Gmach (jugmac00)]

Thanks Jelmer!

So, now I am stuck. How do I get this merged now?

Is there buildbot involved so it would be enough to mark this MP as "approved"?

If not, I'd appreciate detailed instructions.

My current status - I have committed and pushed from the local `fix-viewing-large-files` directory/branch:

```
~/bzr/loggerhead via 🐍 v3.8.10 (venv)
❯ brz status
unknown:
  fix-viewing-large-files
```

[Colin Watson (cjwatson)]

There's a Jenkins job that should deal with merges. I'll try top-approving this and see whether it works.

[Otto Co-Pilot (otto-copilot)]

Voting criteria not met
https://jenkins.ols.canonical.com/online-services/job/loggerhead/28/

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2020-07-08 17:14:19 +0000
+++ NEWS	2022-04-03 12:48:33 +0000
@@ -1,6 +1,11 @@
 What's changed in loggerhead?
 =============================
 
+unreleased
+----------
+
+    - Fix highlighting for large files. (Jürgen Gmach, #1966702)
+
 1.20.0
 ----
 

=== modified file 'loggerhead/highlight.py'
--- loggerhead/highlight.py	2021-11-15 14:40:11 +0000
+++ loggerhead/highlight.py	2022-04-03 12:48:33 +0000
@@ -37,7 +37,7 @@
     """
 
     if len(text) > MAX_HIGHLIGHT_SIZE:
-        return map(escape,  breezy.osutils.split_lines(text))
+        return list(map(escape,  breezy.osutils.split_lines(text)))
 
     formatter = HtmlFormatter(style=style, nowrap=True, classprefix='pyg-')
 

=== modified file 'loggerhead/tests/__init__.py'
--- loggerhead/tests/__init__.py	2018-10-20 15:28:43 +0000
+++ loggerhead/tests/__init__.py	2022-04-03 12:48:33 +0000
@@ -32,4 +32,5 @@
             'test_revision_ui',
             'test_templating',
             'test_util',
+            'test_highlight',
         ]])

=== added file 'loggerhead/tests/test_highlight.py'
--- loggerhead/tests/test_highlight.py	1970-01-01 00:00:00 +0000
+++ loggerhead/tests/test_highlight.py	2022-04-03 12:48:33 +0000
@@ -0,0 +1,33 @@
+# Copyright 2022 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from breezy import tests
+
+from ..highlight import highlight
+
+
+class TestHighLight(tests.TestCase):
+    def test_no_highlighting_for_big_texts(self):
+        rv = highlight(
+            path="",
+            text="text\n" * 102401,  # bigger than MAX_HIGHLIGHT_SIZE
+            encoding="utf-8",
+        )
+        self.assertIsInstance(rv, list)
+        self.assertLength(102401, rv)
+        # no highlighting applied
+        for item in rv:
+            self.assertEqual("text\n", item)

=== modified file 'requirements.txt'
--- requirements.txt	2022-02-23 19:28:51 +0000
+++ requirements.txt	2022-04-03 12:48:33 +0000
@@ -9,3 +9,5 @@
 bleach < 4.0.0; python_version <= "3.5"
 packaging < 21.0; python_version <= "3.5"
 https://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-5.2.tar.gz
+Pygments < 2.6; python_version < "3"
+Pygments; python_version >= "3"