files: use ref names in the url, and make usage of default landing refs.

- fixes  #5601
- cleanup file edit/delete/add to use common breadcrumbs functions
- make the urls with ref names persistent in case we have the landing ref selected
- in most cases we only want to show refs instead of full commit-id, this is how other types of tools work anyway

rhodecode/apps/repository/tests/test_repo_files.py

@@ -181,7 +181,7 b' class TestFilesViews(object):'
         landing_rev = backend.repo.landing_ref_name
         files_url = route_path('repo_files:default_path',
                                repo_name=backend.repo_name,
-                               commit_id=landing_rev)
+                               commit_id=landing_rev, params={'at': landing_rev})
 
         assert landing_rev != 'tip'
         response.mustcontain(

rhodecode/apps/repository/views/repo_files.py

@@ -589,6 +589,20 b' class RepoFilesView(RepoAppView):'
         raise HTTPFound(compare_url)
 
     @LoginRequired()
+    @view_config(
+        route_name='repo_files:default_commit', request_method='GET',
+        renderer=None)
+    def repo_files_default(self):
+        c = self.load_default_context()
+
+        landing_url = h.route_path(
+            'repo_files', repo_name=c.repo_name,
+            commit_id=c.rhodecode_db_repo.landing_ref_name, f_path='',
+            _query={'at': c.rhodecode_db_repo.landing_ref_name})
+
+        raise HTTPFound(landing_url)
+
+    @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
@@ -598,9 +612,6 b' class RepoFilesView(RepoAppView):'
         route_name='repo_files:default_path', request_method='GET',
         renderer=None)
     @view_config(
-        route_name='repo_files:default_commit', request_method='GET',
-        renderer=None)
-    @view_config(
         route_name='repo_files:rendered', request_method='GET',
         renderer=None)
     @view_config(

rhodecode/lib/helpers.py

@@ -256,11 +256,17 b' tooltip = _ToolTip()'
 files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy file path"></i>'
 
 
-def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
+def files_breadcrumbs(repo_name, commit_id, file_path, landing_ref_name=None, at_ref=None,
+                      limit_items=False, linkify_last_item=False, hide_last_item=False, copy_path_icon=True):
     if isinstance(file_path, str):
         file_path = safe_unicode(file_path)
 
-    route_qry = {'at': at_ref} if at_ref else None
+    if at_ref:
+        route_qry = {'at': at_ref}
+        default_commit_id = at_ref or landing_ref_name or commit_id
+    else:
+        route_qry = None
+        default_commit_id = commit_id
 
     # first segment is a `..` link to repo files
     root_name = literal(u'<i class="icon-home"></i>')
@@ -270,7 +276,7 b' def files_breadcrumbs(repo_name, commit_'
             route_path(
                 'repo_files',
                 repo_name=repo_name,
-                commit_id=commit_id,
+                commit_id=default_commit_id,
                 f_path='',
                 _query=route_qry),
         )]
@@ -284,6 +290,10 b' def files_breadcrumbs(repo_name, commit_'
 
         last_item = cnt == last_cnt
 
+        if last_item and hide_last_item:
+            # iterate over and hide last element
+            continue
+
         if last_item and linkify_last_item is False:
             # plain version
             url_segments.append(segment_html)
@@ -294,7 +304,7 b' def files_breadcrumbs(repo_name, commit_'
                     route_path(
                         'repo_files',
                         repo_name=repo_name,
-                        commit_id=commit_id,
+                        commit_id=default_commit_id,
                         f_path='/'.join(path_segments[:cnt + 1]),
                         _query=route_qry),
                 ))
@@ -304,7 +314,11 b' def files_breadcrumbs(repo_name, commit_'
         url_segments = limited_url_segments
 
     full_path = file_path
+    if copy_path_icon:
     icon = files_icon.format(escape(full_path))
+    else:
+        icon = ''
+
     if file_path == '':
         return root_name
     else:

rhodecode/templates/base/base.mako

@@ -365,7 +365,7 b''
       <ul id="context-pages" class="navigation horizontal-list">
         <li class="${h.is_active('summary', active)}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
         <li class="${h.is_active('commits', active)}"><a class="menulink" href="${h.route_path('repo_commits', repo_name=c.repo_name)}"><div class="menulabel">${_('Commits')}</div></a></li>
-        <li class="${h.is_active('files', active)}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_ref_name, f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
+        <li class="${h.is_active('files', active)}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_ref_name, f_path='', _query={'at':c.rhodecode_db_repo.landing_ref_name})}"><div class="menulabel">${_('Files')}</div></a></li>
         <li class="${h.is_active('compare', active)}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li>
 
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"

rhodecode/templates/files/files_add.mako

@@ -36,8 +36,7 b''
             <ul>
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.commit.raw_id, c.f_path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=False, linkify_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_browser_tree.mako

@@ -1,10 +1,13 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <%
-    if request.GET.get('at'):
-        query={'at': request.GET.get('at')}
+    at_ref = request.GET.get('at')
+    if at_ref:
+        query={'at': at_ref}
+        default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name
     else:
         query=None
+        default_commit_id = c.commit.raw_id
 %>
 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
     <table class="code-browser rctable repo_summary">
@@ -21,7 +24,7 b''
         <tbody id="tbody">
         <tr>
             <td colspan="5">
-                ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'), limit_items=True)}
+                ${h.files_breadcrumbs(c.repo_name, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True)}
             </td>
         </tr>
 
@@ -41,7 +44,7 b''
                 % endif
               </span>
             % else:
-              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=h.safe_unicode(node.path), _query=query)}">
+              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=default_commit_id,f_path=h.safe_unicode(node.path), _query=query)}">
                 <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name}
               </a>
             % endif

rhodecode/templates/files/files_delete.mako

@@ -35,8 +35,7 b''
         <div class="path-items">
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_edit.mako

@@ -36,8 +36,7 b''
             <ul>
             <li class="breadcrumb-path">
                 <div>
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
-                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
+                    ${h.files_breadcrumbs(c.repo_name, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
                 </div>
             </li>
             <li class="location-path">

rhodecode/templates/files/files_source.mako

@@ -1,5 +1,15 b''
 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
 
+<%
+    at_ref = request.GET.get('at')
+    if at_ref:
+        query={'at': at_ref}
+        default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name
+    else:
+        query=None
+        default_commit_id = c.commit.raw_id
+%>
+
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
@@ -27,13 +37,13 b''
                   ## binary files are delete only
                   % if c.file.is_binary:
                     ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
-                    ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")}
+                    ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query),class_="btn btn-danger")}
                   % else:
-                    <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                    <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Edit on branch: ')}<code>${c.branch_name}</code>
                     </a>
 
-                    <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                    <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Delete')}
                     </a>
                   % endif
@@ -88,7 +98,7 b''
 
       <div class="path clear-fix">
           <div class="pull-left">
-            ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
+            ${h.files_breadcrumbs(c.repo_name, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'))}
           </div>
 
           <div class="pull-right stats">

rhodecode/templates/search/search_path.mako

@@ -27,7 +27,7 b''
                 <td class="td-componentname">
                     <i class="icon-file"></i>
                     ${h.link_to(h.literal(entry['f_path']),
-                        h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))}
+                        h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
                 </td>
                 <td>
                     %if entry.get('size'):

rhodecode/tests/lib/test_helpers.py

@@ -82,9 +82,8 b' def test_urlify_text(url, expected_url):'
      'bX"X'),
 
 ], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote'])
-def test_files_breadcrumbs_xss(
-        repo_name, commit_id, path, app, expected_result):
-    result = helpers.files_breadcrumbs(repo_name, commit_id, path)
+def test_files_breadcrumbs_xss(repo_name, commit_id, path, app, expected_result):
+    result = helpers.files_breadcrumbs(repo_name, 'hg', commit_id, path)
     # Expect it to encode all path fragments properly. This is important
     # because it returns an instance of `literal`.
     if path != '':