Mercurial > kallithea
changeset 2367:86aa4f1f130b beta
white space cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 01 Jun 2012 17:59:57 +0200 |
| parents | 1b12e71b636f |
| children | 5143b8df576c |
| files | rhodecode/lib/helpers.py rhodecode/lib/utils2.py rhodecode/lib/vcs/backends/git/repository.py rhodecode/templates/admin/users/user_edit_my_account_form.html rhodecode/tests/functional/test_files.py |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py Fri Jun 01 17:59:31 2012 +0200 +++ b/rhodecode/lib/helpers.py Fri Jun 01 17:59:57 2012 +0200 @@ -454,7 +454,7 @@ 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:
--- a/rhodecode/lib/utils2.py Fri Jun 01 17:59:31 2012 +0200 +++ b/rhodecode/lib/utils2.py Fri Jun 01 17:59:57 2012 +0200 @@ -309,7 +309,7 @@ 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 @@ 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 @@ '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))
--- a/rhodecode/lib/vcs/backends/git/repository.py Fri Jun 01 17:59:31 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/repository.py Fri Jun 01 17:59:57 2012 +0200 @@ -94,7 +94,7 @@ if isinstance(cmd, basestring): cmd = [cmd] _str_cmd = True - + gitenv = os.environ gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
--- a/rhodecode/templates/admin/users/user_edit_my_account_form.html Fri Jun 01 17:59:31 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account_form.html Fri Jun 01 17:59:57 2012 +0200 @@ -82,4 +82,4 @@ </div> </div> ${h.end_form()} - </div> \ No newline at end of file + </div>
--- a/rhodecode/tests/functional/test_files.py Fri Jun 01 17:59:31 2012 +0200 +++ b/rhodecode/tests/functional/test_files.py Fri Jun 01 17:59:57 2012 +0200 @@ -200,8 +200,8 @@ 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 @@ 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))