github/codereview
1
0
Fork 0
mirror of https://github.com/correl/codereview.git synced 2024-12-18 03:00:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated diff to process a unified diff for display

Browse source
This commit is contained in:
Correl Roush 2010-11-19 13:44:30 -05:00
parent 6b747d99cb
commit 6d9bc6777b
3 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lib/vcs.py
View file

@ -1,3 +1,4 @@
import re
import difflib
from datetime import datetime
@ -30,39 +31,48 @@ class Diff(object):
self.a = None
self.b = None
self.type = 0
def unified(self):
def unified(self, context=3):
a = self.a.data.split('\n') if self.a else []
b = self.b.data.split('\n') if self.b else []
diff = difflib.unified_diff(
a,
b,
fromfile=self.a.path,
tofile=self.b.path)
return '\n'.join(diff)
tofile=self.b.path,
n=context,
lineterm='')
return "\n".join(diff)
def changes(self, context=3):
a = self.a.data.split('\n') if self.a else []
b = self.b.data.split('\n') if self.b else []
differ = difflib.Differ()
# Locate changes so we can mark context lines
i = 0
"Parses the unified diff into a data structure for easy display"
changes = []
for change in differ.compare(a, b):
if change[0] in ['+', '-']:
changes.append(i)
i += 1
i = 0
line_a = 0
line_b = 0
for change in differ.compare(a, b):
type = change[:2].strip()
text = change[2:]
if type == '?':
# Change information. Discard it for now.
i += 1
print 'skip ?'
if context == None:
context = max(
len(self.a.data.split('\n')) if self.a else 0,
len(self.b.data.split('\n')) if self.b else 0)
for line in self.unified(context).split('\n')[2:]:
if line.startswith('@@'):
pattern = r'\-(\d+)(,\d+)? \+(\d+)(,\d+)?'
info = re.findall(pattern, line)
line_a = int(info[0][0])
line_b = int(info[0][2])
change = {
'type': '@',
'text': line,
'line_a': line_a,
'line_b': line_b,
}
changes.append(change)
continue
type = line[0]
text = line[1:]
change = {
'type': type,
'text': text,
'line_a': line_a,
'line_b': line_b,
}
if type == '+':
line_b += 1
elif type == '-':
@ -70,21 +80,9 @@ class Diff(object):
else:
line_a += 1
line_b += 1
if context and not type:
# Check to see if we're in range of a change
nearby = [c for c in changes if abs(i - c) <= context + 1]
if not nearby:
i += 1
print 'skip nc'
continue
result = {
'type': type,
'line_a': line_a,
'line_b': line_b,
'text': text,
}
yield result
i += 1
changes.append(change)
return changes
def html(self):
a = self.a.data.split('\n') if self.a.data else []
b = self.b.data.split('\n') if self.b.data else []

4
media/default.css
View file

@ -49,6 +49,10 @@ table.diff {
table.diff td {
padding-left: .3em;
padding-right: .3em;
white-space: nowrap;
}
table.diff .break {
background-color: #babaee;
}
table.diff .number {
width: 3em;

16
templates/browser/view.html
View file

@ -37,11 +37,17 @@
{% if diff.b %}{{ diff.b.path }}{% else %}(Deleted){% endif %}
{% endif %}
{% for change in diff.changes %}
<tr class="{% if change.type == '+' %}add{% endif %}{% if change.type == '-' %}del{% endif %}">
<td class="number">{% if change.type != '+' %}{{ change.line_a }}{% endif %}</td>
<td class="number">{% if change.type != '-' %}{{ change.line_b }}{% endif %}</td>
<td class="text">{{ change.text }}</td>
</tr>
{% if change.type == '@' %}
<tr class="break">
<td colspan="3">{{ change.text }}</td>
</tr>
{% else %}
<tr class="{% if change.type == '+' %}add{% endif %}{% if change.type == '-' %}del{% endif %}">
<td class="number">{% if change.type != '+' %}{{ change.line_a }}{% endif %}</td>
<td class="number">{% if change.type != '-' %}{{ change.line_b }}{% endif %}</td>
<td class="text">{{ change.text }}</td>
</tr>
{% endif %}
{% endfor %}
</table>
{% endfor %}