kallithea: rhodecode/lib/diffs.py annotate

annotate rhodecode/lib/diffs.py @ 3625:260a7a01b054 beta

follow Python conventions for boolean values True and False might be singletons and the "default" values for "boolean" expressions, but "all" values in Python has a boolean value and should be evaluated as such. Checking with 'is True' and 'is False' is thus confusing, error prone and unnessarily complex. If we anywhere rely and nullable boolean fields from the database layer and don't want the null value to be treated as False then we should check explicitly for null with 'is None'.

author	Mads Kiilerich <madski@unity3d.com>
date	Thu, 28 Mar 2013 01:10:45 +0100
parents	c72dbcad0337
children	ec6354949623

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 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	3 rhodecode.lib.diffs
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	4 ~~~~~~~~~~~~~~~~~~~
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	5
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	6 Set of diffing helpers, previously part of vcs
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	7
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	8
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	9 :created_on: Dec 4, 2011
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	10 :author: marcink
1824 89efedac4e6c 2012 copyrights Marcin Kuzminski <marcin@python-works.com> parents: 1789 diff changeset	11 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
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	12 :original copyright: 2007-2008 by Armin Ronacher
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	13 :license: GPLv3, see COPYING for more details.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	14 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	15 # 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	16 # 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	17 # 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	18 # (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	19 #
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	20 # 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	21 # 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	22 # 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	23 # 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	24 #
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	25 # 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	26 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	27
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	28 import re
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	29 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	30 import logging
2355 29a8096820dc added basic comparision of two repositories using bundles Marcin Kuzminski <marcin@python-works.com> parents: 2349 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 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	33
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	34 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	35
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	36 from rhodecode.lib.vcs.exceptions import VCSError
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	37 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	38 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	39 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	40 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	41
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	42 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	43
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	44
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	45 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	46 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	47 <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	48 <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	49 <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	50 </tr>
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	51 </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	52
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	53
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	54 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	55 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	56 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	57 """
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	58 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	59 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	60 """
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	61
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	62 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	63 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	64
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	65 if filenode_old.is_binary or filenode_new.is_binary:
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	66 diff = wrap_to_table(_('binary file'))
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	67 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	68 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	69
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	70 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	71 (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	72
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	73 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	74 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	75 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	76 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	77
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	78 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	79 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	80 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	81 else:
2340 93243e162068 typo fix ref #461 Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	82 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	83 '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	84 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	85 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	86 if not diff:
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	87 submodules = filter(lambda o: isinstance(o, SubModuleNode),
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	88 [filenode_new, filenode_old])
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	89 if submodules:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	90 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	91 else:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	92 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	93
2084 feb0fccdcf83 fixed vcs issue with last_changeset for filenodes Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	94 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	95 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	96
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	97 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	98
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	99
1768 5610fd9b6803 added line context control to diffs Marcin Kuzminski <marcin@python-works.com> parents: 1753 diff changeset	100 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	101 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	102 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	103
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	104 :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	105 """
1894 0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	106 # make sure we pass in default context
0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	107 context = context or 3
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	108 submodules = filter(lambda o: isinstance(o, SubModuleNode),
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	109 [filenode_new, filenode_old])
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	110 if submodules:
07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2084 diff changeset	111 return ''
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	112
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	113 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	114 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	115 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	116 % filenode.__class__)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	117
1894 0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	118 repo = filenode_new.changeset.repository
0cbc3fb540b0 adapt codes to latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1883 diff changeset	119 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	120 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	121
1883 69d3c4450944 fix for latest vcs Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	122 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	123 ignore_whitespace, context)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	124 return vcs_gitdiff
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	125
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	126 NEW_FILENODE = 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	127 DEL_FILENODE = 2
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	128 MOD_FILENODE = 3
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	129 RENAMED_FILENODE = 4
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	130 CHMOD_FILENODE = 5
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\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	169 (?:^---[ ](a/(?P<a_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	170 (?:^\+\+\+[ ](b/(?P<b_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	171 """, re.VERBOSE \| re.MULTILINE)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	172 _hg_header_re = re.compile(r"""
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	173 #^diff[ ]--git
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	174 [ ]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	175 (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	176 (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	177 ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	178 (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	179 ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	180 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	181 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	182 (?:^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	183 \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	184 (?:^---[ ](a/(?P<a_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	185 (?:^\+\+\+[ ](b/(?P<b_file>.+)\|/dev/null)(?:\n\|$))?
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	186 """, 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	187
3085 7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	188 #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	189 _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	190
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	191 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	192 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	193 :param diff: a text in diff format
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	194 :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	195 :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	196 :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	197 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	198 to show full diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	199 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	200 if not isinstance(diff, basestring):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	201 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	202
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	203 self._diff = diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	204 self._format = format
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	205 self.adds = 0
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	206 self.removes = 0
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	207 # calculate diff size
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	208 self.diff_size = len(diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	209 self.diff_limit = diff_limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	210 self.cur_diff_size = 0
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	211 self.parsed = False
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	212 self.parsed_diff = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	213 self.vcs = vcs
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	214
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	215 if format == 'gitdiff':
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	216 self.differ = self._highlight_line_difflib
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	217 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	218 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	219 self.differ = self._highlight_line_udiff
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	220 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	221
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	222 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	223 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	224 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	225 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	226 this instance of DiffProcessor
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 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	229 return iterator_copy
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	230
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	231 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	232 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	233 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	234
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	235 :param string:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	236 :type string:
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	237 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	238
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	239 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	240
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	241 # escaper get's iterated on each .next() call and it checks if each
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	242 # parsed line doesn't exceed the diff limit
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	243 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	244 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	245
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	246 return safe_unicode(string).replace('&', '&')\
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	247 .replace('<', '<')\
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	248 .replace('>', '>')
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	249
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	250 def _line_counter(self, l):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	251 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	252 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	253
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	254 :param l:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	255 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	256 if l.startswith('+') and not l.startswith('+++'):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	257 self.adds += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	258 elif l.startswith('-') and not l.startswith('---'):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	259 self.removes += 1
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	260 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	261
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	262 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	263 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	264 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	265 """
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 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	268 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	269 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	270 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	271
3085 7d0476e1f1dc fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols Marcin Kuzminski <marcin@python-works.com> parents: 3047 diff changeset	272 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	273 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	274 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	275
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	276 oldfragments, newfragments = [], []
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	277 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	278 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	279 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	280 if tag != 'equal':
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	281 if oldfrag:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	282 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	283 if newfrag:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	284 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	285 oldfragments.append(oldfrag)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	286 newfragments.append(newfrag)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	287
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	288 old['line'] = "".join(oldfragments)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	289 new['line'] = "".join(newfragments)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	290
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	291 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	292 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	293 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	294 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	295 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	296 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	297 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	298 start += 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	299 end = -1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	300 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	301 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	302 end -= 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	303 end += 1
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	304 if start or end:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	305 def do(l):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	306 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	307 if l['action'] == 'add':
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	308 tag = 'ins'
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	309 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	310 tag = 'del'
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	311 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	312 l['line'][:start],
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	313 tag,
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	314 l['line'][start:last],
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	315 tag,
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	316 l['line'][last:]
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	317 )
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	318 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	319 do(next_)
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	320
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	321 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	322 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	323 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	324 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	325
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	326 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	327 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	328 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	329
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	330 :param diff_chunk:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	331 :type diff_chunk:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	332 """
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	333
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	334 if self.vcs == 'git':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	335 match = self._git_header_re.match(diff_chunk)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	336 diff = diff_chunk[match.end():]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	337 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	338 elif self.vcs == 'hg':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	339 match = self._hg_header_re.match(diff_chunk)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	340 diff = diff_chunk[match.end():]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	341 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	342 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	343 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	344
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	345 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	346 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	347 #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	348 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	349 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	350
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	351 def _parse_gitdiff(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	352 _files = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	353 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	354
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	355 ##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	356 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	357 binary = False
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	358 binary_msg = 'unknown binary'
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
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	361 if not head['a_file'] and head['b_file']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	362 op = 'A'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	363 elif head['a_file'] and head['b_file']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	364 op = 'M'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	365 elif head['a_file'] and not head['b_file']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	366 op = 'D'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	367 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	368 #probably we're dealing with a binary file 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	369 binary = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	370 if head['deleted_file_mode']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	371 op = 'D'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	372 stats = ['b', DEL_FILENODE]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	373 binary_msg = 'deleted binary file'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	374 elif head['new_file_mode']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	375 op = 'A'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	376 stats = ['b', NEW_FILENODE]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	377 binary_msg = 'new binary file %s' % head['new_file_mode']
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	378 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	379 if head['new_mode'] and head['old_mode']:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	380 stats = ['b', CHMOD_FILENODE]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	381 op = 'M'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	382 binary_msg = ('modified binary file chmod %s => %s'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	383 % (head['old_mode'], head['new_mode']))
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	384 elif (head['rename_from'] and head['rename_to']
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	385 and head['rename_from'] != head['rename_to']):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	386 stats = ['b', RENAMED_FILENODE]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	387 op = 'M'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	388 binary_msg = ('file renamed from %s to %s'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	389 % (head['rename_from'], head['rename_to']))
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	390 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	391 stats = ['b', MOD_FILENODE]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	392 op = 'M'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	393 binary_msg = 'modified binary file'
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	394
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	395 if not binary:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	396 try:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	397 chunks, stats = self._parse_lines(diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	398 except DiffLimitExceeded:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	399 diff_container = lambda _diff: LimitedDiffContainer(
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	400 self.diff_limit,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	401 self.cur_diff_size,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	402 _diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	403 break
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	404 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	405 chunks = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	406 chunks.append([{
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	407 'old_lineno': '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	408 'new_lineno': '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	409 'action': 'binary',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	410 'line': binary_msg,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	411 }])
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	412
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	413 _files.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	414 'filename': head['b_path'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	415 'old_revision': head['a_blob_id'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	416 'new_revision': head['b_blob_id'],
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	417 'chunks': chunks,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	418 'operation': op,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	419 'stats': stats,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	420 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	421
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	422 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	423
3625 260a7a01b054 follow Python conventions for boolean values Mads Kiilerich <madski@unity3d.com> parents: 3366 diff changeset	424 if not inline_diff:
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	425 return diff_container(sorted(_files, key=sorter))
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	426
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	427 # highlight inline changes
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	428 for diff_data in _files:
2385 a455b2c79c85 Improved RSS/ATOM feeds Marcin Kuzminski <marcin@python-works.com> parents: 2360 diff changeset	429 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	430 lineiter = iter(chunk)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	431 try:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	432 while 1:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	433 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	434 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	435 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	436 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	437 nextline['action'] == line['action']:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	438 continue
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	439 self.differ(line, nextline)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	440 except StopIteration:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	441 pass
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	442
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	443 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	444
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	445 def _parse_udiff(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	446 raise NotImplementedError()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	447
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	448 def _parse_lines(self, diff):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	449 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	450 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	451 """
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	452
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	453 lineiter = iter(diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	454 stats = [0, 0]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	455
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	456 try:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	457 chunks = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	458 line = lineiter.next()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	459
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	460 while line:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	461 lines = []
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	462 chunks.append(lines)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	463
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	464 match = self._chunk_re.match(line)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	465
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	466 if not match:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	467 break
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	468
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	469 gr = match.groups()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	470 (old_line, old_end,
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	471 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	472 old_line -= 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	473 new_line -= 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	474
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	475 context = len(gr) == 5
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	476 old_end += old_line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	477 new_end += new_line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	478
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	479 if context:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	480 # skip context only if it's first line
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	481 if int(gr[0]) > 1:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	482 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	483 'old_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	484 'new_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	485 'action': 'context',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	486 'line': line,
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
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	489 line = lineiter.next()
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 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	492 command = ' '
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	493 if line:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	494 command = line[0]
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	495
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	496 affects_old = affects_new = False
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 # ignore those if we don't expect them
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	499 if command in '#@':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	500 continue
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	501 elif command == '+':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	502 affects_new = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	503 action = 'add'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	504 stats[0] += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	505 elif command == '-':
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	506 affects_old = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	507 action = 'del'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	508 stats[1] += 1
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	509 else:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	510 affects_old = affects_new = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	511 action = 'unmod'
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	512
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	513 if not self._newline_marker.match(line):
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	514 old_line += affects_old
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	515 new_line += affects_new
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	516 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	517 'old_lineno': affects_old and old_line or '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	518 'new_lineno': affects_new and new_line or '',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	519 '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	520 'line': self._clean_line(line, command)
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	521 })
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	522
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	523 line = lineiter.next()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	524
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	525 if self._newline_marker.match(line):
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	526 # 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	527 # counted in the line specs of diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	528 lines.append({
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	529 'old_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	530 'new_lineno': '...',
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	531 '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	532 'line': self._clean_line(line, command)
2995 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
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	535 except StopIteration:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	536 pass
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	537 return chunks, stats
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	538
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	539 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	540 """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	541
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	542 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	543 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	544 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	545 ("_"), 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	546 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	547 and periods unnecessarily.
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	548
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	549 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	550 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	551 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	552
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	553 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	554 # 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	555 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	556 # 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	557 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	558 return idstring
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	559
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	560 def prepare(self, inline_diff=True):
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	561 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	562 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	563 of dicts with diff information
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	564 """
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	565 parsed = self._parser(inline_diff=inline_diff)
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	566 self.parsed = True
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	567 self.parsed_diff = parsed
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	568 return parsed
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	569
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	570 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	571 """
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	572 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	573 """
2996 ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	574 return self._diff
ebe3e388bbb3 new patch function, and urls schema. Marcin Kuzminski <marcin@python-works.com> parents: 2995 diff changeset	575 #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	576
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	577 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	578 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	579 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	580 """
2349 0edbffa9e2e2 fixed bug with inline changes highlighter. Marcin Kuzminski <marcin@python-works.com> parents: 2347 diff changeset	581 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	582 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	583 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	584 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	585 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	586 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	587
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	588 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	589 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	590 '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	591 '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	592 }
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	593 else:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	594 return label
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	595 if not self.parsed:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	596 self.prepare()
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	597
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	598 diff_lines = self.parsed_diff
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	599 if parsed_lines:
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	600 diff_lines = parsed_lines
32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	601
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	602 _html_empty = True
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	603 _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	604 _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	605 '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	606 })
2995 32471bd1f4ee Implemented generation of changesets based Marcin Kuzminski <marcin@python-works.com> parents: 2967 diff changeset	607
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	608 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	609 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	610 _html_empty = False
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	611 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	612 _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	613 '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	614 '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	615 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	616 anchor_old_id = ''
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	617 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	618 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	619 '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	620 '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	621 }
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	622 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	623 '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	624 '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	625 }
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	626 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	627 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	628 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	629 change['new_lineno'])
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	630 if cond_old:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	631 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	632 if cond_new:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	633 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	634 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	635 # OLD LINE NUMBER
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	636 ###########################################################
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	637 _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	638 '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	639 '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	640 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	641
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('''%(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	643 '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	644 '#%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	645 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	646 _html.append('''</td>\n''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	647 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	648 # NEW LINE NUMBER
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	649 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	650
1789 17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	651 _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	652 '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	653 '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	654 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	655
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 _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	657 '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	658 '#%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	659 })
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	660 _html.append('''</td>\n''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	661 ###########################################################
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	662 # CODE
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	663 ###########################################################
1787 d4a7b6c82efe code garden for changeset ranges and comments Marcin Kuzminski <marcin@python-works.com> parents: 1781 diff changeset	664 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	665 _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	666 '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	667 '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	668 })
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file Marcin Kuzminski <marcin@python-works.com> parents: 1787 diff changeset	669 _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	670 '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	671 })
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	672
1753 1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	673 _html.append('''\t</td>''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	674 _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	675 _html.append('''</table>''')
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	676 if _html_empty:
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	677 return None
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	678 return ''.join(_html)
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	679
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	680 def stat(self):
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	681 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	682 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	683 """
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	684 return self.adds, self.removes
2337 f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	685
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	686
3192 b9105d31e582 refactoring: drop unused 'discovery data' in pull request and compare diffs Mads Kiilerich <madski@unity3d.com> parents: 3144 diff changeset	687 def differ(org_repo, org_ref, other_repo, other_ref,
3304 70309536c143 compare and diff: remove unused "bundle" functionality Mads Kiilerich <madski@unity3d.com> parents: 3192 diff changeset	688 context=3, ignore_whitespace=False):
2337 f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	689 """
3015 16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	690 General differ between branches, bookmarks, revisions of two remote or
16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	691 local but related repositories
2337 f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	692
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	693 :param org_repo:
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	694 :param org_ref:
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	695 :param other_repo:
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	696 :type other_repo:
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	697 :type other_ref:
f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	698 """
2355 29a8096820dc added basic comparision of two repositories using bundles Marcin Kuzminski <marcin@python-works.com> parents: 2349 diff changeset	699
3010 bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	700 org_repo_scm = org_repo.scm_instance
3015 16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	701 other_repo_scm = other_repo.scm_instance
16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	702
3010 bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	703 org_repo = org_repo_scm._repo
3015 16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	704 other_repo = other_repo_scm._repo
16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	705
3366 c72dbcad0337 fix some small unicode issues with logging on differ Marcin Kuzminski <marcin@python-works.com> parents: 3323 diff changeset	706 org_ref = safe_str(org_ref[1])
c72dbcad0337 fix some small unicode issues with logging on differ Marcin Kuzminski <marcin@python-works.com> parents: 3323 diff changeset	707 other_ref = safe_str(other_ref[1])
2337 f8c953c6b040 Created base for diffing two repositories inside rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	708
3047 3b3de7c68ae1 fixed issue with no-cached dulwich repos Marcin Kuzminski <marcin@python-works.com> parents: 3029 diff changeset	709 if org_repo_scm == other_repo_scm:
3010 bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	710 log.debug('running diff between %s@%s and %s@%s'
3366 c72dbcad0337 fix some small unicode issues with logging on differ Marcin Kuzminski <marcin@python-works.com> parents: 3323 diff changeset	711 % (org_repo.path, org_ref,
c72dbcad0337 fix some small unicode issues with logging on differ Marcin Kuzminski <marcin@python-works.com> parents: 3323 diff changeset	712 other_repo.path, other_ref))
3015 16af24982e30 Multiple changes for compare system Marcin Kuzminski <marcin@python-works.com> parents: 3010 diff changeset	713 _diff = org_repo_scm.get_diff(rev1=org_ref, rev2=other_ref,
3010 bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	714 ignore_whitespace=ignore_whitespace, context=context)
bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	715 return _diff
bf96fd1920c1 Enabled compare engine for tags Marcin Kuzminski <marcin@python-works.com> parents: 2996 diff changeset	716
3323 a07296564f6b compare: show aggregated diff of what will be merged to other repo, using merge ancestor Mads Kiilerich <madski@unity3d.com> parents: 3304 diff changeset	717 return '' # FIXME: when is it ever relevant to return nothing?

Mercurial > kallithea

annotate rhodecode/lib/diffs.py @ 3625:260a7a01b054 beta