Files @ aa3b55946089
Branch filter:

Location: kallithea/rhodecode/lib/annotate.py - annotation

"Bradley M. Kuhn"
Migrate to Mergely 3.3.4.

RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that
Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be
changes we want for Kallithea this way and we take the 3.3.4 files as they are.

I've also included the Mergely license file, as downloaded from:
http://www.mergely.com/license.php

That LICENSE file is kept in HTML just as it was downloaded from their
website. While it's a bit annoying to keep the license file in HTML, this is
the way it came from upstream so we'll leave it that way.

Since the Javascript code is used with other GPLv3 Javascript, we are using the
GPL option of Mergely's tri-license.

Finally, note that previously, this was incorrectly called "mergerly", so the
opportunity is taken here to correct the name. That required changes to
diff_2way.html.

As commands::

$ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php
$ hg add LICENSE-MERGELY.html
$ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css
$ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js
$ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html
$ ( cd /tmp; \
wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \
unzip mergely-3.3.4.zip )
$ sha256sum /tmp/mergely-3.3.4.zip
87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip
$ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js
$ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css
$ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
1d1ccb873d00
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
1d1ccb873d00
ffd45b185016
ffd45b185016
1d1ccb873d00
ffd45b185016
cf51bbfb120e
ffd45b185016
ffd45b185016
ffd45b185016
ffd45b185016
1d1ccb873d00
ffd45b185016
7000fc4aa569
1d1ccb873d00
324ac367a4da
324ac367a4da
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
7000fc4aa569
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
7000fc4aa569
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
c57a37430dc9
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
1d1ccb873d00
# -*- coding: utf-8 -*-
# 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 3 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, see <http://www.gnu.org/licenses/>.
"""
rhodecode.lib.annotate
~~~~~~~~~~~~~~~~~~~~~~

Anontation library for usage in rhodecode, previously part of vcs

:created_on: Dec 4, 2011
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""

import StringIO

from rhodecode.lib.vcs.exceptions import VCSError
from rhodecode.lib.vcs.nodes import FileNode
from pygments.formatters import HtmlFormatter
from pygments import highlight


def annotate_highlight(filenode, annotate_from_changeset_func=None,
        order=None, headers=None, **options):
    """
    Returns html portion containing annotated table with 3 columns: line
    numbers, changeset information and pygmentized line of code.

    :param filenode: FileNode object
    :param annotate_from_changeset_func: function taking changeset and
      returning single annotate cell; needs break line at the end
    :param order: ordered sequence of ``ls`` (line numbers column),
      ``annotate`` (annotate column), ``code`` (code column); Default is
      ``['ls', 'annotate', 'code']``
    :param headers: dictionary with headers (keys are whats in ``order``
      parameter)
    """
    from rhodecode.lib.utils import get_custom_lexer
    options['linenos'] = True
    formatter = AnnotateHtmlFormatter(filenode=filenode, order=order,
        headers=headers,
        annotate_from_changeset_func=annotate_from_changeset_func, **options)
    lexer = get_custom_lexer(filenode.extension) or filenode.lexer
    highlighted = highlight(filenode.content, lexer, formatter)
    return highlighted


class AnnotateHtmlFormatter(HtmlFormatter):

    def __init__(self, filenode, annotate_from_changeset_func=None,
            order=None, **options):
        """
        If ``annotate_from_changeset_func`` is passed it should be a function
        which returns string from the given changeset. For example, we may pass
        following function as ``annotate_from_changeset_func``::

            def changeset_to_anchor(changeset):
                return '<a href="/changesets/%s/">%s</a>\n' %\
                       (changeset.id, changeset.id)

        :param annotate_from_changeset_func: see above
        :param order: (default: ``['ls', 'annotate', 'code']``); order of
          columns;
        :param options: standard pygment's HtmlFormatter options, there is
          extra option tough, ``headers``. For instance we can pass::

             formatter = AnnotateHtmlFormatter(filenode, headers={
                'ls': '#',
                'annotate': 'Annotate',
                'code': 'Code',
             })

        """
        super(AnnotateHtmlFormatter, self).__init__(**options)
        self.annotate_from_changeset_func = annotate_from_changeset_func
        self.order = order or ('ls', 'annotate', 'code')
        headers = options.pop('headers', None)
        if headers and not ('ls' in headers and 'annotate' in headers and
            'code' in headers):
            raise ValueError("If headers option dict is specified it must "
                "all 'ls', 'annotate' and 'code' keys")
        self.headers = headers
        if isinstance(filenode, FileNode):
            self.filenode = filenode
        else:
            raise VCSError("This formatter expect FileNode parameter, not %r"
                % type(filenode))

    def annotate_from_changeset(self, changeset):
        """
        Returns full html line for single changeset per annotated line.
        """
        if self.annotate_from_changeset_func:
            return self.annotate_from_changeset_func(changeset)
        else:
            return ''.join((changeset.id, '\n'))

    def _wrap_tablelinenos(self, inner):
        dummyoutfile = StringIO.StringIO()
        lncount = 0
        for t, line in inner:
            if t:
                lncount += 1
            dummyoutfile.write(line)

        fl = self.linenostart
        mw = len(str(lncount + fl - 1))
        sp = self.linenospecial
        st = self.linenostep
        la = self.lineanchors
        aln = self.anchorlinenos
        if sp:
            lines = []

            for i in range(fl, fl + lncount):
                if i % st == 0:
                    if i % sp == 0:
                        if aln:
                            lines.append('<a href="#%s-%d" class="special">'
                                         '%*d</a>' %
                                         (la, i, mw, i))
                        else:
                            lines.append('<span class="special">'
                                         '%*d</span>' % (mw, i))
                    else:
                        if aln:
                            lines.append('<a href="#%s-%d">'
                                         '%*d</a>' % (la, i, mw, i))
                        else:
                            lines.append('%*d' % (mw, i))
                else:
                    lines.append('')
            ls = '\n'.join(lines)
        else:
            lines = []
            for i in range(fl, fl + lncount):
                if i % st == 0:
                    if aln:
                        lines.append('<a href="#%s-%d">%*d</a>' \
                                     % (la, i, mw, i))
                    else:
                        lines.append('%*d' % (mw, i))
                else:
                    lines.append('')
            ls = '\n'.join(lines)

#        annotate_changesets = [tup[1] for tup in self.filenode.annotate]
##        TODO: not sure what that fixes
#        # If pygments cropped last lines break we need do that too
#        ln_cs = len(annotate_changesets)
#        ln_ = len(ls.splitlines())
#        if  ln_cs > ln_:
#            annotate_changesets = annotate_changesets[:ln_ - ln_cs]
        annotate = ''.join((self.annotate_from_changeset(el[2]())
                            for el in self.filenode.annotate))
        # in case you wonder about the seemingly redundant <div> here:
        # since the content in the other cell also is wrapped in a div,
        # some browsers in some configurations seem to mess up the formatting.
        '''
        yield 0, ('<table class="%stable">' % self.cssclass +
                  '<tr><td class="linenos"><div class="linenodiv"><pre>' +
                  ls + '</pre></div></td>' +
                  '<td class="code">')
        yield 0, dummyoutfile.getvalue()
        yield 0, '</td></tr></table>'

        '''
        headers_row = []
        if self.headers:
            headers_row = ['<tr class="annotate-header">']
            for key in self.order:
                td = ''.join(('<td>', self.headers[key], '</td>'))
                headers_row.append(td)
            headers_row.append('</tr>')

        body_row_start = ['<tr>']
        for key in self.order:
            if key == 'ls':
                body_row_start.append(
                    '<td class="linenos"><div class="linenodiv"><pre>' +
                    ls + '</pre></div></td>')
            elif key == 'annotate':
                body_row_start.append(
                    '<td class="annotate"><div class="annotatediv"><pre>' +
                    annotate + '</pre></div></td>')
            elif key == 'code':
                body_row_start.append('<td class="code">')
        yield 0, ('<table class="%stable">' % self.cssclass +
                  ''.join(headers_row) +
                  ''.join(body_row_start)
                  )
        yield 0, dummyoutfile.getvalue()
        yield 0, '</td></tr></table>'