Skip to content
This repository was archived by the owner on Apr 12, 2020. It is now read-only.

Commit 7d4e3ac

Browse files
author
alexandresalome
committed
add binary compare stuff
1 parent f2e0996 commit 7d4e3ac

File tree

2 files changed

+60
-25
lines changed

2 files changed

+60
-25
lines changed

Resources/public/css/all.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,30 @@
6060
background-color: #efefef;
6161
}
6262

63+
64+
.blob-compare {
65+
display: block;
66+
text-align: center;
67+
}
68+
69+
.blob-compare .old, .blob-compare .new {
70+
display: inline-block;
71+
text-align: center;
72+
padding: 1em 0;
73+
}
74+
75+
.blob-compare .old {
76+
padding-right: 1em;
77+
}
78+
79+
.blob-compare .old .blob-image {
80+
border: 1px solid red
81+
}
82+
83+
.blob-compare .new .blob-image {
84+
border: 1px solid green
85+
}
86+
6387
/** Log **/
6488

6589
span.git-author {

Resources/views/default_theme.html.twig

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -195,30 +195,41 @@
195195
{% endif %}
196196
</header>
197197
<div class="file-changes">
198-
<table class="file-lines">
199-
{% for change in file.changes %}
200-
{% if not loop.first %}
201-
<tr><td class="skip" colspan="3">&nbsp;</td></tr>
202-
{% endif %}
203-
{% set old = change.rangeOldStart %}
204-
{% set new = change.rangeNewStart %}
205-
{%- for x, line in change.lines -%}
206-
<tr class="{{ line[0] == 1 ? 'new' : line[0] == -1 ? 'old' }}">
207-
<td class="line-number old">{{ line[0] != 1 ? old : ' ' }}</td>
208-
<td class="line-number new">{{ line[0] != -1 ? new : ' ' }}</td>
209-
<td class="{{ line[0] == 1 ? 'plus' : line[0] == -1 ? 'minus' }} source"><pre>{{ line[1] }}</pre></td>
210-
</tr>
211-
{%- if line[0] == 1 -%}
212-
{%- set new = new + 1 -%}
213-
{%- elseif line[0] == -1 -%}
214-
{%- set old = old + 1 -%}
215-
{%- else -%}
216-
{%- set new = new + 1 -%}
217-
{%- set old = old + 1 -%}
218-
{%- endif -%}
219-
{%- endfor -%}
220-
{% endfor %}
221-
</table>
198+
{% if file.isBinary %}
199+
<div class="blob-compare">
200+
<div class="old">
201+
{{ git_blob(file.oldBlob) }}
202+
</div>
203+
<div class="new">
204+
{{ git_blob(file.newBlob) }}
205+
</div>
206+
</div>
207+
{% else %}
208+
<table class="file-lines">
209+
{% for change in file.changes %}
210+
{% if not loop.first %}
211+
<tr><td class="skip" colspan="3">&nbsp;</td></tr>
212+
{% endif %}
213+
{% set old = change.rangeOldStart %}
214+
{% set new = change.rangeNewStart %}
215+
{%- for x, line in change.lines -%}
216+
<tr class="{{ line[0] == 1 ? 'new' : line[0] == -1 ? 'old' }}">
217+
<td class="line-number old">{{ line[0] != 1 ? old : ' ' }}</td>
218+
<td class="line-number new">{{ line[0] != -1 ? new : ' ' }}</td>
219+
<td class="{{ line[0] == 1 ? 'plus' : line[0] == -1 ? 'minus' }} source"><pre>{{ line[1] }}</pre></td>
220+
</tr>
221+
{%- if line[0] == 1 -%}
222+
{%- set new = new + 1 -%}
223+
{%- elseif line[0] == -1 -%}
224+
{%- set old = old + 1 -%}
225+
{%- else -%}
226+
{%- set new = new + 1 -%}
227+
{%- set old = old + 1 -%}
228+
{%- endif -%}
229+
{%- endfor -%}
230+
{% endfor %}
231+
</table>
232+
{% endif %}
222233
</div>
223234
{% endspaceless %}
224235
{% endblock %}
@@ -376,7 +387,7 @@
376387

377388
{% block blob_image %}
378389
{% spaceless %}
379-
<img src="data:{{ mimetype }};base64,{{ base64 }}" />
390+
<img class="blob-image" src="data:{{ mimetype }};base64,{{ base64 }}" />
380391
{% endspaceless %}
381392
{% endblock %}
382393

0 commit comments

Comments
 (0)