kallithea: rhodecode/lib/diffs.py annotate

annotate rhodecode/lib/diffs.py @ 4147:1c8f818787b3 rhodecode-2.2.5-gpl

old style: show the full link box on summary page - no overlap or truncation

author	Mads Kiilerich <madski@unity3d.com>
date	Wed, 02 Jul 2014 19:03:23 -0400
parents	ffd45b185016
children	7e5f8c12a3fc

rev	line source
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	1 # -- coding: utf-8 --
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	2 # This program is free software: you can redistribute it and/or modify
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	3 # it under the terms of the GNU General Public License as published by
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	4 # the Free Software Foundation, either version 3 of the License, or
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	5 # (at your option) any later version.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	6 #
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	7 # This program is distributed in the hope that it will be useful,
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	8 # but WITHOUT ANY WARRANTY; without even the implied warranty of
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	9 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	10 # GNU General Public License for more details.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	11 #
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	12 # You should have received a copy of the GNU General Public License
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4116 ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	14 """
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	15 rhodecode.lib.diffs
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	16 ~~~~~~~~~~~~~~~~~~~
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	17
4116 ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	18 Set of diffing helpers, previously part of vcs
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	19
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	20
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	21 :created_on: Dec 4, 2011
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	22 :author: marcink
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	23 :copyright: (c) 2013 RhodeCode GmbH.
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	24 :license: GPLv3, see LICENSE for more details.
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	25 """
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	26 import re
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	27 import difflib
2892 5fba3778431c #590 Add GET flag that controls the way the diff are generated, for pull requests we want to use non-bundle based diffs, Marcin Kuzminski <marcin@python-works.com> parents: 2843 diff changeset	28 import logging
2355 29a8096820dc added basic comparision of two repositories using bundles Marcin Kuzminski <marcin@python-works.com> parents: 2349 diff changeset	29
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	30 from itertools import tee, imap
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	31
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	32 from pylons.i18n.translation import _
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	33
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: 1894 diff changeset	34 from rhodecode.lib.vcs.exceptions import VCSError
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	35 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
2684 2b6939a77052 Bumped mercurial version to 2.3 Marcin Kuzminski <marcin@python-works.com> parents: 2567 diff changeset	36 from rhodecode.lib.vcs.backends.base import EmptyChangeset
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	37 from rhodecode.lib.helpers import escape
3366 c72dbcad0337 fix some small unicode issues with logging on differ Marcin Kuzminski <marcin@python-works.com> parents: 3323 diff changeset	38 from rhodecode.lib.utils2 import safe_unicode, safe_str
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	39
2892 5fba3778431c #590 Add GET flag that controls the way the diff are generated, for pull requests we want to use non-bundle based diffs, Marcin Kuzminski <marcin@python-works.com> parents: 2843 diff changeset	40 log = logging.getLogger(__name__)
5fba3778431c #590 Add GET flag that controls the way the diff are generated, for pull requests we want to use non-bundle based diffs, Marcin Kuzminski <marcin@python-works.com> parents: 2843 diff changeset	41
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	42
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	43 def wrap_to_table(str_):
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	44 return '''<table class="code-difftable">
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	45 <tr class="line no-comment">
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	46 <td class="lineno new"></td>
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	47 <td class="code no-comment"><pre>%s</pre></td>
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	48 </tr>
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	49 </table>''' % str_
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	50
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	51
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	52 def wrapped_diff(filenode_old, filenode_new, cut_off_limit=None,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	53 ignore_whitespace=True, line_context=3,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	54 enable_comments=False):
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	55 """
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	56 returns a wrapped diff into a table, checks for cut_off_limit and presents
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	57 proper message
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	58 """
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	59
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	60 if filenode_old is None:
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	61 filenode_old = FileNode(filenode_new.path, '', EmptyChangeset())
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	62
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	63 if filenode_old.is_binary or filenode_new.is_binary:
3654 ec6354949623 Fix a lot of casings - use standard casing in most places Mads Kiilerich <madski@unity3d.com> parents: 3625 diff changeset	64 diff = wrap_to_table(_('Binary file'))
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	65 stats = (0, 0)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	66 size = 0
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	67
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	68 elif cut_off_limit != -1 and (cut_off_limit is None or
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	69 (filenode_old.size < cut_off_limit and filenode_new.size < cut_off_limit)):
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	70
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	71 f_gitdiff = get_gitdiff(filenode_old, filenode_new,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	72 ignore_whitespace=ignore_whitespace,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	73 context=line_context)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	74 diff_processor = DiffProcessor(f_gitdiff, format='gitdiff')
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	75
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	76 diff = diff_processor.as_html(enable_comments=enable_comments)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	77 stats = diff_processor.stat()
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	78 size = len(diff or '')
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	79 else:
2340 93243e162068 typo fix ref #461 Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	80 diff = wrap_to_table(_('Changeset was too big and was cut off, use '
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	81 'diff menu to display this diff'))
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	82 stats = (0, 0)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	83 size = 0
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	84 if not diff:
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	85 submodules = filter(lambda o: isinstance(o, SubModuleNode),
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	86 [filenode_new, filenode_old])
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	87 if submodules:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	88 diff = wrap_to_table(escape('Submodule %r' % submodules[0]))
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	89 else:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	90 diff = wrap_to_table(_('No changes detected'))
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	91
2084 feb0fccdcf83 fixed vcs issue with last_changeset for filenodes Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	92 cs1 = filenode_old.changeset.raw_id
feb0fccdcf83 fixed vcs issue with last_changeset for filenodes Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	93 cs2 = filenode_new.changeset.raw_id
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	94
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	95 return size, cs1, cs2, diff, stats
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	96
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	97
1768 5610fd9b6803 added line context control to diffs Marcin Kuzminski <marcin@python-works.com> parents: 1753 diff changeset	98 def get_gitdiff(filenode_old, filenode_new, ignore_whitespace=True, context=3):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	99 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	100 Returns git style diff between given ``filenode_old`` and ``filenode_new``.
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	101
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	102 :param ignore_whitespace: ignore whitespaces in diff
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	103 """
1894 0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	104 # make sure we pass in default context
0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	105 context = context or 3
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	106 submodules = filter(lambda o: isinstance(o, SubModuleNode),
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	107 [filenode_new, filenode_old])
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	108 if submodules:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	109 return ''
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	110
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	111 for filenode in (filenode_old, filenode_new):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	112 if not isinstance(filenode, FileNode):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	113 raise VCSError("Given object should be FileNode object, not %s"
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	114 % filenode.__class__)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	115
1894 0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	116 repo = filenode_new.changeset.repository
0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	117 old_raw_id = getattr(filenode_old.changeset, 'raw_id', repo.EMPTY_CHANGESET)
0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	118 new_raw_id = getattr(filenode_new.changeset, 'raw_id', repo.EMPTY_CHANGESET)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	119
1883 69d3c4450944 fix for latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	120 vcs_gitdiff = repo.get_diff(old_raw_id, new_raw_id, filenode_new.path,
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	121 ignore_whitespace, context)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	122 return vcs_gitdiff
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	123
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	124 NEW_FILENODE = 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	125 DEL_FILENODE = 2
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	126 MOD_FILENODE = 3
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	127 RENAMED_FILENODE = 4
3997 156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	128 COPIED_FILENODE = 5
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	129 CHMOD_FILENODE = 6
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	130 BIN_FILENODE = 7
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	131
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	132
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	133 class DiffLimitExceeded(Exception):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	134 pass
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	135
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	136
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	137 class LimitedDiffContainer(object):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	138
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	139 def __init__(self, diff_limit, cur_diff_size, diff):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	140 self.diff = diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	141 self.diff_limit = diff_limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	142 self.cur_diff_size = cur_diff_size
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	143
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	144 def __iter__(self):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	145 for l in self.diff:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	146 yield l
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	147
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	148
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	149 class DiffProcessor(object):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	150 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	151 Give it a unified or git diff and it returns a list of the files that were
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	152 mentioned in the diff together with a dict of meta information that
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	153 can be used to render it in a HTML template.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	154 """
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	155 _chunk_re = re.compile(r'^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)')
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	156 _newline_marker = re.compile(r'^\\ No newline at end of file')
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	157 _git_header_re = re.compile(r"""
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	158 #^diff[ ]--git
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	159 [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	160 (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	161 ^rename[ ]from[ ](?P<rename_from>\S+)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	162 ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	163 (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	164 ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	165 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	166 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	167 (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	168 \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n\|$))?
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	169 (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n\|$))?
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	170 (?:^---[ ](a/(?P<a_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	171 (?:^\+\+\+[ ](b/(?P<b_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	172 """, re.VERBOSE \| re.MULTILINE)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	173 _hg_header_re = re.compile(r"""
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	174 #^diff[ ]--git
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	175 [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
3817 631e8000eae8 diff parser: match the header order of hg diff --git patches Mads Kiilerich <madski@unity3d.com> parents: 3718 diff changeset	176 (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
631e8000eae8 diff parser: match the header order of hg diff --git patches Mads Kiilerich <madski@unity3d.com> parents: 3718 diff changeset	177 ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n\|$))?
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	178 (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	179 (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	180 ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n\|$))?
3997 156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	181 (?:^copy[ ]from[ ](?P<copy_from>\S+)\n
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	182 ^copy[ ]to[ ](?P<copy_to>\S+)(?:\n\|$))?
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	183 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	184 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	185 (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	186 \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n\|$))?
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	187 (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n\|$))?
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	188 (?:^---[ ](a/(?P<a_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	189 (?:^\+\+\+[ ](b/(?P<b_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	190 """, re.VERBOSE \| re.MULTILINE)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	191
3085 7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	192 #used for inline highlighter word split
7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	193 _token_re = re.compile(r'()(>\|<\|&\|\W+?)')
7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	194
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	195 def __init__(self, diff, vcs='hg', format='gitdiff', diff_limit=None):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	196 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	197 :param diff: a text in diff format
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	198 :param vcs: type of version controll hg or git
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	199 :param format: format of diff passed, `udiff` or `gitdiff`
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	200 :param diff_limit: define the size of diff that is considered "big"
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	201 based on that parameter cut off will be triggered, set to None
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	202 to show full diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	203 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	204 if not isinstance(diff, basestring):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	205 raise Exception('Diff must be a basestring got %s instead' % type(diff))
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	206
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	207 self._diff = diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	208 self._format = format
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	209 self.adds = 0
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	210 self.removes = 0
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	211 # calculate diff size
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	212 self.diff_size = len(diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	213 self.diff_limit = diff_limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	214 self.cur_diff_size = 0
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	215 self.parsed = False
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	216 self.parsed_diff = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	217 self.vcs = vcs
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	218
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	219 if format == 'gitdiff':
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	220 self.differ = self._highlight_line_difflib
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	221 self._parser = self._parse_gitdiff
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	222 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	223 self.differ = self._highlight_line_udiff
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	224 self._parser = self._parse_udiff
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	225
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	226 def _copy_iterator(self):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	227 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	228 make a fresh copy of generator, we should not iterate thru
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	229 an original as it's needed for repeating operations on
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	230 this instance of DiffProcessor
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	231 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	232 self.__udiff, iterator_copy = tee(self.__udiff)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	233 return iterator_copy
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	234
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	235 def _escaper(self, string):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	236 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	237 Escaper for diff escapes special chars and checks the diff limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	238
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	239 :param string:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	240 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	241
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	242 self.cur_diff_size += len(string)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	243
4089 a5888ca796b5 Fixed spelling of get's to gets Marcin Kuzminski <marcin@python-works.com> parents: 4083 diff changeset	244 # escaper gets iterated on each .next() call and it checks if each
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	245 # parsed line doesn't exceed the diff limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	246 if self.diff_limit is not None and self.cur_diff_size > self.diff_limit:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	247 raise DiffLimitExceeded('Diff Limit Exceeded')
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	248
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	249 return safe_unicode(string).replace('&', '&')\
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	250 .replace('<', '<')\
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	251 .replace('>', '>')
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	252
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	253 def _line_counter(self, l):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	254 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	255 Checks each line and bumps total adds/removes for this diff
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	256
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	257 :param l:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	258 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	259 if l.startswith('+') and not l.startswith('+++'):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	260 self.adds += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	261 elif l.startswith('-') and not l.startswith('---'):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	262 self.removes += 1
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	263 return safe_unicode(l)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	264
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	265 def _highlight_line_difflib(self, line, next_):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	266 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	267 Highlight inline changes in both lines.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	268 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	269
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	270 if line['action'] == 'del':
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	271 old, new = line, next_
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	272 else:
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	273 old, new = next_, line
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	274
3085 7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	275 oldwords = self._token_re.split(old['line'])
7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	276 newwords = self._token_re.split(new['line'])
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	277 sequence = difflib.SequenceMatcher(None, oldwords, newwords)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	278
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	279 oldfragments, newfragments = [], []
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	280 for tag, i1, i2, j1, j2 in sequence.get_opcodes():
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	281 oldfrag = ''.join(oldwords[i1:i2])
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	282 newfrag = ''.join(newwords[j1:j2])
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	283 if tag != 'equal':
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	284 if oldfrag:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	285 oldfrag = '<del>%s</del>' % oldfrag
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	286 if newfrag:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	287 newfrag = '<ins>%s</ins>' % newfrag
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	288 oldfragments.append(oldfrag)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	289 newfragments.append(newfrag)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	290
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	291 old['line'] = "".join(oldfragments)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	292 new['line'] = "".join(newfragments)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	293
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	294 def _highlight_line_udiff(self, line, next_):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	295 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	296 Highlight inline changes in both lines.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	297 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	298 start = 0
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	299 limit = min(len(line['line']), len(next_['line']))
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	300 while start < limit and line['line'][start] == next_['line'][start]:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	301 start += 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	302 end = -1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	303 limit -= start
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	304 while -end <= limit and line['line'][end] == next_['line'][end]:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	305 end -= 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	306 end += 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	307 if start or end:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	308 def do(l):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	309 last = end + len(l['line'])
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	310 if l['action'] == 'add':
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	311 tag = 'ins'
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	312 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	313 tag = 'del'
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	314 l['line'] = '%s<%s>%s</%s>%s' % (
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	315 l['line'][:start],
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	316 tag,
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	317 l['line'][start:last],
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	318 tag,
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	319 l['line'][last:]
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	320 )
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	321 do(line)
1781 089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers Marcin Kuzminski <marcin@python-works.com> parents: 1772 diff changeset	322 do(next_)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	323
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	324 def _get_header(self, diff_chunk):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	325 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	326 parses the diff header, and returns parts, and leftover diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	327 parts consists of 14 elements::
2967 e46d0a90556e fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage Marcin Kuzminski <marcin@python-works.com> parents: 2892 diff changeset	328
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	329 a_path, b_path, similarity_index, rename_from, rename_to,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	330 old_mode, new_mode, new_file_mode, deleted_file_mode,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	331 a_blob_id, b_blob_id, b_mode, a_file, b_file
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	332
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	333 :param diff_chunk:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	334 """
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	335
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	336 if self.vcs == 'git':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	337 match = self._git_header_re.match(diff_chunk)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	338 diff = diff_chunk[match.end():]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	339 return match.groupdict(), imap(self._escaper, diff.splitlines(1))
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	340 elif self.vcs == 'hg':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	341 match = self._hg_header_re.match(diff_chunk)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	342 diff = diff_chunk[match.end():]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	343 return match.groupdict(), imap(self._escaper, diff.splitlines(1))
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	344 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	345 raise Exception('VCS type %s is not supported' % self.vcs)
2967 e46d0a90556e fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage Marcin Kuzminski <marcin@python-works.com> parents: 2892 diff changeset	346
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	347 def _clean_line(self, line, command):
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	348 if command in ['+', '-', ' ']:
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	349 #only modify the line if it's actually a diff thing
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	350 line = line[1:]
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	351 return line
0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	352
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	353 def _parse_gitdiff(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	354 _files = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	355 diff_container = lambda arg: arg
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	356
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	357 ##split the diff in chunks of separate --git a/file b/file chunks
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	358 for raw_diff in ('\n' + self._diff).split('\ndiff --git')[1:]:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	359 head, diff = self._get_header(raw_diff)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	360
3818 0d22458bd360 diff parser: more correct detection and reporting of binary git diffs Mads Kiilerich <madski@unity3d.com> parents: 3817 diff changeset	361 op = None
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	362 stats = {
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	363 'added': 0,
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	364 'deleted': 0,
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	365 'binary': False,
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	366 'ops': {},
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	367 }
3818 0d22458bd360 diff parser: more correct detection and reporting of binary git diffs Mads Kiilerich <madski@unity3d.com> parents: 3817 diff changeset	368
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	369 if head['deleted_file_mode']:
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	370 op = 'D'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	371 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	372 stats['ops'][DEL_FILENODE] = 'deleted file'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	373
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	374 elif head['new_file_mode']:
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	375 op = 'A'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	376 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	377 stats['ops'][NEW_FILENODE] = 'new file %s' % head['new_file_mode']
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	378 else: # modify operation, can be cp, rename, chmod
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	379 # CHMOD
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	380 if head['new_mode'] and head['old_mode']:
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	381 op = 'M'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	382 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	383 stats['ops'][CHMOD_FILENODE] = ('modified file chmod %s => %s'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	384 % (head['old_mode'], head['new_mode']))
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	385 # RENAME
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	386 if (head['rename_from'] and head['rename_to']
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	387 and head['rename_from'] != head['rename_to']):
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	388 op = 'M'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	389 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	390 stats['ops'][RENAMED_FILENODE] = ('file renamed from %s to %s'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	391 % (head['rename_from'], head['rename_to']))
3997 156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	392 # COPY
4013 d9a73bfc4107 use safe get on copy mode since for git we don't have this implemented Marcin Kuzminski <marcin@python-works.com> parents: 3997 diff changeset	393 if head.get('copy_from') and head.get('copy_to'):
3997 156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	394 op = 'M'
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	395 stats['binary'] = True
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	396 stats['ops'][COPIED_FILENODE] = ('file copied from %s to %s'
156cb1cdd7ad Added handling of copied files diff parsing Marcin Kuzminski <marcin@python-works.com> parents: 3840 diff changeset	397 % (head['copy_from'], head['copy_to']))
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	398 # FALL BACK: detect missed old style add or remove
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	399 if op is None:
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	400 if not head['a_file'] and head['b_file']:
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	401 op = 'A'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	402 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	403 stats['ops'][NEW_FILENODE] = 'new file'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	404
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	405 elif head['a_file'] and not head['b_file']:
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	406 op = 'D'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	407 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	408 stats['ops'][DEL_FILENODE] = 'deleted file'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	409
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	410 # it's not ADD not DELETE
3820 8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	411 if op is None:
8df1bc51aa9c diff parser: prefer git headers over old unified diff headers Mads Kiilerich <madski@unity3d.com> parents: 3819 diff changeset	412 op = 'M'
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	413 stats['binary'] = True
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	414 stats['ops'][MOD_FILENODE] = 'modified file'
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	415
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	416 # a real non-binary diff
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	417 if head['a_file'] or head['b_file']:
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	418 try:
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	419 chunks, _stats = self._parse_lines(diff)
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	420 stats['binary'] = False
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	421 stats['added'] = _stats[0]
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	422 stats['deleted'] = _stats[1]
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	423 # explicit mark that it's a modified file
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	424 if op == 'M':
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	425 stats['ops'][MOD_FILENODE] = 'modified file'
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	426
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	427 except DiffLimitExceeded:
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	428 diff_container = lambda _diff: \
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	429 LimitedDiffContainer(self.diff_limit,
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	430 self.cur_diff_size, _diff)
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	431 break
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	432 else: # GIT binary patch (or empty diff)
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	433 # GIT Binary patch
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	434 if head['bin_patch']:
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	435 stats['ops'][BIN_FILENODE] = 'binary diff not shown'
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	436 chunks = []
3818 0d22458bd360 diff parser: more correct detection and reporting of binary git diffs Mads Kiilerich <madski@unity3d.com> parents: 3817 diff changeset	437
4083 bea9d8be4c7f diff: don't show content of deleted files Mads Kiilerich <madski@unity3d.com> parents: 4013 diff changeset	438 if op == 'D' and chunks:
4116 ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	439 # if not full diff mode show deleted file contents
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	440 if self.diff_limit is not None:
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5. Bradley M. Kuhn <bkuhn@sfconservancy.org> parents: 4089 diff changeset	441 chunks = []
4083 bea9d8be4c7f diff: don't show content of deleted files Mads Kiilerich <madski@unity3d.com> parents: 4013 diff changeset	442
3821 ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	443 chunks.insert(0, [{
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	444 'old_lineno': '',
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	445 'new_lineno': '',
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	446 'action': 'context',
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	447 'line': msg,
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	448 } for _op, msg in stats['ops'].iteritems()
ce4b7023a492 diff parser: redefined operations stats for changes Marcin Kuzminski <marcin@python-works.com> parents: 3820 diff changeset	449 if _op not in [MOD_FILENODE]])
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	450
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	451 _files.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	452 'filename': head['b_path'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	453 'old_revision': head['a_blob_id'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	454 'new_revision': head['b_blob_id'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	455 'chunks': chunks,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	456 'operation': op,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	457 'stats': stats,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	458 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	459
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	460 sorter = lambda info: {'A': 0, 'M': 1, 'D': 2}.get(info['operation'])
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	461
3625 260a7a01b054 follow Python conventions for boolean values Mads Kiilerich <madski@unity3d.com> parents: 3366 diff changeset	462 if not inline_diff:
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	463 return diff_container(sorted(_files, key=sorter))
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	464
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	465 # highlight inline changes
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	466 for diff_data in _files:
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	467 for chunk in diff_data['chunks']:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	468 lineiter = iter(chunk)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	469 try:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	470 while 1:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	471 line = lineiter.next()
2566 d097d4bb0437 fix strikethrough issues on `No new line at end of file` Marcin Kuzminski <marcin@python-works.com> parents: 2552 diff changeset	472 if line['action'] not in ['unmod', 'context']:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	473 nextline = lineiter.next()
2360 c15c3430df74 fixed issue with git's `no new line..` messages inside diff block. It might sometimes happen that showed html diff was short one line because of this Marcin Kuzminski <marcin@python-works.com> parents: 2359 diff changeset	474 if nextline['action'] in ['unmod', 'context'] or \
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	475 nextline['action'] == line['action']:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	476 continue
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	477 self.differ(line, nextline)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	478 except StopIteration:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	479 pass
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	480
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	481 return diff_container(sorted(_files, key=sorter))
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	482
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	483 def _parse_udiff(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	484 raise NotImplementedError()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	485
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	486 def _parse_lines(self, diff):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	487 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	488 Parse the diff an return data for the template.
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	489 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	490
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	491 lineiter = iter(diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	492 stats = [0, 0]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	493
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	494 try:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	495 chunks = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	496 line = lineiter.next()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	497
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	498 while line:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	499 lines = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	500 chunks.append(lines)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	501
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	502 match = self._chunk_re.match(line)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	503
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	504 if not match:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	505 break
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	506
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	507 gr = match.groups()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	508 (old_line, old_end,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	509 new_line, new_end) = [int(x or 1) for x in gr[:-1]]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	510 old_line -= 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	511 new_line -= 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	512
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	513 context = len(gr) == 5
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	514 old_end += old_line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	515 new_end += new_line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	516
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	517 if context:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	518 # skip context only if it's first line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	519 if int(gr[0]) > 1:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	520 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	521 'old_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	522 'new_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	523 'action': 'context',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	524 'line': line,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	525 })
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	526
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	527 line = lineiter.next()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	528
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	529 while old_line < old_end or new_line < new_end:
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	530 command = ' '
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	531 if line:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	532 command = line[0]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	533
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	534 affects_old = affects_new = False
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	535
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	536 # ignore those if we don't expect them
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	537 if command in '#@':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	538 continue
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	539 elif command == '+':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	540 affects_new = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	541 action = 'add'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	542 stats[0] += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	543 elif command == '-':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	544 affects_old = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	545 action = 'del'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	546 stats[1] += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	547 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	548 affects_old = affects_new = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	549 action = 'unmod'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	550
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	551 if not self._newline_marker.match(line):
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	552 old_line += affects_old
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	553 new_line += affects_new
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	554 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	555 'old_lineno': affects_old and old_line or '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	556 'new_lineno': affects_new and new_line or '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	557 'action': action,
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	558 'line': self._clean_line(line, command)
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	559 })
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	560
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	561 line = lineiter.next()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	562
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	563 if self._newline_marker.match(line):
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	564 # we need to append to lines, since this is not
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	565 # counted in the line specs of diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	566 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	567 'old_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	568 'new_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	569 'action': 'context',
3022 0ed42ca7ff9e Fixed issue with inproper handling of diff parsing that could lead to infinit loops. Marcin Kuzminski <marcin@python-works.com> parents: 3015 diff changeset	570 'line': self._clean_line(line, command)
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	571 })
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	572
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	573 except StopIteration:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	574 pass
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	575 return chunks, stats
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	576
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	577 def _safe_id(self, idstring):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	578 """Make a string safe for including in an id attribute.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	579
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	580 The HTML spec says that id attributes 'must begin with
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	581 a letter ([A-Za-z]) and may be followed by any number
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	582 of letters, digits ([0-9]), hyphens ("-"), underscores
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	583 ("_"), colons (":"), and periods (".")'. These regexps
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	584 are slightly over-zealous, in that they remove colons
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	585 and periods unnecessarily.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	586
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	587 Whitespace is transformed into underscores, and then
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	588 anything which is not a hyphen or a character that
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	589 matches \w (alphanumerics and underscore) is removed.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	590
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	591 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	592 # Transform all whitespace to underscore
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	593 idstring = re.sub(r'\s', "_", '%s' % idstring)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	594 # Remove everything that is not a hyphen or a member of \w
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	595 idstring = re.sub(r'(?!-)\W', "", idstring).lower()
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	596 return idstring
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	597
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	598 def prepare(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	599 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	600 Prepare the passed udiff for HTML rendering. It'l return a list
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	601 of dicts with diff information
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	602 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	603 parsed = self._parser(inline_diff=inline_diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	604 self.parsed = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	605 self.parsed_diff = parsed
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	606 return parsed
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	607
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	608 def as_raw(self, diff_lines=None):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	609 """
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	610 Returns raw string diff
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	611 """
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	612 return self._diff
ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	613 #return u''.join(imap(self._line_counter, self._diff.splitlines(1)))
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	614
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	615 def as_html(self, table_class='code-difftable', line_class='line',
3144 a64fb6d9ce03 diff view: don't mix css classes for new and old line numbers Mads Kiilerich <madski@unity3d.com> parents: 3085 diff changeset	616 old_lineno_class='lineno old', new_lineno_class='lineno new',
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	617 code_class='code', enable_comments=False, parsed_lines=None):
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	618 """
2349 0edbffa9e2e2 fixed bug with inline changes highlighter. Marcin Kuzminski <marcin@python-works.com> parents: 2347 diff changeset	619 Return given diff as html table with customized css classes
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	620 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	621 def _link_to_if(condition, label, url):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	622 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	623 Generates a link if condition is meet or just the label if not.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	624 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	625
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	626 if condition:
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	627 return '''<a href="%(url)s">%(label)s</a>''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	628 'url': url,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	629 'label': label
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	630 }
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	631 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	632 return label
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	633 if not self.parsed:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	634 self.prepare()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	635
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	636 diff_lines = self.parsed_diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	637 if parsed_lines:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	638 diff_lines = parsed_lines
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	639
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	640 _html_empty = True
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	641 _html = []
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	642 _html.append('''<table class="%(table_class)s">\n''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	643 'table_class': table_class
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	644 })
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	645
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	646 for diff in diff_lines:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	647 for line in diff['chunks']:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	648 _html_empty = False
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	649 for change in line:
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	650 _html.append('''<tr class="%(lc)s %(action)s">\n''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	651 'lc': line_class,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	652 'action': change['action']
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	653 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	654 anchor_old_id = ''
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	655 anchor_new_id = ''
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	656 anchor_old = "%(filename)s_o%(oldline_no)s" % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	657 'filename': self._safe_id(diff['filename']),
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	658 'oldline_no': change['old_lineno']
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	659 }
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	660 anchor_new = "%(filename)s_n%(oldline_no)s" % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	661 'filename': self._safe_id(diff['filename']),
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	662 'oldline_no': change['new_lineno']
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	663 }
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	664 cond_old = (change['old_lineno'] != '...' and
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	665 change['old_lineno'])
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	666 cond_new = (change['new_lineno'] != '...' and
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	667 change['new_lineno'])
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	668 if cond_old:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	669 anchor_old_id = 'id="%s"' % anchor_old
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	670 if cond_new:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	671 anchor_new_id = 'id="%s"' % anchor_new
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	672 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	673 # OLD LINE NUMBER
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	674 ###########################################################
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	675 _html.append('''\t<td %(a_id)s class="%(olc)s">''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	676 'a_id': anchor_old_id,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	677 'olc': old_lineno_class
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	678 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	679
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	680 _html.append('''%(link)s''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	681 'link': _link_to_if(True, change['old_lineno'],
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	682 '#%s' % anchor_old)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	683 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	684 _html.append('''</td>\n''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	685 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	686 # NEW LINE NUMBER
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	687 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	688
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	689 _html.append('''\t<td %(a_id)s class="%(nlc)s">''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	690 'a_id': anchor_new_id,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	691 'nlc': new_lineno_class
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	692 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	693
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	694 _html.append('''%(link)s''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	695 'link': _link_to_if(True, change['new_lineno'],
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	696 '#%s' % anchor_new)
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	697 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	698 _html.append('''</td>\n''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	699 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	700 # CODE
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	701 ###########################################################
1787 d4a7b6c82efe code garden for changeset ranges and comments Marcin Kuzminski <marcin@python-works.com> parents: 1781 diff changeset	702 comments = '' if enable_comments else 'no-comment'
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	703 _html.append('''\t<td class="%(cc)s %(inc)s">''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	704 'cc': code_class,
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	705 'inc': comments
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	706 })
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	707 _html.append('''\n\t\t<pre>%(code)s</pre>\n''' % {
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	708 'code': change['line']
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	709 })
2967 e46d0a90556e fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage Marcin Kuzminski <marcin@python-works.com> parents: 2892 diff changeset	710
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	711 _html.append('''\t</td>''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	712 _html.append('''\n</tr>\n''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	713 _html.append('''</table>''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	714 if _html_empty:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	715 return None
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	716 return ''.join(_html)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	717
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	718 def stat(self):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	719 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	720 Returns tuple of added, and removed lines for this instance
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	721 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	722 return self.adds, self.removes

Mercurial > kallithea

annotate rhodecode/lib/diffs.py @ 4147:1c8f818787b3 rhodecode-2.2.5-gpl