diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -454,7 +454,7 @@ def action_parser(user_log, feed=False): if isinstance(rev, BaseChangeset): lbl = 'r%s:%s' % (rev.revision, rev.short_id) - _url = url('changeset_home', repo_name=repo_name, + _url = url('changeset_home', repo_name=repo_name, revision=rev.raw_id) title = tooltip(rev.message) else: diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py --- a/rhodecode/lib/utils2.py +++ b/rhodecode/lib/utils2.py @@ -309,7 +309,7 @@ def age(prevdate): for num, length in [(5, 60), (4, 60), (3, 24)]: # seconds, minutes, hours part = order[num] carry_part = order[num - 1] - + if deltas[part] < 0: deltas[part] += length deltas[carry_part] -= 1 @@ -323,13 +323,13 @@ def age(prevdate): deltas['day'] += 29 else: deltas['day'] += month_lengths[prevdate.month - 1] - + deltas['month'] -= 1 - + if deltas['month'] < 0: deltas['month'] += 12 deltas['year'] -= 1 - + # Format the result fmt_funcs = { 'year': lambda d: ungettext(u'%d year', '%d years', d) % d, @@ -339,21 +339,21 @@ def age(prevdate): 'minute': lambda d: ungettext(u'%d minute', '%d minutes', d) % d, 'second': lambda d: ungettext(u'%d second', '%d seconds', d) % d, } - + for i, part in enumerate(order): value = deltas[part] if value == 0: continue - + if i < 5: sub_part = order[i + 1] sub_value = deltas[sub_part] else: sub_value = 0 - + if sub_value == 0: return _(u'%s ago') % fmt_funcs[part](value) - + return _(u'%s and %s ago') % (fmt_funcs[part](value), fmt_funcs[sub_part](sub_value)) diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -94,7 +94,7 @@ class GitRepository(BaseRepository): if isinstance(cmd, basestring): cmd = [cmd] _str_cmd = True - + gitenv = os.environ gitenv['GIT_CONFIG_NOGLOBAL'] = '1' diff --git a/rhodecode/templates/admin/users/user_edit_my_account_form.html b/rhodecode/templates/admin/users/user_edit_my_account_form.html --- a/rhodecode/templates/admin/users/user_edit_my_account_form.html +++ b/rhodecode/templates/admin/users/user_edit_my_account_form.html @@ -82,4 +82,4 @@ ${h.end_form()} - \ No newline at end of file + diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py --- a/rhodecode/tests/functional/test_files.py +++ b/rhodecode/tests/functional/test_files.py @@ -200,8 +200,8 @@ class TestFilesController(TestController self.assertEqual(response.status, '200 OK') heads = [ - ('Pragma', 'no-cache'), - ('Cache-Control', 'no-cache'), + ('Pragma', 'no-cache'), + ('Cache-Control', 'no-cache'), ('Content-Disposition', 'attachment; filename=%s' % filename), ('Content-Type', '%s; charset=utf-8' % info[0]), ] @@ -213,7 +213,7 @@ class TestFilesController(TestController for arch_ext in ['tar', 'rar', 'x', '..ax', '.zipz']: fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext - response = self.app.get(url(controller='files', + response = self.app.get(url(controller='files', action='archivefile', repo_name=HG_REPO, fname=fname))