diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -293,10 +293,11 @@ class ChangesetController(BaseRepoContro st = f['stats'] c.lines_added += st['added'] c.lines_deleted += st['deleted'] - fid = h.FID(changeset.raw_id, f['filename']) + filename = f['filename'] + fid = h.FID(changeset.raw_id, filename) diff = diff_processor.as_html(enable_comments=enable_comments, parsed_lines=[f]) - cs_changes[fid] = [cs1, cs2, f['operation'], f['filename'], + cs_changes[fid] = [cs1, cs2, f['operation'], filename, diff, st] else: # downloads/raw we only need RAW diff nothing else diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py --- a/kallithea/controllers/compare.py +++ b/kallithea/controllers/compare.py @@ -283,12 +283,12 @@ class CompareController(BaseRepoControll c.lines_deleted = 0 for f in _parsed: st = f['stats'] - if not st['binary']: - c.lines_added += st['added'] - c.lines_deleted += st['deleted'] - fid = h.FID('', f['filename']) - c.files.append([fid, f['operation'], f['filename'], f['stats']]) + c.lines_added += st['added'] + c.lines_deleted += st['deleted'] + filename = f['filename'] + fid = h.FID('', filename) + c.files.append([fid, f['operation'], filename, f['stats']]) htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], htmldiff] + c.changes[fid] = [f['operation'], filename, htmldiff] return render('compare/compare_diff.html') diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py --- a/kallithea/controllers/files.py +++ b/kallithea/controllers/files.py @@ -695,7 +695,7 @@ class FilesController(BaseRepoController } c.changes = cs_changes - return render('files/file_diff.html') + return render('files/file_diff.html') @LoginRequired() @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -704,11 +704,12 @@ class PullrequestsController(BaseRepoCon st = f['stats'] c.lines_added += st['added'] c.lines_deleted += st['deleted'] - fid = h.FID('', f['filename']) - c.files.append([fid, f['operation'], f['filename'], f['stats']]) + filename = f['filename'] + fid = h.FID('', filename) + c.files.append([fid, f['operation'], filename, f['stats']]) htmldiff = diff_processor.as_html(enable_comments=True, parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], htmldiff] + c.changes[fid] = [f['operation'], filename, htmldiff] # inline comments c.inline_cnt = 0 diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -160,25 +160,25 @@ ${self.repo_context_bar('changelog', c.c
- % if c.limited_diff: - ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: - % else: - ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: - %endif -
-
- %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): -
-
- - ${h.safe_unicode(path)} -
-
${h.fancy_file_stats(stats)}
-
- %endfor % if c.limited_diff: -
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
- % endif + ${ungettext('%s file changed', '%s files changed', len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: + % else: + ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files), c.lines_added, c.lines_deleted)}: + %endif +
+
+ %for fid, (cs1, cs2, op, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): +
+
+ + ${h.safe_unicode(path)} +
+
${h.fancy_file_stats(stats)}
+
+ %endfor + %if c.limited_diff: +
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
+ %endif
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -59,10 +59,10 @@ ${self.repo_context_bar('changelog')}
%for cs in c.cs_ranges:
${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
- %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): -
+ %for FID, (cs1, cs2, op, path, diff, stats) in c.changes[cs.raw_id].iteritems(): +
- + ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
${h.fancy_file_stats(stats)}
@@ -77,7 +77,6 @@ ${self.repo_context_bar('changelog')} <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} %for cs in c.cs_ranges: - ##${comment.comment_inline_form(cs)} ## diff block
${h.show_id(cs)} @@ -107,7 +106,6 @@ ${self.repo_context_bar('changelog')}
${diff_block.diff_block(c.changes[cs.raw_id])} - %endfor
diff --git a/kallithea/templates/changeset/diff_block.html b/kallithea/templates/changeset/diff_block.html --- a/kallithea/templates/changeset/diff_block.html +++ b/kallithea/templates/changeset/diff_block.html @@ -1,8 +1,5 @@ ## -*- coding: utf-8 -*- -##usage: -## <%namespace name="diff_block" file="/changeset/diff_block.html"/> -## ${diff_block.diff_block(change)} -## + <%def name="diff_block(change)">
↑ ${_('Collapse Diff')} ↑ @@ -42,7 +39,6 @@
${h.safe_unicode(filename)} | - ## TODO: link to ancestor and head of other instead of exactly other %if op == 'A': ${_('Added')} ${h.short_ref(cs_ref_type, cs_ref_name)} diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -57,7 +57,7 @@ ${self.repo_context_bar('changelog')}
% if c.limited_diff: - ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)} + ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}: % else: ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}: %endif @@ -70,19 +70,19 @@ ${self.repo_context_bar('changelog')} %if not c.files: ${_('No files')} %endif - %for fid, change, f, stat in c.files: -
-
- - ${h.link_to(h.safe_unicode(f), '#' + fid)} -
-
${h.fancy_file_stats(stat)}
-
+ %for fid, op, f, stat in c.files: +
+
+ + ${h.link_to(h.safe_unicode(f), '#' + fid)} +
+
${h.fancy_file_stats(stat)}
+
%endfor + %if c.limited_diff: +
${_('Changeset was too big and was cut off...')} ${_('Show full diff')}
+ %endif
- % if c.limited_diff: -
${_('Changeset was too big and was cut off...')} ${_('Show full diff')}
- % endif
## diff block diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -324,7 +324,7 @@ ${self.repo_context_bar('showpullrequest
% if c.limited_diff: - ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)} + ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}: % else: ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}: %endif @@ -334,19 +334,19 @@ ${self.repo_context_bar('showpullrequest %if not c.files: ${_('No files')} %endif - %for fid, change, f, stat in c.files: -
+ %for fid, op, f, stat in c.files: +
- + ${h.link_to(h.safe_unicode(f),'#' + fid)}
${h.fancy_file_stats(stat)}
%endfor + %if c.limited_diff: +
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
+ %endif
- % if c.limited_diff: -
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
- % endif