kallithea Changeset - e46d0a90556e

Changeset - e46d0a90556e

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-10-27 14:33:29
marcin@python-works.com

fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage
was causing some unpredictable behavior

1 file changed with 6 insertions and 2 deletions:

rhodecode/lib/diffs.py

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -24,13 +24,12 @@ @@
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import re
 import difflib
 import markupsafe
 import logging
 from itertools import tee, imap
 from mercurial import patch
 from mercurial.mdiff import diffopts
@@ @@ -168,13 +167,15 @@ class DiffProcessor(object): @@
         if differ == 'difflib':
             self.differ = self._highlight_line_difflib
         else:
             self.differ = self._highlight_line_udiff
     def escaper(self, string):
         return markupsafe.escape(string)
         return string.replace('&', '&amp;')\
                 .replace('<', '&lt;')\
                 .replace('>', '&gt;')
     def copy_iterator(self):
         """
         make a fresh copy of generator, we should not iterate thru
         an original as it's needed for repeating operations on
         this instance of DiffProcessor
@@ @@ -297,12 +298,13 @@ class DiffProcessor(object): @@
     def _parse_udiff(self, inline_diff=True):
         """
         Parse the diff an return data for the template.
         """
         lineiter = self.lines
         files = []
         try:
             line = lineiter.next()
             while 1:
                 # continue until we found the old file
                 if not line.startswith('--- '):
@@ @@ -320,12 +322,13 @@ class DiffProcessor(object): @@
                     'chunks':           chunks,
                     'operation':        operation,
                     'stats':            stats,
                 })
                 line = lineiter.next()
                 while line:
                     match = self._chunk_re.match(line)
                     if not match:
                         break
                     lines = []
@@ @@ -548,12 +551,13 @@ class DiffProcessor(object): @@
                         'cc': code_class,
                         'inc': comments
                     })
                     _html.append('''\n\t\t<pre>%(code)s</pre>\n''' % {
                         'code': change['line']
                     })
                     _html.append('''\t</td>''')
                     _html.append('''\n</tr>\n''')
         _html.append('''</table>''')
         if _html_empty:
             return None
         return ''.join(_html)

0 comments (0 inline, 0 general)