##// END OF EJS Templates
merge the two context menu bar stripes - save some vertical space
merge the two context menu bar stripes - save some vertical space

File last commit:

r3366:c72dbcad beta
r3612:a8373e8f beta
Show More
diffs.py
717 lines | 25.8 KiB | text/x-python | PythonLexer
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 # -*- coding: utf-8 -*-
"""
rhodecode.lib.diffs
~~~~~~~~~~~~~~~~~~~
Set of diffing helpers, previously part of vcs
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 :created_on: Dec 4, 2011
:author: marcink
2012 copyrights
r1824 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 :original copyright: 2007-2008 by Armin Ronacher
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 :license: GPLv3, see COPYING for more details.
"""
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re
import difflib
#590 Add GET flag that controls the way the diff are generated, for pull requests we want to use non-bundle based diffs,...
r2892 import logging
added basic comparision of two repositories using bundles...
r2355
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 from itertools import tee, imap
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 from pylons.i18n.translation import _
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.exceptions import VCSError
fixed issues with gitsubmodule diffs
r2233 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
Bumped mercurial version to 2.3...
r2684 from rhodecode.lib.vcs.backends.base import EmptyChangeset
fixed issues with gitsubmodule diffs
r2233 from rhodecode.lib.helpers import escape
fix some small unicode issues with logging on differ
r3366 from rhodecode.lib.utils2 import safe_unicode, safe_str
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789
#590 Add GET flag that controls the way the diff are generated, for pull requests we want to use non-bundle based diffs,...
r2892 log = logging.getLogger(__name__)
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789
def wrap_to_table(str_):
return '''<table class="code-difftable">
<tr class="line no-comment">
<td class="lineno new"></td>
<td class="code no-comment"><pre>%s</pre></td>
</tr>
</table>''' % str_
def wrapped_diff(filenode_old, filenode_new, cut_off_limit=None,
ignore_whitespace=True, line_context=3,
enable_comments=False):
"""
returns a wrapped diff into a table, checks for cut_off_limit and presents
proper message
"""
if filenode_old is None:
filenode_old = FileNode(filenode_new.path, '', EmptyChangeset())
if filenode_old.is_binary or filenode_new.is_binary:
diff = wrap_to_table(_('binary file'))
stats = (0, 0)
size = 0
elif cut_off_limit != -1 and (cut_off_limit is None or
(filenode_old.size < cut_off_limit and filenode_new.size < cut_off_limit)):
f_gitdiff = get_gitdiff(filenode_old, filenode_new,
ignore_whitespace=ignore_whitespace,
context=line_context)
diff_processor = DiffProcessor(f_gitdiff, format='gitdiff')
diff = diff_processor.as_html(enable_comments=enable_comments)
stats = diff_processor.stat()
size = len(diff or '')
else:
typo fix ref #461
r2340 diff = wrap_to_table(_('Changeset was too big and was cut off, use '
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 'diff menu to display this diff'))
stats = (0, 0)
size = 0
if not diff:
fixed issues with gitsubmodule diffs
r2233 submodules = filter(lambda o: isinstance(o, SubModuleNode),
[filenode_new, filenode_old])
if submodules:
diff = wrap_to_table(escape('Submodule %r' % submodules[0]))
else:
diff = wrap_to_table(_('No changes detected'))
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789
fixed vcs issue with last_changeset for filenodes...
r2084 cs1 = filenode_old.changeset.raw_id
cs2 = filenode_new.changeset.raw_id
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789
return size, cs1, cs2, diff, stats
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
added line context control to diffs
r1768 def get_gitdiff(filenode_old, filenode_new, ignore_whitespace=True, context=3):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Returns git style diff between given ``filenode_old`` and ``filenode_new``.
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 :param ignore_whitespace: ignore whitespaces in diff
"""
adapt codes to latest vcs
r1894 # make sure we pass in default context
context = context or 3
fixed issues with gitsubmodule diffs
r2233 submodules = filter(lambda o: isinstance(o, SubModuleNode),
[filenode_new, filenode_old])
if submodules:
return ''
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
for filenode in (filenode_old, filenode_new):
if not isinstance(filenode, FileNode):
raise VCSError("Given object should be FileNode object, not %s"
% filenode.__class__)
adapt codes to latest vcs
r1894 repo = filenode_new.changeset.repository
old_raw_id = getattr(filenode_old.changeset, 'raw_id', repo.EMPTY_CHANGESET)
new_raw_id = getattr(filenode_new.changeset, 'raw_id', repo.EMPTY_CHANGESET)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
fix for latest vcs
r1883 vcs_gitdiff = repo.get_diff(old_raw_id, new_raw_id, filenode_new.path,
Implemented generation of changesets based...
r2995 ignore_whitespace, context)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 return vcs_gitdiff
Implemented generation of changesets based...
r2995 NEW_FILENODE = 1
DEL_FILENODE = 2
MOD_FILENODE = 3
RENAMED_FILENODE = 4
CHMOD_FILENODE = 5
class DiffLimitExceeded(Exception):
pass
class LimitedDiffContainer(object):
def __init__(self, diff_limit, cur_diff_size, diff):
self.diff = diff
self.diff_limit = diff_limit
self.cur_diff_size = cur_diff_size
def __iter__(self):
for l in self.diff:
yield l
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
class DiffProcessor(object):
"""
Implemented generation of changesets based...
r2995 Give it a unified or git diff and it returns a list of the files that were
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 mentioned in the diff together with a dict of meta information that
can be used to render it in a HTML template.
"""
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 _chunk_re = re.compile(r'^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)')
_newline_marker = re.compile(r'^\\ No newline at end of file')
Implemented generation of changesets based...
r2995 _git_header_re = re.compile(r"""
#^diff[ ]--git
[ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
(?:^similarity[ ]index[ ](?P<similarity_index>\d+)%\n
^rename[ ]from[ ](?P<rename_from>\S+)\n
^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
(?:^old[ ]mode[ ](?P<old_mode>\d+)\n
^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
(?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
(?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
(?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
\.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
(?:^---[ ](a/(?P<a_file>.+)|/dev/null)(?:\n|$))?
(?:^\+\+\+[ ](b/(?P<b_file>.+)|/dev/null)(?:\n|$))?
""", re.VERBOSE | re.MULTILINE)
_hg_header_re = re.compile(r"""
#^diff[ ]--git
[ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
(?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n|$))?
(?:^rename[ ]from[ ](?P<rename_from>\S+)\n
^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
(?:^old[ ]mode[ ](?P<old_mode>\d+)\n
^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
(?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
(?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
(?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
\.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
(?:^---[ ](a/(?P<a_file>.+)|/dev/null)(?:\n|$))?
(?:^\+\+\+[ ](b/(?P<b_file>.+)|/dev/null)(?:\n|$))?
""", re.VERBOSE | re.MULTILINE)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols...
r3085 #used for inline highlighter word split
_token_re = re.compile(r'()(&gt;|&lt;|&amp;|\W+?)')
Implemented generation of changesets based...
r2995 def __init__(self, diff, vcs='hg', format='gitdiff', diff_limit=None):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Implemented generation of changesets based...
r2995 :param diff: a text in diff format
:param vcs: type of version controll hg or git
:param format: format of diff passed, `udiff` or `gitdiff`
:param diff_limit: define the size of diff that is considered "big"
based on that parameter cut off will be triggered, set to None
to show full diff
"""
if not isinstance(diff, basestring):
raise Exception('Diff must be a basestring got %s instead' % type(diff))
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 self._diff = diff
self._format = format
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 self.adds = 0
self.removes = 0
Implemented generation of changesets based...
r2995 # calculate diff size
self.diff_size = len(diff)
self.diff_limit = diff_limit
self.cur_diff_size = 0
self.parsed = False
self.parsed_diff = []
self.vcs = vcs
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 if format == 'gitdiff':
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 self.differ = self._highlight_line_difflib
Implemented generation of changesets based...
r2995 self._parser = self._parse_gitdiff
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 else:
self.differ = self._highlight_line_udiff
Implemented generation of changesets based...
r2995 self._parser = self._parse_udiff
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 def _copy_iterator(self):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
make a fresh copy of generator, we should not iterate thru
an original as it's needed for repeating operations on
this instance of DiffProcessor
"""
self.__udiff, iterator_copy = tee(self.__udiff)
return iterator_copy
Implemented generation of changesets based...
r2995 def _escaper(self, string):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Implemented generation of changesets based...
r2995 Escaper for diff escapes special chars and checks the diff limit
:param string:
:type string:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Implemented generation of changesets based...
r2995 self.cur_diff_size += len(string)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 # escaper get's iterated on each .next() call and it checks if each
# parsed line doesn't exceed the diff limit
if self.diff_limit is not None and self.cur_diff_size > self.diff_limit:
raise DiffLimitExceeded('Diff Limit Exceeded')
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 return safe_unicode(string).replace('&', '&amp;')\
.replace('<', '&lt;')\
.replace('>', '&gt;')
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 def _line_counter(self, l):
"""
Checks each line and bumps total adds/removes for this diff
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 :param l:
"""
if l.startswith('+') and not l.startswith('+++'):
self.adds += 1
elif l.startswith('-') and not l.startswith('---'):
self.removes += 1
new patch function, and urls schema....
r2996 return safe_unicode(l)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 def _highlight_line_difflib(self, line, next_):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Highlight inline changes in both lines.
"""
if line['action'] == 'del':
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 old, new = line, next_
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 else:
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 old, new = next_, line
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
fixes issue #678 Incorrect diff markup when diff contains >, <, or & symbols...
r3085 oldwords = self._token_re.split(old['line'])
newwords = self._token_re.split(new['line'])
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 sequence = difflib.SequenceMatcher(None, oldwords, newwords)
oldfragments, newfragments = [], []
for tag, i1, i2, j1, j2 in sequence.get_opcodes():
oldfrag = ''.join(oldwords[i1:i2])
newfrag = ''.join(newwords[j1:j2])
if tag != 'equal':
if oldfrag:
oldfrag = '<del>%s</del>' % oldfrag
if newfrag:
newfrag = '<ins>%s</ins>' % newfrag
oldfragments.append(oldfrag)
newfragments.append(newfrag)
old['line'] = "".join(oldfragments)
new['line'] = "".join(newfragments)
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 def _highlight_line_udiff(self, line, next_):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Highlight inline changes in both lines.
"""
start = 0
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 limit = min(len(line['line']), len(next_['line']))
while start < limit and line['line'][start] == next_['line'][start]:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 start += 1
end = -1
limit -= start
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 while -end <= limit and line['line'][end] == next_['line'][end]:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 end -= 1
end += 1
if start or end:
def do(l):
last = end + len(l['line'])
if l['action'] == 'add':
tag = 'ins'
else:
tag = 'del'
l['line'] = '%s<%s>%s</%s>%s' % (
l['line'][:start],
tag,
l['line'][start:last],
tag,
l['line'][last:]
)
do(line)
fixes #326 some html special chars where not escaped in diffs + code garden in helpers
r1781 do(next_)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 def _get_header(self, diff_chunk):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Implemented generation of changesets based...
r2995 parses the diff header, and returns parts, and leftover diff
parts consists of 14 elements::
fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage...
r2967
Implemented generation of changesets based...
r2995 a_path, b_path, similarity_index, rename_from, rename_to,
old_mode, new_mode, new_file_mode, deleted_file_mode,
a_blob_id, b_blob_id, b_mode, a_file, b_file
:param diff_chunk:
:type diff_chunk:
"""
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 if self.vcs == 'git':
match = self._git_header_re.match(diff_chunk)
diff = diff_chunk[match.end():]
return match.groupdict(), imap(self._escaper, diff.splitlines(1))
elif self.vcs == 'hg':
match = self._hg_header_re.match(diff_chunk)
diff = diff_chunk[match.end():]
return match.groupdict(), imap(self._escaper, diff.splitlines(1))
else:
raise Exception('VCS type %s is not supported' % self.vcs)
fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage...
r2967
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 def _clean_line(self, line, command):
if command in ['+', '-', ' ']:
#only modify the line if it's actually a diff thing
line = line[1:]
return line
Implemented generation of changesets based...
r2995 def _parse_gitdiff(self, inline_diff=True):
_files = []
diff_container = lambda arg: arg
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 ##split the diff in chunks of separate --git a/file b/file chunks
for raw_diff in ('\n' + self._diff).split('\ndiff --git')[1:]:
binary = False
binary_msg = 'unknown binary'
head, diff = self._get_header(raw_diff)
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 if not head['a_file'] and head['b_file']:
op = 'A'
elif head['a_file'] and head['b_file']:
op = 'M'
elif head['a_file'] and not head['b_file']:
op = 'D'
else:
#probably we're dealing with a binary file 1
binary = True
if head['deleted_file_mode']:
op = 'D'
stats = ['b', DEL_FILENODE]
binary_msg = 'deleted binary file'
elif head['new_file_mode']:
op = 'A'
stats = ['b', NEW_FILENODE]
binary_msg = 'new binary file %s' % head['new_file_mode']
else:
if head['new_mode'] and head['old_mode']:
stats = ['b', CHMOD_FILENODE]
op = 'M'
binary_msg = ('modified binary file chmod %s => %s'
% (head['old_mode'], head['new_mode']))
elif (head['rename_from'] and head['rename_to']
and head['rename_from'] != head['rename_to']):
stats = ['b', RENAMED_FILENODE]
op = 'M'
binary_msg = ('file renamed from %s to %s'
% (head['rename_from'], head['rename_to']))
else:
stats = ['b', MOD_FILENODE]
op = 'M'
binary_msg = 'modified binary file'
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 if not binary:
try:
chunks, stats = self._parse_lines(diff)
except DiffLimitExceeded:
diff_container = lambda _diff: LimitedDiffContainer(
self.diff_limit,
self.cur_diff_size,
_diff)
break
else:
chunks = []
chunks.append([{
'old_lineno': '',
'new_lineno': '',
'action': 'binary',
'line': binary_msg,
}])
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 _files.append({
'filename': head['b_path'],
'old_revision': head['a_blob_id'],
'new_revision': head['b_blob_id'],
'chunks': chunks,
'operation': op,
'stats': stats,
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Improved RSS/ATOM feeds...
r2385 sorter = lambda info: {'A': 0, 'M': 1, 'D': 2}.get(info['operation'])
Implemented generation of changesets based...
r2995
Improved RSS/ATOM feeds...
r2385 if inline_diff is False:
Implemented generation of changesets based...
r2995 return diff_container(sorted(_files, key=sorter))
Improved RSS/ATOM feeds...
r2385
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 # highlight inline changes
Implemented generation of changesets based...
r2995 for diff_data in _files:
Improved RSS/ATOM feeds...
r2385 for chunk in diff_data['chunks']:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 lineiter = iter(chunk)
try:
while 1:
line = lineiter.next()
fix strikethrough issues on `No new line at end of file`
r2566 if line['action'] not in ['unmod', 'context']:
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 nextline = lineiter.next()
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
r2360 if nextline['action'] in ['unmod', 'context'] or \
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 nextline['action'] == line['action']:
continue
self.differ(line, nextline)
except StopIteration:
pass
Implemented generation of changesets based...
r2995 return diff_container(sorted(_files, key=sorter))
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
Implemented generation of changesets based...
r2995 def _parse_udiff(self, inline_diff=True):
raise NotImplementedError()
def _parse_lines(self, diff):
"""
Parse the diff an return data for the template.
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
Implemented generation of changesets based...
r2995
lineiter = iter(diff)
stats = [0, 0]
try:
chunks = []
line = lineiter.next()
while line:
lines = []
chunks.append(lines)
match = self._chunk_re.match(line)
if not match:
break
gr = match.groups()
(old_line, old_end,
new_line, new_end) = [int(x or 1) for x in gr[:-1]]
old_line -= 1
new_line -= 1
context = len(gr) == 5
old_end += old_line
new_end += new_line
if context:
# skip context only if it's first line
if int(gr[0]) > 1:
lines.append({
'old_lineno': '...',
'new_lineno': '...',
'action': 'context',
'line': line,
})
line = lineiter.next()
while old_line < old_end or new_line < new_end:
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 command = ' '
Implemented generation of changesets based...
r2995 if line:
command = line[0]
affects_old = affects_new = False
# ignore those if we don't expect them
if command in '#@':
continue
elif command == '+':
affects_new = True
action = 'add'
stats[0] += 1
elif command == '-':
affects_old = True
action = 'del'
stats[1] += 1
else:
affects_old = affects_new = True
action = 'unmod'
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 if not self._newline_marker.match(line):
Implemented generation of changesets based...
r2995 old_line += affects_old
new_line += affects_new
lines.append({
'old_lineno': affects_old and old_line or '',
'new_lineno': affects_new and new_line or '',
'action': action,
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 'line': self._clean_line(line, command)
Implemented generation of changesets based...
r2995 })
line = lineiter.next()
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 if self._newline_marker.match(line):
Implemented generation of changesets based...
r2995 # we need to append to lines, since this is not
# counted in the line specs of diff
lines.append({
'old_lineno': '...',
'new_lineno': '...',
'action': 'context',
Fixed issue with inproper handling of diff parsing that could lead to infinit loops....
r3022 'line': self._clean_line(line, command)
Implemented generation of changesets based...
r2995 })
except StopIteration:
pass
return chunks, stats
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
def _safe_id(self, idstring):
"""Make a string safe for including in an id attribute.
The HTML spec says that id attributes 'must begin with
a letter ([A-Za-z]) and may be followed by any number
of letters, digits ([0-9]), hyphens ("-"), underscores
("_"), colons (":"), and periods (".")'. These regexps
are slightly over-zealous, in that they remove colons
and periods unnecessarily.
Whitespace is transformed into underscores, and then
anything which is not a hyphen or a character that
matches \w (alphanumerics and underscore) is removed.
"""
# Transform all whitespace to underscore
idstring = re.sub(r'\s', "_", '%s' % idstring)
# Remove everything that is not a hyphen or a member of \w
idstring = re.sub(r'(?!-)\W', "", idstring).lower()
return idstring
Implemented generation of changesets based...
r2995 def prepare(self, inline_diff=True):
"""
Prepare the passed udiff for HTML rendering. It'l return a list
of dicts with diff information
"""
parsed = self._parser(inline_diff=inline_diff)
self.parsed = True
self.parsed_diff = parsed
return parsed
def as_raw(self, diff_lines=None):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
new patch function, and urls schema....
r2996 Returns raw string diff
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
new patch function, and urls schema....
r2996 return self._diff
#return u''.join(imap(self._line_counter, self._diff.splitlines(1)))
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
def as_html(self, table_class='code-difftable', line_class='line',
Mads Kiilerich
diff view: don't mix css classes for new and old line numbers
r3144 old_lineno_class='lineno old', new_lineno_class='lineno new',
Implemented generation of changesets based...
r2995 code_class='code', enable_comments=False, parsed_lines=None):
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
fixed bug with inline changes highlighter.
r2349 Return given diff as html table with customized css classes
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 """
def _link_to_if(condition, label, url):
"""
Generates a link if condition is meet or just the label if not.
"""
if condition:
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 return '''<a href="%(url)s">%(label)s</a>''' % {
'url': url,
'label': label
}
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 else:
return label
Implemented generation of changesets based...
r2995 if not self.parsed:
self.prepare()
diff_lines = self.parsed_diff
if parsed_lines:
diff_lines = parsed_lines
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 _html_empty = True
_html = []
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''<table class="%(table_class)s">\n''' % {
'table_class': table_class
})
Implemented generation of changesets based...
r2995
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 for diff in diff_lines:
for line in diff['chunks']:
_html_empty = False
for change in line:
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''<tr class="%(lc)s %(action)s">\n''' % {
'lc': line_class,
'action': change['action']
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 anchor_old_id = ''
anchor_new_id = ''
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 anchor_old = "%(filename)s_o%(oldline_no)s" % {
'filename': self._safe_id(diff['filename']),
'oldline_no': change['old_lineno']
}
anchor_new = "%(filename)s_n%(oldline_no)s" % {
'filename': self._safe_id(diff['filename']),
'oldline_no': change['new_lineno']
}
cond_old = (change['old_lineno'] != '...' and
change['old_lineno'])
cond_new = (change['new_lineno'] != '...' and
change['new_lineno'])
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 if cond_old:
anchor_old_id = 'id="%s"' % anchor_old
if cond_new:
anchor_new_id = 'id="%s"' % anchor_new
###########################################################
# OLD LINE NUMBER
###########################################################
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''\t<td %(a_id)s class="%(olc)s">''' % {
'a_id': anchor_old_id,
'olc': old_lineno_class
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''%(link)s''' % {
'link': _link_to_if(True, change['old_lineno'],
'#%s' % anchor_old)
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 _html.append('''</td>\n''')
###########################################################
# NEW LINE NUMBER
###########################################################
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''\t<td %(a_id)s class="%(nlc)s">''' % {
'a_id': anchor_new_id,
'nlc': new_lineno_class
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''%(link)s''' % {
'link': _link_to_if(True, change['new_lineno'],
'#%s' % anchor_new)
})
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 _html.append('''</td>\n''')
###########################################################
# CODE
###########################################################
code garden for changeset ranges and comments...
r1787 comments = '' if enable_comments else 'no-comment'
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 _html.append('''\t<td class="%(cc)s %(inc)s">''' % {
'cc': code_class,
'inc': comments
})
_html.append('''\n\t\t<pre>%(code)s</pre>\n''' % {
'code': change['line']
})
fixes #612 Double quotes to Single quotes result in 4; to 9; in a visual Diff. Markupsafe.escape method usage...
r2967
moved soon-to-be-deleted code from vcs to rhodecode...
r1753 _html.append('''\t</td>''')
_html.append('''\n</tr>\n''')
_html.append('''</table>''')
if _html_empty:
return None
return ''.join(_html)
def stat(self):
"""
Returns tuple of added, and removed lines for this instance
"""
return self.adds, self.removes
Created base for diffing two repositories inside rhodecode
r2337
Mads Kiilerich
refactoring: drop unused 'discovery data' in pull request and compare diffs
r3192 def differ(org_repo, org_ref, other_repo, other_ref,
Mads Kiilerich
compare and diff: remove unused "bundle" functionality...
r3304 context=3, ignore_whitespace=False):
Created base for diffing two repositories inside rhodecode
r2337 """
Multiple changes for compare system...
r3015 General differ between branches, bookmarks, revisions of two remote or
local but related repositories
Created base for diffing two repositories inside rhodecode
r2337
:param org_repo:
:param org_ref:
:param other_repo:
:type other_repo:
:type other_ref:
"""
added basic comparision of two repositories using bundles...
r2355
Enabled compare engine for tags...
r3010 org_repo_scm = org_repo.scm_instance
Multiple changes for compare system...
r3015 other_repo_scm = other_repo.scm_instance
Enabled compare engine for tags...
r3010 org_repo = org_repo_scm._repo
Multiple changes for compare system...
r3015 other_repo = other_repo_scm._repo
fix some small unicode issues with logging on differ
r3366 org_ref = safe_str(org_ref[1])
other_ref = safe_str(other_ref[1])
Created base for diffing two repositories inside rhodecode
r2337
fixed issue with no-cached dulwich repos
r3047 if org_repo_scm == other_repo_scm:
Enabled compare engine for tags...
r3010 log.debug('running diff between %s@%s and %s@%s'
fix some small unicode issues with logging on differ
r3366 % (org_repo.path, org_ref,
other_repo.path, other_ref))
Multiple changes for compare system...
r3015 _diff = org_repo_scm.get_diff(rev1=org_ref, rev2=other_ref,
Enabled compare engine for tags...
r3010 ignore_whitespace=ignore_whitespace, context=context)
return _diff
Mads Kiilerich
compare: show aggregated diff of what will be merged to other repo, using merge ancestor...
r3323 return '' # FIXME: when is it ever relevant to return nothing?