diff --git a/swh/web/ui/backend.py b/swh/web/ui/backend.py --- a/swh/web/ui/backend.py +++ b/swh/web/ui/backend.py @@ -185,7 +185,7 @@ return [] -def revision_log(sha1_git_bin, limit=100): +def revision_log(sha1_git_bin, limit): """Return information about the revision with sha1 sha1_git_bin. Args: @@ -202,7 +202,7 @@ return main.storage().revision_log([sha1_git_bin], limit) -def revision_log_by(origin_id, branch_name, ts, limit=100): +def revision_log_by(origin_id, branch_name, ts, limit): """Return information about the revision matching the timestamp ts, from origin origin_id, in branch branch_name. @@ -215,12 +215,10 @@ Information for the revision matching the criterions. """ - rev_list = main.storage().revision_log_by(origin_id, - branch_name, - ts) - if rev_list is None: - return None - return rev_list[:limit] + return main.storage().revision_log_by(origin_id, + branch_name, + ts, + limit=limit) def stat_counters(): diff --git a/swh/web/ui/converters.py b/swh/web/ui/converters.py --- a/swh/web/ui/converters.py +++ b/swh/web/ui/converters.py @@ -197,8 +197,8 @@ """Convert swh content to serializable content dictionary. """ - if content and 'ctime' in content: - del content['ctime'] + if content: + content = {k: v for k, v in content.items() if k not in ['ctime']} return from_swh(content, hashess={'sha1', 'sha1_git', 'sha256'}, bytess={}, diff --git a/swh/web/ui/service.py b/swh/web/ui/service.py --- a/swh/web/ui/service.py +++ b/swh/web/ui/service.py @@ -271,7 +271,7 @@ return converters.from_revision(res) -def lookup_revision_log(rev_sha1_git, limit=25): +def lookup_revision_log(rev_sha1_git, limit): """Return information about the revision with sha1 revision_sha1_git. Args: @@ -294,7 +294,7 @@ return map(converters.from_revision, revision_entries) -def lookup_revision_log_by(origin_id, branch_name, timestamp, limit=25): +def lookup_revision_log_by(origin_id, branch_name, timestamp, limit): """Return information about the revision with sha1 revision_sha1_git. Args: diff --git a/swh/web/ui/tests/test_backend.py b/swh/web/ui/tests/test_backend.py --- a/swh/web/ui/tests/test_backend.py +++ b/swh/web/ui/tests/test_backend.py @@ -532,12 +532,12 @@ self.storage.revision_log = MagicMock(return_value=stub_revision_log) # when - actual_revision = backend.revision_log(sha1_bin) + actual_revision = backend.revision_log(sha1_bin, limit=1) # then self.assertEqual(list(actual_revision), stub_revision_log) - self.storage.revision_log.assert_called_with([sha1_bin], 100) + self.storage.revision_log.assert_called_with([sha1_bin], 1) @istest def revision_log_by(self): @@ -571,11 +571,12 @@ return_value=stub_revision_log) # when - actual_log = backend.revision_log_by(1, 'refs/heads/master', None) + actual_log = backend.revision_log_by(1, 'refs/heads/master', + None, limit=1) # then self.assertEqual(actual_log, stub_revision_log) - self.storage.revision_log.assert_called_with([sha1_bin], 100) + self.storage.revision_log.assert_called_with([sha1_bin], 1) @istest def revision_log_by_norev(self): @@ -586,11 +587,12 @@ self.storage.revision_log_by = MagicMock(return_value=None) # when - actual_log = backend.revision_log_by(1, 'refs/heads/master', None) + actual_log = backend.revision_log_by(1, 'refs/heads/master', + None, limit=1) # then self.assertEqual(actual_log, None) - self.storage.revision_log.assert_called_with([sha1_bin], 100) + self.storage.revision_log.assert_called_with([sha1_bin], 1) @istest def stat_counters(self): diff --git a/swh/web/ui/tests/test_service.py b/swh/web/ui/tests/test_service.py --- a/swh/web/ui/tests/test_service.py +++ b/swh/web/ui/tests/test_service.py @@ -1186,7 +1186,8 @@ # when actual_revision = service.lookup_revision_log( - 'abcdbe353ed3480476f032475e7c233eff7371d5') + 'abcdbe353ed3480476f032475e7c233eff7371d5', + limit=25) # then self.assertEqual(list(actual_revision), [self.SAMPLE_REVISION]) diff --git a/swh/web/ui/views/api.py b/swh/web/ui/views/api.py --- a/swh/web/ui/views/api.py +++ b/swh/web/ui/views/api.py @@ -5,7 +5,7 @@ from types import GeneratorType -from flask import request, url_for, Response, redirect +from flask import request, url_for, Response from swh.web.ui import service, utils from swh.web.ui.exc import NotFoundExc