pull-requests: updated versioning support.

- each pr version connects invalidated comments to it
- in version list we show number of comments made on each version
- show all outdated comments even for deleted files
- linkify outdated comments to first one
- added auto-collapse of commit range if they are more than 5
- styling changes, wide mode improvements

rhodecode/controllers/changeset.py

@@ -198,6 +198,10 b' class ChangesetController(BaseRepoContro'
         c.lines_added = 0
         c.lines_deleted = 0
 
+        # auto collapse if we have more than limit
+        collapse_limit = diffs.DiffProcessor._collapse_commits_over
+        c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
+
         c.commit_statuses = ChangesetStatus.STATUSES
         c.inline_comments = []
         c.files = []

rhodecode/controllers/compare.py

@@ -79,6 +79,7 b' class CompareController(BaseRepoControll'
     def index(self, repo_name):
         c.compare_home = True
         c.commit_ranges = []
+        c.collapse_all_commits = False
         c.diffset = None
         c.limited_diff = False
         source_repo = c.rhodecode_db_repo.repo_name
@@ -209,6 +210,10 b' class CompareController(BaseRepoControll'
         c.statuses = c.rhodecode_db_repo.statuses(
             [x.raw_id for x in c.commit_ranges])
 
+        # auto collapse if we have more than limit
+        collapse_limit = diffs.DiffProcessor._collapse_commits_over
+        c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
+
         if partial:  # for PR ajax commits loader
             if not c.ancestor:
                 return ''  # cannot merge if there is no ancestor

rhodecode/controllers/pullrequests.py

@@ -26,7 +26,7 b' import types'
 import peppercorn
 import formencode
 import logging
-
+import collections
 
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPBadRequest
 from pylons import request, tmpl_context as c, url
@@ -45,7 +45,6 b' from rhodecode.lib.auth import ('
     LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
     HasAcceptedRepoType, XHRRequired)
 from rhodecode.lib.channelstream import channelstream_request
-from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import (
     safe_int, safe_str, str2bool, safe_unicode)
@@ -70,7 +69,7 b' class PullrequestsController(BaseRepoCon'
     def __before__(self):
         super(PullrequestsController, self).__before__()
 
-    def _load_compare_data(self, pull_request, inline_comments, enable_comments=True):
+    def _load_compare_data(self, pull_request, inline_comments):
         """
         Load context data needed for generating compare diff
 
@@ -123,6 +122,10 b' class PullrequestsController(BaseRepoCon'
         except RepositoryRequirementError:
             c.missing_requirements = True
 
+        # auto collapse if we have more than limit
+        collapse_limit = diffs.DiffProcessor._collapse_commits_over
+        c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
+
         c.changes = {}
         c.missing_commits = False
         if (c.missing_requirements or
@@ -135,13 +138,24 b' class PullrequestsController(BaseRepoCon'
             diff_processor = diffs.DiffProcessor(
                 vcs_diff, format='newdiff', diff_limit=diff_limit,
                 file_limit=file_limit, show_full_diff=c.fulldiff)
-            _parsed = diff_processor.prepare()
 
-            commit_changes = OrderedDict()
             _parsed = diff_processor.prepare()
             c.limited_diff = isinstance(_parsed, diffs.LimitedDiffContainer)
 
-            _parsed = diff_processor.prepare()
+            included_files = {}
+            for f in _parsed:
+                included_files[f['filename']] = f['stats']
+
+            c.deleted_files = [fname for fname in inline_comments if
+                               fname not in included_files]
+
+            c.deleted_files_comments = collections.defaultdict(dict)
+            for fname, per_line_comments in inline_comments.items():
+                if fname in c.deleted_files:
+                    c.deleted_files_comments[fname]['stats'] = 0
+                    c.deleted_files_comments[fname]['comments'] = list()
+                    for lno, comments in per_line_comments.items():
+                        c.deleted_files_comments[fname]['comments'].extend(comments)
 
             def _node_getter(commit):
                 def get_node(fname):
@@ -159,14 +173,6 b' class PullrequestsController(BaseRepoCon'
                 comments=inline_comments
             ).render_patchset(_parsed, target_commit.raw_id, source_commit.raw_id)
 
-        c.included_files = []
-        c.deleted_files = []
-
-        for f in _parsed:
-            st = f['stats']
-            fid = h.FID('', f['filename'])
-            c.included_files.append(f['filename'])
-
     def _extract_ordering(self, request):
         column_index = safe_int(request.GET.get('order[0][column]'))
         order_dir = request.GET.get('order[0][dir]', 'desc')
@@ -802,36 +808,47 b' class PullrequestsController(BaseRepoCon'
             c.pr_merge_status = False
 
         # inline comments
-        c.inline_comments = cc_model.get_inline_comments(
-            c.rhodecode_db_repo.repo_id,
-            pull_request=pull_request_id)
+        inline_comments = cc_model.get_inline_comments(
+            c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
+
+        _inline_cnt, c.inline_versions = cc_model.get_inline_comments_count(
+            inline_comments, version=at_version, include_aggregates=True)
+
+        c.at_version_num = at_version if at_version and at_version != 'latest' else None
+        is_outdated = lambda co: \
+            not c.at_version_num \
+            or co.pull_request_version_id <= c.at_version_num
 
-        c.inline_cnt = cc_model.get_inline_comments_count(
-            c.inline_comments, version=at_version)
-
-        # load compare data into template context
-        enable_comments = not pr_closed
-        self._load_compare_data(
-            pull_request_at_ver,
-            c.inline_comments, enable_comments=enable_comments)
+        # inline_comments_until_version
+        if c.at_version_num:
+            # if we use version, then do not show later comments
+            # than current version
+            paths = collections.defaultdict(lambda: collections.defaultdict(list))
+            for fname, per_line_comments in inline_comments.iteritems():
+                for lno, comments in per_line_comments.iteritems():
+                    for co in comments:
+                        if co.pull_request_version_id and is_outdated(co):
+                            paths[co.f_path][co.line_no].append(co)
+            inline_comments = paths
 
         # outdated comments
-        c.outdated_comments = {}
         c.outdated_cnt = 0
-
         if ChangesetCommentsModel.use_outdated_comments(pull_request_latest):
-            c.outdated_comments = cc_model.get_outdated_comments(
+            outdated_comments = cc_model.get_outdated_comments(
                 c.rhodecode_db_repo.repo_id,
                 pull_request=pull_request_at_ver)
 
             # Count outdated comments and check for deleted files
-            for file_name, lines in c.outdated_comments.iteritems():
+            is_outdated = lambda co: \
+                not c.at_version_num \
+                or co.pull_request_version_id < c.at_version_num
+            for file_name, lines in outdated_comments.iteritems():
                 for comments in lines.values():
-                    comments = [comm for comm in comments
-                                if comm.outdated_at_version(at_version)]
+                    comments = [comm for comm in comments if is_outdated(comm)]
                     c.outdated_cnt += len(comments)
-                if file_name not in c.included_files:
-                    c.deleted_files.append(file_name)
+
+        # load compare data into template context
+        self._load_compare_data(pull_request_at_ver, inline_comments)
 
         # this is a hack to properly display links, when creating PR, the
         # compare view and others uses different notation, and
@@ -839,9 +856,9 b' class PullrequestsController(BaseRepoCon'
         # We need to swap that here to generate it properly on the html side
         c.target_repo = c.source_repo
 
-        # comments
-        c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
-                                           pull_request=pull_request_id)
+        # general comments
+        c.comments = cc_model.get_comments(
+            c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
 
         if c.allowed_to_update:
             force_close = ('forced_closed', _('Close Pull Request'))
@@ -859,7 +876,7 b' class PullrequestsController(BaseRepoCon'
         c.changes = None
         c.file_changes = None
 
-        c.show_version_changes = 1
+        c.show_version_changes = 1  # control flag, not used yet
 
         if at_version and c.show_version_changes:
             c.changes, c.file_changes = self._get_pr_version_changes(

rhodecode/lib/diffs.py

@@ -203,6 +203,9 b' class DiffProcessor(object):'
     # used for inline highlighter word split
     _token_re = re.compile(r'()(>|<|&|\W+?)')
 
+    # collapse ranges of commits over given number
+    _collapse_commits_over = 5
+
     def __init__(self, diff, format='gitdiff', diff_limit=None,
                  file_limit=None, show_full_diff=True):
         """

rhodecode/model/comment.py

@@ -355,13 +355,18 b' class ChangesetCommentsModel(BaseModel):'
         return self._group_comments_by_path_and_line_number(q)
 
     def get_inline_comments_count(self, inline_comments, skip_outdated=True,
-                                  version=None):
+                                  version=None, include_aggregates=False):
+        version_aggregates = collections.defaultdict(list)
         inline_cnt = 0
         for fname, per_line_comments in inline_comments.iteritems():
             for lno, comments in per_line_comments.iteritems():
-                inline_cnt += len(
-                    [comm for comm in comments
-                     if (not comm.outdated_at_version(version) and skip_outdated)])
+                for comm in comments:
+                    version_aggregates[comm.pull_request_version_id].append(comm)
+                    if not comm.outdated_at_version(version) and skip_outdated:
+                        inline_cnt += 1
+
+        if include_aggregates:
+            return inline_cnt, version_aggregates
         return inline_cnt
 
     def get_outdated_comments(self, repo_id, pull_request):

rhodecode/public/css/code-block.less

@@ -658,24 +658,30 b' input.filediff-collapse-state {'
             display: none
         }
         .filediff-collapse-indicator {
-            border-width: 9px 0 9px 15.6px;
+            width: 0;
+            height: 0;
+            border-style: solid;
+            border-width: 6.5px 0 6.5px 11.3px;
             border-color: transparent transparent transparent #ccc;
         }
         .filediff-menu {
             display: none;
         }
-        margin: -1px 0 0 0;
+        margin: 10px 0 0 0;
     }
 
     &+ .filediff { /* file diff is expanded */
         .filediff-collapse-indicator {
-            border-width: 15.6px 9px 0 9px;
+            width: 0;
+            height: 0;
+            border-style: solid;
+            border-width: 11.3px 6.5px 0 6.5px;
             border-color: #ccc transparent transparent transparent;
         }
         .filediff-menu {
             display: block;
         }
-        margin: 20px 0;
+        margin: 10px 0;
         &:nth-child(2) {
             margin: 0;
         }
@@ -775,11 +781,9 b' input.filediff-collapse-state {'
     }
 
     .filediff-collapse-indicator {
-        width: 0;
-        height: 0;
         border-style: solid;
         float: left;
-        margin: 2px 2px 0 0;
+        margin: 4px 0px 0 0;
         cursor: pointer;
     }
 
@@ -800,11 +804,12 b' input.filediff-collapse-state {'
 
     .filediff-menu {
         float: right;
+        text-align: right;
+        padding: 5px 5px 5px 0px;
 
-        &> a, &> span {
-            padding: 5px;
-            display: block;
-            float: left
+        &> a,
+        &> span {
+            padding: 1px;
         }
     }
 
@@ -962,6 +967,13 b' input.filediff-collapse-state {'
 
 }
 
+.filediff-outdated {
+    padding: 8px 0;
+
+    .filediff-heading {
+        opacity: .5;
+    }
+}
 
 table.cb {
     width: 100%;
@@ -1068,8 +1080,8 b' table.cb {'
 
             &> button.cb-comment-box-opener {
 
-                padding: 2px 5px 1px 5px;
-                margin-left: 0px;
+                padding: 2px 2px 1px 3px;
+                margin-left: -6px;
                 margin-top: -1px;
 
                 border-radius: @border-radius;

rhodecode/public/css/main.less

@@ -110,7 +110,7 b' ul.simple-list{'
 }
 
 .wide-mode-wrapper {
-    max-width:2400px !important;
+    max-width:4000px !important;
 }
 
 .wrapper {
@@ -1623,6 +1623,12 b' BIN_FILENODE = 7'
 .pull-request-merge span {
     margin-right: 10px;
 }
+
+.pr-versions {
+    position: relative;
+    top: 6px;
+}
+
 #close_pull_request {
     margin-right: 0px;
 }

rhodecode/public/css/tables.less

@@ -445,6 +445,15 b' table.compare_view_commits {'
         padding-left: .5em;
     }
 
+    // special case to not show hover actions on hidden indicator
+    tr.compare_select_hidden:hover {
+        cursor: inherit;
+
+        td {
+            background-color: inherit;
+        }
+    }
+
     tr:hover {
         cursor: pointer;
 
@@ -452,6 +461,8 b' table.compare_view_commits {'
             background-color: lighten(@alert4,25%);
         }
     }
+
+
 }
 
 .file_history {

rhodecode/public/js/src/rhodecode/comments.js

@@ -411,23 +411,26 b' var CommentsController = function() { /*'
       return $node.closest('td').attr('data-line-number');
   };
 
-  this.scrollToComment = function(node, offset) {
+  this.scrollToComment = function(node, offset, outdated) {
+    var outdated = outdated || false;
+    var klass = outdated ? 'div.comment-outdated' : 'div.comment-current';
+
     if (!node) {
       node = $('.comment-selected');
       if (!node.length) {
         node = $('comment-current')
       }
     }
-    $comment = $(node).closest('.comment-current');
-    $comments = $('.comment-current');
+    $comment = $(node).closest(klass);
+    $comments = $(klass);
 
     $('.comment-selected').removeClass('comment-selected');
 
-    var nextIdx = $('.comment-current').index($comment) + offset;
+    var nextIdx = $(klass).index($comment) + offset;
     if (nextIdx >= $comments.length) {
       nextIdx = 0;
     }
-    var $next = $('.comment-current').eq(nextIdx);
+    var $next = $(klass).eq(nextIdx);
     var $cb = $next.closest('.cb');
     $cb.removeClass('cb-collapsed');
 
@@ -446,6 +449,14 b' var CommentsController = function() { /*'
     return self.scrollToComment(node, -1);
   };
 
+  this.nextOutdatedComment = function(node) {
+    return self.scrollToComment(node, 1, true);
+  };
+
+  this.prevOutdatedComment = function(node) {
+    return self.scrollToComment(node, -1, true);
+  };
+
   this.deleteComment = function(node) {
       if (!confirm(_gettext('Delete this comment?'))) {
         return false;

rhodecode/templates/changelog/changelog.html

@@ -139,7 +139,7 b''
                     <td class="td-comments comments-col">
                     %if c.comments.get(commit.raw_id):
                       <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
-                          <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[commit.raw_id])}
+                          <i class="icon-comment"></i> ${len(c.comments[commit.raw_id])}
                       </a>
                     %endif
                     </td>

rhodecode/templates/changelog/changelog_summary_data.html

@@ -34,7 +34,7 b''
         <td class="td-comments">
             %if c.comments.get(cs.raw_id,[]):
             <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
+                <i class="icon-comment"></i> ${len(c.comments[cs.raw_id])}
             </a>
             %endif
         </td>

rhodecode/templates/changeset/changeset_file_comment.html

@@ -6,13 +6,15 b''
 <%namespace name="base" file="/base/base.html"/>
 
 <%def name="comment_block(comment, inline=False)">
+  <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version', None)) %>
+
   <div class="comment
              ${'comment-inline' if inline else ''}
-             ${'comment-outdated' if comment.outdated_at_version(getattr(c, 'at_version', None)) else 'comment-current'}"
+             ${'comment-outdated' if outdated_at_ver else 'comment-current'}"
        id="comment-${comment.comment_id}"
        line="${comment.line_no}"
        data-comment-id="${comment.comment_id}"
-       style="${'display: none;' if comment.outdated_at_version(getattr(c, 'at_version', None)) else ''}">
+       style="${'display: none;' if outdated_at_ver else ''}">
 
       <div class="meta">
           <div class="author">
@@ -52,12 +54,10 b''
           %endif
           <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
 
-
           <div class="comment-links-block">
-
             ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
-            ## only super-admin, repo admin OR comment owner can delete
-            %if not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed()):
+            ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
+            %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
                ## permissions to delete
                %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
                   ## TODO: dan: add edit comment here
@@ -68,7 +68,8 b''
             %else:
                <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
             %endif
-            %if not comment.outdated_at_version(getattr(c, 'at_version', None)):
+
+            %if not outdated_at_ver:
                | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a>
                | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a>
             %endif

rhodecode/templates/codeblocks/diffs.html

@@ -40,6 +40,10 b" return h.url('', **new_args)"
     # disable new comments
     disable_new_comments=False,
 
+    # special file-comments that were deleted in previous versions
+    # it's used for showing outdated comments for deleted files in a PR
+    deleted_files_comments=None
+
 )">
 
 %if use_comments:
@@ -126,7 +130,7 b' collapse_all = len(diffset.files) > coll'
     height: 18px;
     opacity: .2;
     z-index: 10;
-    ## +5 to account for diff action (+/-)
+    //## +5 to account for diff action (+/-)
     left: ${ruler_at_chars + 5}ch;
 </style>
 %endif
@@ -153,6 +157,14 b' collapse_all = len(diffset.files) > coll'
         ${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
                     '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}}
     %endif
+
+        <% at_ver = getattr(c, 'at_version_num', None) %>
+        % if at_ver:
+            <div class="pull-right">
+            ${_('Changes at version %d') % at_ver}
+            </div>
+        % endif
+
         </h2>
     </div>
 
@@ -181,7 +193,7 b' collapse_all = len(diffset.files) > coll'
         %if not filediff.hunks:
             %for op_id, op_text in filediff['patch']['stats']['ops'].items():
                 <tr>
-                    <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=3' or 'colspan=4'}>
+                    <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                         %if op_id == DEL_FILENODE:
                         ${_('File was deleted')}
                         %elif op_id == BIN_FILENODE:
@@ -193,6 +205,13 b' collapse_all = len(diffset.files) > coll'
                 </tr>
             %endfor
         %endif
+        %if filediff.patch['is_limited_diff']:
+                <tr class="cb-warning cb-collapser">
+                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
+                        ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
+                    </td>
+                </tr>
+        %else:
         %if over_lines_changed_limit:
                 <tr class="cb-warning cb-collapser">
                     <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
@@ -206,13 +225,8 b' collapse_all = len(diffset.files) > coll'
                     </td>
                 </tr>
         %endif
-        %if filediff.patch['is_limited_diff']:
-                <tr class="cb-warning cb-collapser">
-                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
-                        ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
-                    </td>
-                </tr>
         %endif
+
         %for hunk in filediff.hunks:
                 <tr class="cb-hunk">
                     <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
@@ -239,6 +253,7 b' collapse_all = len(diffset.files) > coll'
             %endif
         %endfor
 
+        ## outdated comments that do not fit into currently displayed lines
             % for lineno, comments in filediff.left_comments.items():
 
             %if c.diffmode == 'unified':
@@ -269,8 +284,68 b' collapse_all = len(diffset.files) > coll'
             </table>
         </div>
     %endfor
+
+    ## outdated comments that are made for a file that has been deleted
+    % for filename, comments_dict in (deleted_files_comments or {}).items():
+
+        <div class="filediffs filediff-outdated" style="display: none">
+            <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
+            <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
+                <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
+                    <div class="filediff-collapse-indicator"></div>
+                    <span class="pill">
+                        ## file was deleted
+                        <strong>${filename}</strong>
+                    </span>
+                    <span class="pill-group" style="float: left">
+                        ## file op, doesn't need translation
+                        <span class="pill" op="removed">removed in this version</span>
+                    </span>
+                    <a class="pill filediff-anchor" href="#a_${h.FID('', filename)}">¶</a>
+                    <span class="pill-group" style="float: right">
+                        <span class="pill" op="deleted">-${comments_dict['stats']}</span>
+                    </span>
+                </label>
+
+                <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
+                    <tr>
+                        % if c.diffmode == 'unified':
+                        <td></td>
+                        %endif
+
+                        <td></td>
+                        <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
+                        ${_('File was deleted in this version, and outdated comments were made on it')}
+                        </td>
+                    </tr>
+                    %if c.diffmode == 'unified':
+                    <tr class="cb-line">
+                        <td class="cb-data cb-context"></td>
+                        <td class="cb-lineno cb-context"></td>
+                        <td class="cb-lineno cb-context"></td>
+                        <td class="cb-content cb-context">
+                            ${inline_comments_container(comments_dict['comments'])}
+                        </td>
+                    </tr>
+                    %elif c.diffmode == 'sideside':
+                    <tr class="cb-line">
+                        <td class="cb-data cb-context"></td>
+                        <td class="cb-lineno cb-context"></td>
+                        <td class="cb-content cb-context"></td>
+
+                        <td class="cb-data cb-context"></td>
+                        <td class="cb-lineno cb-context"></td>
+                        <td class="cb-content cb-context">
+                            ${inline_comments_container(comments_dict['comments'])}
+                        </td>
+                    </tr>
+                    %endif
+                </table>
     </div>
 </div>
+    % endfor
+
+</div>
 </%def>
 
 <%def name="diff_ops(filediff)">
@@ -358,14 +433,14 b' from rhodecode.lib.diffs import NEW_FILE'
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
-        </a>
+        </a> |
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
-        </span>
+        </span> |
     %endif
     %if filediff.patch['operation'] in ['A', 'M']:
         <a
@@ -374,14 +449,14 b' from rhodecode.lib.diffs import NEW_FILE'
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
         >
             ${_('Show file after')}
-        </a>
+        </a> |
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
             >
                 ${_('Show file after')}
-        </span>
+        </span> |
     %endif
         <a
             class="tooltip"
@@ -389,7 +464,7 b' from rhodecode.lib.diffs import NEW_FILE'
             href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
         >
             ${_('Raw diff')}
-        </a>
+        </a> |
         <a
             class="tooltip"
             title="${h.tooltip(_('Download diff'))}"
@@ -397,6 +472,9 b' from rhodecode.lib.diffs import NEW_FILE'
         >
             ${_('Download diff')}
         </a>
+        % if use_comments:
+            |
+        % endif
 
         ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
         %if hasattr(c, 'ignorews_url'):
@@ -406,7 +484,6 b' from rhodecode.lib.diffs import NEW_FILE'
         ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
         %endif
 
-
         %if use_comments:
         <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
             <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
@@ -424,11 +501,17 b' from rhodecode.lib.diffs import NEW_FILE'
     ${commentblock.comment_block(comment, inline=True)}
     %endfor
 
-    <span onclick="return Rhodecode.comments.createComment(this)"
-          class="btn btn-secondary cb-comment-add-button ${'comment-outdated' if comments and comments[-1].outdated else ''}"
-          style="${'display: none;' if comments and comments[-1].outdated else ''}">
+    % if comments and comments[-1].outdated:
+    <span class="btn btn-secondary cb-comment-add-button comment-outdated}"
+          style="display: none;}">
         ${_('Add another comment')}
     </span>
+    % else:
+    <span onclick="return Rhodecode.comments.createComment(this)"
+          class="btn btn-secondary cb-comment-add-button">
+        ${_('Add another comment')}
+    </span>
+    % endif
 
 </div>
 </%def>
@@ -563,10 +646,9 b' from rhodecode.lib.diffs import NEW_FILE'
 </%def>
 
 <%def name="render_add_comment_button()">
-<button
-    class="btn btn-small btn-primary cb-comment-box-opener"
-    onclick="return Rhodecode.comments.createComment(this)"
-><span>+</span></button>
+<button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
+    <span><i class="icon-comment"></i></span>
+</button>
 </%def>
 
 <%def name="render_diffset_menu()">

rhodecode/templates/compare/compare_commits.html

@@ -25,6 +25,7 b''
         <tr id="row-${commit.raw_id}"
             commit_id="${commit.raw_id}"
             class="compare_select"
+            style="${'display: none' if c.collapse_all_commits else ''}"
         >
             <td class="td-time">
                 ${h.age_component(commit.date)}
@@ -63,9 +64,10 b''
             </td>
         </tr>
     %endfor
-        <tr class="compare_select_hidden" style="display: none">
+        <tr class="compare_select_hidden" style="${'' if c.collapse_all_commits else 'display: none'}">
             <td colspan="5">
-                ${ungettext('%s commit hidden','%s commits hidden', len(c.commit_ranges)) % len(c.commit_ranges)}
+                ${ungettext('%s commit hidden','%s commits hidden', len(c.commit_ranges)) % len(c.commit_ranges)},
+                <a href="#" onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">${ungettext('show it','show them', len(c.commit_ranges))}</a>
             </td>
         </tr>
     % if not c.commit_ranges:

rhodecode/templates/data_table/_dt_elements.html

@@ -295,7 +295,7 b''
 </%def>
 
 <%def name="pullrequest_comments(comments_nr)">
-    <i class="icon-comment icon-comment-colored"></i> ${comments_nr}
+    <i class="icon-comment"></i> ${comments_nr}
 </%def>
 
 <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)">

rhodecode/templates/debug_style/tables.html

@@ -278,7 +278,7 b''
             <td>td-comments</td>
             <td>Comments indicator icon.</td>
             <td>
-              <i class="icon-comment icon-comment-colored"></i> 0
+              <i class="icon-comment"></i> 0
             </td>
           </tr>
           <tr>

rhodecode/templates/pullrequests/pullrequest_show.html

@@ -58,7 +58,7 b''
                   % endif
               </div>
               <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
-              <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel edit')}</div>
+              <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
             %endif
         </div>
 
@@ -161,40 +161,6 b''
                 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
             </div>
            </div>
-           <div class="field">
-            <div class="label-summary">
-                <label>${_('Comments')}:</label>
-            </div>
-            <div class="input">
-                <div>
-                    <div class="comments-number">
-                        %if c.comments:
-                            <a href="#comments">${ungettext("%d General Comment", "%d General Comments", len(c.comments)) % len(c.comments)}</a>,
-                        %else:
-                            ${ungettext("%d General Comment", "%d General Comments", len(c.comments)) % len(c.comments)}
-                        %endif
-
-                        %if c.inline_cnt:
-                            <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}</a>
-                        %else:
-                            ${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}
-                        %endif
-
-                        %if c.outdated_cnt:
-                          , ${ungettext("%d Outdated Comment", "%d Outdated Comments", c.outdated_cnt) % c.outdated_cnt} <span id="show-outdated-comments" class="btn btn-link">${_('(Show)')}</span>
-                        %endif
-                   </div>
-                </div>
-           </div>
-
-           </div>
-
-            <style>
-                .pr-versions {
-                    position: relative;
-                    top: 6px;
-                }
-            </style>
 
            <div class="field">
                 <div class="label-summary">
@@ -204,11 +170,13 b''
                <div class="pr-versions">
                % if c.show_version_changes:
                    <table>
-                       ## current visible version
-                       <tr class="version-pr" style="display: ${'' if c.at_version in [None, 'latest'] else 'none'}">
+                       ## CURRENTLY SELECT PR VERSION
+                       <tr class="version-pr" style="display: ${'' if c.at_version_num is None else 'none'}">
                            <td>
                                % if c.at_version in [None, 'latest']:
                                 <i class="icon-ok link"></i>
+                               % else:
+                                <i class="icon-comment"></i> <code>${len(c.inline_versions[None])}</code>
                                % endif
                            </td>
                            <td>
@@ -223,35 +191,79 b''
                            <td>
                                <code>${c.pull_request_latest.source_ref_parts.commit_id[:6]}</code>
                            </td>
-                           <td>${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}</td>
                            <td>
-                               % if c.versions and c.at_version in [None, 'latest']:
-                               <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('(Show all)')}</span>
+                               ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}
+                           </td>
+                           <td align="right">
+                               % if c.versions and c.at_version_num in [None, 'latest']:
+                               <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
                                % endif
                            </td>
                        </tr>
 
+                       ## SHOW ALL VERSIONS OF PR
+                       <% ver_pr = None %>
                        % for ver in reversed(c.pull_request.versions()):
-                       <tr class="version-pr" style="display: ${'' if c.at_version == ver.pull_request_version_id else 'none'}">
+                       <% ver_pr = ver.pull_request_version_id %>
+                       <tr class="version-pr" style="display: ${'' if c.at_version == ver_pr else 'none'}">
                            <td>
-                               % if c.at_version == ver.pull_request_version_id:
+                               % if c.at_version == ver_pr:
                                 <i class="icon-ok link"></i>
+                               % else:
+                                <i class="icon-comment"></i> <code>${len(c.inline_versions[ver_pr])}</code>
                                % endif
                            </td>
-                           <td><code><a href="${h.url.current(version=ver.pull_request_version_id)}">version ${ver.pull_request_version_id}</a></code></td>
+                           <td>
+                               <code><a href="${h.url.current(version=ver_pr)}">version ${ver_pr}</a></code>
+                           </td>
                            <td>
                                <code>${ver.source_ref_parts.commit_id[:6]}</code>
                            </td>
-                           <td>${_('created')} ${h.age_component(ver.updated_on)}</td>
                            <td>
-                               % if c.at_version == ver.pull_request_version_id:
-                               <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('(Show all)')}</span>
+                               ${_('created')} ${h.age_component(ver.updated_on)}
+                           </td>
+                           <td align="right">
+                               % if c.at_version == ver_pr:
+                               <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
                                % endif
                            </td>
                        </tr>
                        % endfor
-                   </table>
+
+                       ## show comment/inline comments summary
+                       <tr>
+                           <td>
+                           </td>
+
+                           <% inline_comm_count_ver = len(c.inline_versions[ver_pr])%>
+                           <td colspan="4" style="border-top: 1px dashed #dbd9da">
+                            ${_('Comments for this version')}:
+                            %if c.comments:
+                                <a href="#comments">${_("%d General ") % len(c.comments)}</a>
+                            %else:
+                                ${_("%d General ") % len(c.comments)}
+                            %endif
 
+                            <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num])%>
+                            %if inline_comm_count_ver:
+                               , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
+                            %else:
+                               , ${_("%d Inline") % inline_comm_count_ver}
+                            %endif
+
+                            %if c.outdated_cnt:
+                              , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % c.outdated_cnt}</a>
+                                <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
+                                <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
+                            %else:
+                              , ${_("%d Outdated") % c.outdated_cnt}
+                            %endif
+                           </td>
+                       </tr>
+
+                       <tr>
+                           <td></td>
+                           <td colspan="4">
                    % if c.at_version:
 <pre>
    Changed commits:
@@ -274,6 +286,9 b''
    % endif
 </pre>
                    % endif
+                           </td>
+                       </tr>
+                   </table>
                % else:
                    ${_('Pull request versions not available')}.
                % endif
@@ -423,7 +438,8 b''
                 ${cbdiffs.render_diffset(
                   c.diffset, use_comments=True,
                   collapse_when_files_over=30,
-                  disable_new_comments=not c.allowed_to_comment)}
+                  disable_new_comments=not c.allowed_to_comment,
+                  deleted_files_comments=c.deleted_files_comments)}
 
           </div>
               % endif
@@ -517,9 +533,25 b''
             PRDetails.init();
             ReviewersPanel.init();
 
+            showOutdated = function(self){
+                $('.comment-outdated').show();
+                $('.filediff-outdated').show();
+                $('.showOutdatedComments').hide();
+                $('.hideOutdatedComments').show();
+
+            };
+
+            hideOutdated = function(self){
+                $('.comment-outdated').hide();
+                $('.filediff-outdated').hide();
+                $('.hideOutdatedComments').hide();
+                $('.showOutdatedComments').show();
+            };
+
             $('#show-outdated-comments').on('click', function(e){
                 var button = $(this);
                 var outdated = $('.comment-outdated');
+
                 if (button.html() === "(Show)") {
                   button.html("(Hide)");
                   outdated.show();