%if rev >= 0: - ${'r%s:%s' % (rev,h.short_id(tip))} + ${'r%s:%s' % (rev,h.short_id(tip))} %else: ${_('No commits yet')} %endif diff --git a/rhodecode/templates/debug_style/collapsable-content.html b/rhodecode/templates/debug_style/collapsable-content.html --- a/rhodecode/templates/debug_style/collapsable-content.html +++ b/rhodecode/templates/debug_style/collapsable-content.html @@ -840,7 +840,8 @@ $('#edit-container').hide(); $('#preview-container').show(); - var url = pyroutes.url('changeset_comment_preview', {'repo_name': 'rhodecode-momentum'}); + var url = pyroutes.url('repo_commit_comment_preview', + {'repo_name': 'rhodecode-momentum', 'commit_id': '000000'}); ajaxPOST(url, post_data, function(o) { previewbox.html(o); diff --git a/rhodecode/templates/feed/atom_feed_entry.mako b/rhodecode/templates/feed/atom_feed_entry.mako --- a/rhodecode/templates/feed/atom_feed_entry.mako +++ b/rhodecode/templates/feed/atom_feed_entry.mako @@ -17,7 +17,7 @@ tag: ${tag}
% endfor -commit: ${h.show_id(commit)} +commit: ${h.show_id(commit)}
 ${h.urlify_commit_message(commit.message)}
 
diff --git a/rhodecode/templates/files/file_tree_detail.mako b/rhodecode/templates/files/file_tree_detail.mako
--- a/rhodecode/templates/files/file_tree_detail.mako
+++ b/rhodecode/templates/files/file_tree_detail.mako
@@ -23,7 +23,7 @@
   
     
       
-          ${h.show_id(c.commit)}
+          ${h.show_id(c.commit)}
       
 
       ${file_base.refs(c.commit)}
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -217,7 +217,9 @@
             var _renderer = possible_renderer || DEFAULT_RENDERER;
             var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
             $('#editor_preview').html(_gettext('Loading ...'));
-            var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
+            var url = pyroutes.url('repo_commit_comment_preview',
+                    {'repo_name': '${c.repo_name}',
+                     'commit_id': '${c.commit.raw_id}'});
 
             ajaxPOST(url, post_data, function(o){
                 $('#editor_preview').html(o);
diff --git a/rhodecode/templates/files/files_detail.mako b/rhodecode/templates/files/files_detail.mako
--- a/rhodecode/templates/files/files_detail.mako
+++ b/rhodecode/templates/files/files_detail.mako
@@ -21,7 +21,7 @@
   
   
     
-      ${h.show_id(c.commit)}
+      ${h.show_id(c.commit)}
       ${file_base.refs(c.commit)}
     
   
@@ -33,7 +33,7 @@
   
   
     
-      ${h.show_id(c.file_last_commit)}
+      ${h.show_id(c.file_last_commit)}
 
       ${file_base.refs(c.file_last_commit)}
     
diff --git a/rhodecode/templates/files/files_edit.mako b/rhodecode/templates/files/files_edit.mako
--- a/rhodecode/templates/files/files_edit.mako
+++ b/rhodecode/templates/files/files_edit.mako
@@ -47,7 +47,7 @@
         
             
                 
-                ${h.link_to("r%s:%s" % (c.file.commit.idx,h.short_id(c.file.commit.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.commit.raw_id))}
+                ${h.link_to("r%s:%s" % (c.file.commit.idx,h.short_id(c.file.commit.raw_id)),h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file.commit.raw_id))}
                 ${h.format_byte_size_binary(c.file.size)}
                 ${c.file.mimetype}
                 
@@ -177,8 +177,9 @@
             var _renderer = possible_renderer || DEFAULT_RENDERER;
             var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
             $('#editor_preview').html(_gettext('Loading ...'));
-            var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
-
+            var url = pyroutes.url('repo_commit_comment_preview',
+                    {'repo_name': '${c.repo_name}',
+                     'commit_id': '${c.commit.raw_id}'});
             ajaxPOST(url, post_data, function(o){
                 $('#editor_preview').html(o);
             })
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -86,7 +86,7 @@
                     

                     % if c.ancestor_commit:
                         ${_('Common ancestor')}:
-                        ${h.show_id(c.ancestor_commit)}
+                        ${h.show_id(c.ancestor_commit)}
                     % endif
                 
                 
@@ -513,7 +513,7 @@
                                 
                                 
                                     
-                                        
+                                        
                                             r${commit.revision}:${h.short_id(commit.raw_id)}
                                         
                                         ${h.hidden('revisions', commit.raw_id)}
diff --git a/rhodecode/templates/search/search_commit.mako b/rhodecode/templates/search/search_commit.mako
--- a/rhodecode/templates/search/search_commit.mako
+++ b/rhodecode/templates/search/search_commit.mako
@@ -31,7 +31,7 @@
                 
                 
                     ${h.link_to(h._shorten_commit_id(entry['commit_id']),
-                      h.url('changeset_home',repo_name=entry['repository'],revision=entry['commit_id']))}
+                      h.route_path('repo_commit',repo_name=entry['repository'],commit_id=entry['commit_id']))}
                 
                 
                     
diff --git a/rhodecode/templates/summary/summary_commits.mako b/rhodecode/templates/summary/summary_commits.mako
--- a/rhodecode/templates/summary/summary_commits.mako
+++ b/rhodecode/templates/summary/summary_commits.mako
@@ -19,11 +19,11 @@
                 
                     %if c.statuses.get(cs.raw_id)[2]:
                     
-                        
+                        
                     
                     %else:
-                    
-                        
+                    
+                        
                     
                     %endif
                 
@@ -33,13 +33,13 @@
         
         
             %if c.comments.get(cs.raw_id,[]):
-            
+            
                  ${len(c.comments[cs.raw_id])}
             
             %endif
         
         
-            ${h.show_id(cs)}
+            ${h.show_id(cs)}
         
 
         
diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -471,7 +471,7 @@ class TestCompareController(object):
         compare_page.contains_change_summary(1, 1, 0)
 
     @pytest.mark.xfail_backends("svn")
-    def test_compare_commits(self, backend):
+    def test_compare_commits(self, backend, xhr_header):
         commit0 = backend.repo.get_commit(commit_idx=0)
         commit1 = backend.repo.get_commit(commit_idx=1)
 
@@ -483,7 +483,7 @@ class TestCompareController(object):
                 target_ref_type="rev",
                 target_ref=commit1.raw_id,
                 merge='1',),
-            extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
+            extra_environ=xhr_header,)
 
         # outgoing commits between those commits
         compare_page = ComparePage(response)
diff --git a/rhodecode/tests/other/test_libs.py b/rhodecode/tests/other/test_libs.py
--- a/rhodecode/tests/other/test_libs.py
+++ b/rhodecode/tests/other/test_libs.py
@@ -397,7 +397,7 @@ def test_urlify_commits(sample, expected
 
     expected = _quick_url(expected)
 
-    with mock.patch('pylons.url', fake_url):
+    with mock.patch('rhodecode.lib.helpers.route_url', fake_url):
         from rhodecode.lib.helpers import urlify_commits
         assert urlify_commits(sample, 'repo_name') == expected
 
diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini
--- a/rhodecode/tests/rhodecode.ini
+++ b/rhodecode/tests/rhodecode.ini
@@ -1,7 +1,7 @@
 
 
 ################################################################################
-##                    RHODECODE ENTERPRISE CONFIGURATION                      ##
+##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 
@@ -64,7 +64,7 @@ asyncore_use_poll = true
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
-## run with gunicorn --log-config  --paste 
+## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
 
 #use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
@@ -153,8 +153,10 @@ asyncore_use_poll = true
 ## prefix middleware for RhodeCode.
 ## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
-## eg https://server.com/. Enable `filter-with =` option below as well.
-## optionally set prefix like: `prefix = /`
+## eg https://server.com/custom_prefix. Enable `filter-with =` option below as well.
+## And set your prefix like: `prefix = /custom_prefix`
+## be sure to also set beaker.session.cookie_path = /custom_prefix if you need
+## to make your cookies only work on prefix url
 [filter:proxy-prefix]
 use = egg:PasteDeploy#prefix
 prefix = /
@@ -238,27 +240,27 @@ rss_items_per_page = 10
 rss_include_diff = false
 
 ## gist URL alias, used to create nicer urls for gist. This should be an
-## url that does rewrites to _admin/gists/.
+## url that does rewrites to _admin/gists/{gistid}.
 ## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
-## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/
+## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/{gistid}
 gist_alias_url =
 
-## List of controllers (using glob pattern syntax) that AUTH TOKENS could be
+## List of views (using glob pattern syntax) that AUTH TOKENS could be
 ## used for access.
-## Adding ?auth_token =  to the url authenticates this request as if it
+## Adding ?auth_token=TOKEN_HASH to the url authenticates this request as if it
 ## came from the the logged in user who own this authentication token.
 ##
-## Syntax is :.
-## To enable access to raw_files put `FilesController:raw`.
-## To enable access to patches add `ChangesetController:changeset_patch`.
+## list of all views can be found under `_admin/permissions/auth_token_access`
 ## The list should be "," separated and on a single line.
 ##
-## Recommended controllers to enable:
-#    ChangesetController:changeset_patch,
-#    ChangesetController:changeset_raw,
-#    FilesController:raw,
-#    FilesController:archivefile,
-#    GistsController:*,
+## Most common views to enable:
+#    RepoCommitsView:repo_commit_download
+#    RepoCommitsView:repo_commit_patch
+#    RepoCommitsView:repo_commit_raw
+#    RepoFilesView:repo_files_diff
+#    RepoFilesView:repo_archivefile
+#    RepoFilesView:repo_file_raw
+#    GistView:*
 api_access_controllers_whitelist =
 
 ## default encoding used to convert from and to unicode
@@ -421,15 +423,15 @@ beaker.session.lock_dir = %(here)s/rc/da
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
-#beaker.session.encrypt_key = 
-#beaker.session.validate_key = 
+#beaker.session.encrypt_key = key_for_encryption
+#beaker.session.validate_key = validation_key
 
 ## sets session as invalid(also logging out user) if it haven not been
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
-## Path to use for the cookie.
-#beaker.session.cookie_path = /
+## Path to use for the cookie. Set to prefix if you use prefix middleware
+#beaker.session.cookie_path = /custom_prefix
 
 ## uncomment for https secure cookie
 beaker.session.secure = false
@@ -447,8 +449,8 @@ beaker.session.auto = false
 ## Full text search indexer is available in rhodecode-tools under
 ## `rhodecode-tools index` command
 
-# WHOOSH Backend, doesn't require additional services to run
-# it works good with few dozen repos
+## WHOOSH Backend, doesn't require additional services to run
+## it works good with few dozen repos
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
@@ -459,15 +461,21 @@ search.location = %(here)s/data/index
 ## in the system. It's also used by the chat system
 
 channelstream.enabled = false
-# location of channelstream server on the backend
+
+## server address for channelstream server on the backend
 channelstream.server = 127.0.0.1:9800
 ## location of the channelstream server from outside world
-## most likely this would be an http server special backend URL, that handles
-## websocket connections see nginx example for config
+## use ws:// for http or wss:// for https. This address needs to be handled
+## by external HTTP server such as Nginx or Apache
+## see nginx/apache configuration examples in our docs
 channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
 channelstream.secret = secret
 channelstream.history.location = %(here)s/channelstream_history
 
+## Internal application path that Javascript uses to connect into.
+## If you use proxy-prefix the prefix should be added before /_channelstream
+channelstream.proxy_path = /_channelstream
+
 
 ###################################
 ##       APPENLIGHT CONFIG       ##
@@ -541,19 +549,19 @@ set debug = false
 ##############
 debug_style = false
 
-#########################################################
-### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
-#########################################################
-#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
+###########################################
+###   MAIN RHODECODE DATABASE CONFIG    ###
+###########################################
+#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode_test
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode_test
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
+sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db?timeout=30
 
 # see sqlalchemy docs for other advanced settings
 
 ## print the sql statements to output
 sqlalchemy.db1.echo = false
-## recycle the connections after this ammount of seconds
+## recycle the connections after this amount of seconds
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
 
@@ -575,7 +583,7 @@ vcs.server = localhost:9901
 
 ## Web server connectivity protocol, responsible for web based VCS operatations
 ## Available protocols are:
-## `http` - using http-rpc backend
+## `http` - use http-rpc backend (default)
 vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
@@ -584,7 +592,7 @@ vcs.server.protocol = http
 vcs.scm_app_implementation = http
 
 ## Push/Pull operations hooks protocol, available options are:
-## `http` - using http-rpc backend
+## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
 
 vcs.server.log_level = debug
@@ -613,12 +621,19 @@ svn.proxy.generate_config = false
 svn.proxy.list_parent_path = true
 ## Set location and file name of generated config file.
 svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf
-## File system path to the directory containing the repositories served by
-## RhodeCode.
-svn.proxy.parent_path_root = /path/to/repo_store
-## Used as a prefix to the  block in the generated config file. In
-## most cases it should be set to `/`.
+## Used as a prefix to the `Location` block in the generated config file.
+## In most cases it should be set to `/`.
 svn.proxy.location_root = /
+## Command to reload the mod dav svn configuration on change.
+## Example: `/etc/init.d/apache2 reload`
+#svn.proxy.reload_cmd = /etc/init.d/apache2 reload
+## If the timeout expires before the reload command finishes, the command will
+## be killed. Setting it to zero means no timeout. Defaults to 10 seconds.
+#svn.proxy.reload_timeout = 10
+
+## Dummy marker to add new entries after.
+## Add any custom entries below. Please don't remove.
+custom.conf = 1
 
 
 ################################