# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1473115878 -7200
# Node ID 72acb38da217c9b8ae6b8d376d3ca9a05dfdd063
# Parent  79676fef1ae0e57503bcb8221db90bb273136e73
diff: minor cleanups

More consistency and preparing for later changes.

diff -r 79676fef1ae0 -r 72acb38da217 kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/controllers/changeset.py	Tue Sep 06 00:51:18 2016 +0200
@@ -293,10 +293,11 @@
                     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 -r 79676fef1ae0 -r 72acb38da217 kallithea/controllers/compare.py
--- a/kallithea/controllers/compare.py	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/controllers/compare.py	Tue Sep 06 00:51:18 2016 +0200
@@ -283,12 +283,12 @@
         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 -r 79676fef1ae0 -r 72acb38da217 kallithea/controllers/files.py
--- a/kallithea/controllers/files.py	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/controllers/files.py	Tue Sep 06 00:51:18 2016 +0200
@@ -695,7 +695,7 @@
             }
             c.changes = cs_changes
 
-        return render('files/file_diff.html')
+            return render('files/file_diff.html')
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/controllers/pullrequests.py	Tue Sep 06 00:51:18 2016 +0200
@@ -704,11 +704,12 @@
             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 -r 79676fef1ae0 -r 72acb38da217 kallithea/templates/changeset/changeset.html
--- a/kallithea/templates/changeset/changeset.html	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/templates/changeset/changeset.html	Tue Sep 06 00:51:18 2016 +0200
@@ -160,25 +160,25 @@
                 </div>
             </div>
             <div class="changes_txt">
-            % 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
-            </div>
-            <div class="cs_files">
-              %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():
-                  <div class="cs_${change}">
-                        <div class="node">
-                            <i class="icon-diff-${change}"></i>
-                            <a href="#${FID}">${h.safe_unicode(path)}</a>
-                        </div>
-                    <div class="changes">${h.fancy_file_stats(stats)}</div>
-                  </div>
-              %endfor
               % if c.limited_diff:
-                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
-              % 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
+              </div>
+              <div class="cs_files">
+                %for fid, (cs1, cs2, op, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():
+                    <div class="cs_${op}">
+                      <div class="node">
+                          <i class="icon-diff-${op}"></i>
+                          <a href="#${fid}">${h.safe_unicode(path)}</a>
+                      </div>
+                      <div class="changes">${h.fancy_file_stats(stats)}</div>
+                    </div>
+                %endfor
+                %if c.limited_diff:
+                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
+                %endif
             </div>
         </div>
 
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/templates/changeset/changeset_range.html	Tue Sep 06 00:51:18 2016 +0200
@@ -59,10 +59,10 @@
             <div class="cs_files">
                 %for cs in c.cs_ranges:
                     <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>
-                    %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():
-                        <div class="cs_${change}">
+                    %for FID, (cs1, cs2, op, path, diff, stats) in c.changes[cs.raw_id].iteritems():
+                        <div class="cs_${op}">
                             <div class="node">
-                                <i class="icon-diff-${change}"></i>
+                                <i class="icon-diff-${op}"></i>
                                 ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
                             </div>
                             <div class="changes">${h.fancy_file_stats(stats)}</div>
@@ -77,7 +77,6 @@
     <%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
           <div class="h3">
           <a class="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
@@ -107,7 +106,6 @@
             </div>
            </div>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
-
     %endfor
 </div>
 </%def>
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/templates/changeset/diff_block.html
--- a/kallithea/templates/changeset/diff_block.html	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/templates/changeset/diff_block.html	Tue Sep 06 00:51:18 2016 +0200
@@ -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)">
 <div class="diff-collapse">
     <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>
@@ -42,7 +39,6 @@
             <div class="changeset_header">
                 <div class="changeset_file">
                     ${h.safe_unicode(filename)} |
-                    ## TODO: link to ancestor and head of other instead of exactly other
                     %if op == 'A':
                       ${_('Added')}
                       <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/templates/compare/compare_diff.html
--- a/kallithea/templates/compare/compare_diff.html	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/templates/compare/compare_diff.html	Tue Sep 06 00:51:18 2016 +0200
@@ -57,7 +57,7 @@
                 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
                 % 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 @@
                   %if not c.files:
                      <span class="empty_data">${_('No files')}</span>
                   %endif
-                  %for fid, change, f, stat in c.files:
-                     <div class="cs_${change}">
-                         <div class="node">
-                             <i class="icon-diff-${change}"></i>
-                             ${h.link_to(h.safe_unicode(f), '#' + fid)}
-                         </div>
-                         <div class="changes">${h.fancy_file_stats(stat)}</div>
-                     </div>
+                  %for fid, op, f, stat in c.files:
+                    <div class="cs_${op}">
+                      <div class="node">
+                          <i class="icon-diff-${op}"></i>
+                          ${h.link_to(h.safe_unicode(f), '#' + fid)}
+                      </div>
+                      <div class="changes">${h.fancy_file_stats(stat)}</div>
+                    </div>
                   %endfor
+                  %if c.limited_diff:
+                    <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>
+                  %endif
                 </div>
-                % if c.limited_diff:
-                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>
-                % endif
          </div>
 
         ## diff block
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Tue Sep 06 00:51:18 2016 +0200
@@ -324,7 +324,7 @@
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
               % 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 @@
                 %if not c.files:
                    <span class="empty_data">${_('No files')}</span>
                 %endif
-                %for fid, change, f, stat in c.files:
-                    <div class="cs_${change}">
+                %for fid, op, f, stat in c.files:
+                    <div class="cs_${op}">
                       <div class="node">
-                          <i class="icon-diff-${change}"></i>
+                          <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(f),'#' + fid)}
                       </div>
                       <div class="changes">${h.fancy_file_stats(stat)}</div>
                     </div>
                 %endfor
+                %if c.limited_diff:
+                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
+                %endif
               </div>
-              % if c.limited_diff:
-                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
-              % endif
           </div>
     </div>
     <script>
diff -r 79676fef1ae0 -r 72acb38da217 kallithea/tests/functional/test_compare_local.py
--- a/kallithea/tests/functional/test_compare_local.py	Tue Sep 06 00:51:18 2016 +0200
+++ b/kallithea/tests/functional/test_compare_local.py	Tue Sep 06 00:51:18 2016 +0200
@@ -29,39 +29,51 @@
         response.mustcontain('11 files changed with 94 insertions and 64 deletions')
 
         ## files diff
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-A"></i>
-                             <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-A"></i>
-                             <a href="#C--e3305437df55">test_and_report.sh</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--c8e92ef85cd1">.hgignore</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--6e08b694d687">.hgtags</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')
-        response.mustcontain('''<div class="node">
-                             <i class="icon-diff-M"></i>
-                             <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-A"></i>
+                          <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>
+                      </div>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-A"></i>
+                          <a href="#C--e3305437df55">test_and_report.sh</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--c8e92ef85cd1">.hgignore</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--6e08b694d687">.hgtags</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')
+        response.mustcontain(
+                   '''<div class="node">
+                          <i class="icon-diff-M"></i>
+                          <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')
 
     def test_compare_tag_git(self):
         self.log_user()