# HG changeset patch # User Mads Kiilerich # Date 2014-09-24 14:24:40 # Node ID b696fd411a0b56035648f57205ccdd4cd0dec3ab # Parent a9a1560dad79e40a865b3bfdcab2eab04899f81c files: file path is mandatory in URLs for 2-way diff It would crash with an internal error when trying to process an empty file name. Processing of other non-existing file names is still weird. diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -799,7 +799,7 @@ def make_map(config): controller='files', action='diff', revision='tip', f_path='', conditions=dict(function=check_repo)) - rmap.connect('files_diff_2way_home', '/{repo_name:.*?}/diff-2way/{f_path:.*}', + rmap.connect('files_diff_2way_home', '/{repo_name:.*?}/diff-2way/{f_path:.+}', controller='files', action='diff_2way', revision='tip', f_path='', conditions=dict(function=check_repo))