diff --git a/swh/storage/api/client.py b/swh/storage/api/client.py
index f8f9ad207..a2dda57b5 100644
--- a/swh/storage/api/client.py
+++ b/swh/storage/api/client.py
@@ -1,178 +1,184 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import pickle
 import requests
 
 from requests.exceptions import ConnectionError
 
 from ..exc import StorageAPIError
 from ..api.common import (decode_response,
                           encode_data_client as encode_data)
 
 
 class RemoteStorage():
     """Proxy to a remote storage API"""
     def __init__(self, base_url):
         self.base_url = base_url
         self.session = requests.Session()
 
     def url(self, endpoint):
         return '%s%s' % (self.base_url, endpoint)
 
     def post(self, endpoint, data):
         try:
             response = self.session.post(
                 self.url(endpoint),
                 data=encode_data(data),
                 headers={'content-type': 'application/x-msgpack'},
             )
         except ConnectionError as e:
             print(str(e))
             raise StorageAPIError(e)
 
         # XXX: this breaks language-independence and should be
         # replaced by proper unserialization
         if response.status_code == 400:
             raise pickle.loads(decode_response(response))
 
         return decode_response(response)
 
     def get(self, endpoint, data=None):
         try:
             response = self.session.get(
                 self.url(endpoint),
                 params=data,
             )
         except ConnectionError as e:
             print(str(e))
             raise StorageAPIError(e)
 
         if response.status_code == 404:
             return None
 
         # XXX: this breaks language-independence and should be
         # replaced by proper unserialization
         if response.status_code == 400:
             raise pickle.loads(decode_response(response))
 
         else:
             return decode_response(response)
 
     def content_add(self, content):
         return self.post('content/add', {'content': content})
 
     def content_missing(self, content, key_hash='sha1'):
         return self.post('content/missing', {'content': content,
                                              'key_hash': key_hash})
 
     def content_missing_per_sha1(self, contents):
         return self.post('content/missing/sha1', {'contents': contents})
 
     def content_get(self, content):
         return self.post('content/data', {'content': content})
 
     def content_find(self, content):
         return self.post('content/present', {'content': content})
 
     def content_find_occurrence(self, content):
         return self.post('content/occurrence', {'content': content})
 
     def directory_add(self, directories):
         return self.post('directory/add', {'directories': directories})
 
     def directory_missing(self, directories):
         return self.post('directory/missing', {'directories': directories})
 
     def directory_get(self, directories):
         return self.post('directory', dict(directories=directories))
 
     def directory_ls(self, directory, recursive=False):
         return self.get('directory/ls', {'directory': directory,
                                          'recursive': recursive})
 
     def revision_get(self, revisions):
         return self.post('revision', {'revisions': revisions})
 
     def revision_get_by(self, origin_id, branch_name, timestamp, limit=None):
         return self.post('revision/by', dict(origin_id=origin_id,
                                              branch_name=branch_name,
                                              timestamp=timestamp,
                                              limit=limit))
 
     def revision_log(self, revisions, limit=None):
         return self.post('revision/log', {'revisions': revisions,
                                           'limit': limit})
 
+    def revision_log_by(self, origin_id, branch_name, timestamp, limit=None):
+        return self.post('revision/logby', {'origin_id': origin_id,
+                                            'branch_name': branch_name,
+                                            'timestamp': timestamp,
+                                            'limit': limit})
+
     def revision_shortlog(self, revisions, limit=None):
         return self.post('revision/shortlog', {'revisions': revisions,
                                                'limit': limit})
 
     def revision_add(self, revisions):
         return self.post('revision/add', {'revisions': revisions})
 
     def revision_missing(self, revisions):
         return self.post('revision/missing', {'revisions': revisions})
 
     def release_add(self, releases):
         return self.post('release/add', {'releases': releases})
 
     def release_get(self, releases):
         return self.post('release', {'releases': releases})
 
     def release_get_by(self, origin_id, limit=None):
         return self.post('release/by', dict(origin_id=origin_id,
                                             limit=limit))
 
     def release_missing(self, releases):
         return self.post('release/missing', {'releases': releases})
 
     def object_find_by_sha1_git(self, ids):
         return self.post('object/find_by_sha1_git', {'ids': ids})
 
     def occurrence_get(self, origin_id):
         return self.post('occurrence', {'origin_id': origin_id})
 
     def occurrence_add(self, occurrences):
         return self.post('occurrence/add', {'occurrences': occurrences})
 
     def origin_get(self, origin):
         return self.post('origin/get', {'origin': origin})
 
     def origin_add_one(self, origin):
         return self.post('origin/add', {'origin': origin})
 
     def person_get(self, person):
         return self.post('person', {'person': person})
 
     def fetch_history_start(self, origin_id):
         return self.post('fetch_history/start', {'origin_id': origin_id})
 
     def fetch_history_end(self, fetch_history_id, data):
         return self.post('fetch_history/end',
                          {'fetch_history_id': fetch_history_id,
                           'data': data})
 
     def fetch_history_get(self, fetch_history_id):
         return self.get('fetch_history', {'id': fetch_history_id})
 
     def entity_add(self, entities):
         return self.post('entity/add', {'entities': entities})
 
     def entity_get(self, uuid):
         return self.post('entity/get', {'uuid': uuid})
 
     def entity_get_one(self, uuid):
         return self.get('entity', {'uuid': uuid})
 
     def entity_get_from_lister_metadata(self, entities):
         return self.post('entity/from_lister_metadata', {'entities': entities})
 
     def stat_counters(self):
         return self.get('stat/counters')
 
     def directory_entry_get_by_path(self, directory, paths):
         return self.post('directory/path', dict(directory=directory,
                                                 paths=paths))
diff --git a/swh/storage/api/server.py b/swh/storage/api/server.py
index 9ae59d26c..cc96b9624 100644
--- a/swh/storage/api/server.py
+++ b/swh/storage/api/server.py
@@ -1,255 +1,260 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import json
 import logging
 import click
 
 from flask import Flask, g, request
 
 from swh.core import config
 from swh.storage import Storage
 from swh.storage.api.common import (BytesRequest, decode_request,
                                     error_handler,
                                     encode_data_server as encode_data)
 
 DEFAULT_CONFIG = {
     'db': ('str', 'dbname=softwareheritage-dev'),
     'storage_base': ('str', '/tmp/swh-storage/test'),
 }
 
 
 app = Flask(__name__)
 app.request_class = BytesRequest
 
 
 @app.errorhandler(Exception)
 def my_error_handler(exception):
     return error_handler(exception, encode_data)
 
 
 @app.before_request
 def before_request():
     g.storage = Storage(app.config['db'], app.config['storage_base'])
 
 
 @app.route('/')
 def index():
     return 'SWH Storage API server'
 
 
 @app.route('/content/missing', methods=['POST'])
 def content_missing():
     return encode_data(g.storage.content_missing(**decode_request(request)))
 
 
 @app.route('/content/missing/sha1', methods=['POST'])
 def content_missing_per_sha1():
     return encode_data(g.storage.content_missing_per_sha1(
         **decode_request(request)))
 
 
 @app.route('/content/present', methods=['POST'])
 def content_find():
     return encode_data(g.storage.content_find(**decode_request(request)))
 
 
 @app.route('/content/occurrence', methods=['POST'])
 def content_find_occurrence():
     res = g.storage.content_find_occurrence(**decode_request(request))
     return encode_data(res)
 
 
 @app.route('/content/add', methods=['POST'])
 def content_add():
     return encode_data(g.storage.content_add(**decode_request(request)))
 
 
 @app.route('/content/data', methods=['POST'])
 def content_get():
     return encode_data(g.storage.content_get(**decode_request(request)))
 
 
 @app.route('/directory', methods=['POST'])
 def directory_get():
     return encode_data(g.storage.directory_get(**decode_request(request)))
 
 
 @app.route('/directory/missing', methods=['POST'])
 def directory_missing():
     return encode_data(g.storage.directory_missing(**decode_request(request)))
 
 
 @app.route('/directory/add', methods=['POST'])
 def directory_add():
     return encode_data(g.storage.directory_add(**decode_request(request)))
 
 
 @app.route('/directory/path', methods=['POST'])
 def directory_entry_get_by_path():
     return encode_data(g.storage.directory_entry_get_by_path(
         **decode_request(request)))
 
 
 @app.route('/directory/ls', methods=['GET'])
 def directory_ls():
     dir = request.args['directory'].encode('utf-8', 'surrogateescape')
     rec = json.loads(request.args.get('recursive', 'False').lower())
     return encode_data(g.storage.directory_ls(dir, recursive=rec))
 
 
 @app.route('/revision/add', methods=['POST'])
 def revision_add():
     return encode_data(g.storage.revision_add(**decode_request(request)))
 
 
 @app.route('/revision', methods=['POST'])
 def revision_get():
     return encode_data(g.storage.revision_get(**decode_request(request)))
 
 
 @app.route('/revision/by', methods=['POST'])
 def revision_get_by():
     return encode_data(g.storage.revision_get_by(**decode_request(request)))
 
 
 @app.route('/revision/log', methods=['POST'])
 def revision_log():
     return encode_data(g.storage.revision_log(**decode_request(request)))
 
 
+@app.route('/revision/logby', methods=['POST'])
+def revision_log_by():
+    return encode_data(g.storage.revision_log_by(**decode_request(request)))
+
+
 @app.route('/revision/shortlog', methods=['POST'])
 def revision_shortlog():
     return encode_data(g.storage.revision_shortlog(**decode_request(request)))
 
 
 @app.route('/revision/missing', methods=['POST'])
 def revision_missing():
     return encode_data(g.storage.revision_missing(**decode_request(request)))
 
 
 @app.route('/release/add', methods=['POST'])
 def release_add():
     return encode_data(g.storage.release_add(**decode_request(request)))
 
 
 @app.route('/release', methods=['POST'])
 def release_get():
     return encode_data(g.storage.release_get(**decode_request(request)))
 
 
 @app.route('/release/by', methods=['POST'])
 def release_get_by():
     return encode_data(g.storage.release_get_by(**decode_request(request)))
 
 
 @app.route('/release/missing', methods=['POST'])
 def release_missing():
     return encode_data(g.storage.release_missing(**decode_request(request)))
 
 
 @app.route('/object/find_by_sha1_git', methods=['POST'])
 def object_find_by_sha1_git():
     return encode_data(g.storage.object_find_by_sha1_git(
         **decode_request(request)))
 
 
 @app.route('/occurrence', methods=['POST'])
 def occurrence_get():
     return encode_data(g.storage.occurrence_get(**decode_request(request)))
 
 
 @app.route('/occurrence/add', methods=['POST'])
 def occurrence_add():
     return encode_data(g.storage.occurrence_add(**decode_request(request)))
 
 
 @app.route('/origin/get', methods=['POST'])
 def origin_get():
     return encode_data(g.storage.origin_get(**decode_request(request)))
 
 
 @app.route('/origin/add', methods=['POST'])
 def origin_add_one():
     return encode_data(g.storage.origin_add_one(**decode_request(request)))
 
 
 @app.route('/person', methods=['POST'])
 def person_get():
     return encode_data(g.storage.person_get(**decode_request(request)))
 
 
 @app.route('/fetch_history', methods=['GET'])
 def fetch_history_get():
     return encode_data(g.storage.fetch_history_get(request.args['id']))
 
 
 @app.route('/fetch_history/start', methods=['POST'])
 def fetch_history_start():
     return encode_data(
         g.storage.fetch_history_start(**decode_request(request)))
 
 
 @app.route('/fetch_history/end', methods=['POST'])
 def fetch_history_end():
     return encode_data(
         g.storage.fetch_history_end(**decode_request(request)))
 
 
 @app.route('/entity/add', methods=['POST'])
 def entity_add():
     return encode_data(
         g.storage.entity_add(**decode_request(request)))
 
 
 @app.route('/entity/get', methods=['POST'])
 def entity_get():
     return encode_data(
         g.storage.entity_get(**decode_request(request)))
 
 
 @app.route('/entity', methods=['GET'])
 def entity_get_one():
     return encode_data(g.storage.entity_get_one(request.args['uuid']))
 
 
 @app.route('/entity/from_lister_metadata', methods=['POST'])
 def entity_from_lister_metadata():
     return encode_data(
         g.storage.entity_get_from_lister_metadata(**decode_request(request)))
 
 
 @app.route('/stat/counters', methods=['GET'])
 def stat_counters():
     return encode_data(g.storage.stat_counters())
 
 
 def run_from_webserver(environ, start_response):
     """Run the WSGI app from the webserver, loading the configuration."""
 
     config_path = '/etc/softwareheritage/storage/storage.ini'
 
     app.config.update(config.read(config_path, DEFAULT_CONFIG))
 
     handler = logging.StreamHandler()
     app.logger.addHandler(handler)
 
     return app(environ, start_response)
 
 
 @click.command()
 @click.argument('config-path', required=1)
 @click.option('--host', default='0.0.0.0', help="Host to run the server")
 @click.option('--port', default=5000, type=click.INT,
               help="Binding port of the server")
 @click.option('--debug/--nodebug', default=True,
               help="Indicates if the server should run in debug mode")
 def launch(config_path, host, port, debug):
     app.config.update(config.read(config_path, DEFAULT_CONFIG))
     app.run(host, port=int(port), debug=bool(debug))
 
 
 if __name__ == '__main__':
     launch()
diff --git a/swh/storage/storage.py b/swh/storage/storage.py
index c345539d1..7dffed403 100644
--- a/swh/storage/storage.py
+++ b/swh/storage/storage.py
@@ -1,1080 +1,1096 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 from collections import defaultdict
 import datetime
 import functools
 import itertools
 import dateutil.parser
 import psycopg2
 
 from . import converters
 from .db import Db
 from .objstorage import PathSlicingObjStorage
 from .exc import ObjNotFoundError, StorageDBError
 
 from swh.core.hashutil import ALGORITHMS
 
 # Max block size of contents to return
 BULK_BLOCK_CONTENT_LEN_MAX = 10000
 
 
 def db_transaction(meth):
     """decorator to execute Storage methods within DB transactions
 
     The decorated method must accept a `cur` keyword argument
     """
     @functools.wraps(meth)
     def _meth(self, *args, **kwargs):
         with self.db.transaction() as cur:
             return meth(self, *args, cur=cur, **kwargs)
     return _meth
 
 
 def db_transaction_generator(meth):
     """decorator to execute Storage methods within DB transactions, while
     returning a generator
 
     The decorated method must accept a `cur` keyword argument
 
     """
     @functools.wraps(meth)
     def _meth(self, *args, **kwargs):
         with self.db.transaction() as cur:
             yield from meth(self, *args, cur=cur, **kwargs)
     return _meth
 
 
 class Storage():
     """SWH storage proxy, encompassing DB and object storage
 
     """
 
     def __init__(self, db_conn, obj_root):
         """
         Args:
             db_conn: either a libpq connection string, or a psycopg2 connection
             obj_root: path to the root of the object storage
 
         """
         try:
             if isinstance(db_conn, psycopg2.extensions.connection):
                 self.db = Db(db_conn)
             else:
                 self.db = Db.connect(db_conn)
         except psycopg2.OperationalError as e:
             raise StorageDBError(e)
 
         # TODO this needs to be configured
         self.objstorage = PathSlicingObjStorage(obj_root,
                                                 slicing='0:2/2:4/4:6')
 
     def content_add(self, content):
         """Add content blobs to the storage
 
         Note: in case of DB errors, objects might have already been added to
         the object storage and will not be removed. Since addition to the
         object storage is idempotent, that should not be a problem.
 
         Args:
             content: iterable of dictionaries representing individual pieces of
                 content to add. Each dictionary has the following keys:
                 - data (bytes): the actual content
                 - length (int): content length (default: -1)
                 - one key for each checksum algorithm in
                   swh.core.hashutil.ALGORITHMS, mapped to the corresponding
                   checksum
                 - status (str): one of visible, hidden, absent
                 - reason (str): if status = absent, the reason why
                 - origin (int): if status = absent, the origin we saw the
                   content in
 
         """
         db = self.db
 
         content_by_status = defaultdict(list)
         for d in content:
             if 'status' not in d:
                 d['status'] = 'visible'
             if 'length' not in d:
                 d['length'] = -1
             content_by_status[d['status']].append(d)
 
         content_with_data = content_by_status['visible']
         content_without_data = content_by_status['absent']
 
         missing_content = set(self.content_missing(content_with_data))
         missing_skipped = set(
             sha1_git for sha1, sha1_git, sha256
             in self.skipped_content_missing(content_without_data))
 
         with db.transaction() as cur:
             if missing_content:
                 # create temporary table for metadata injection
                 db.mktemp('content', cur)
 
                 def add_to_objstorage(cont):
                     self.objstorage.add(cont['data'],
                                         obj_id=cont['sha1'])
 
                 content_filtered = (cont for cont in content_with_data
                                     if cont['sha1'] in missing_content)
 
                 db.copy_to(content_filtered, 'tmp_content',
                            ['sha1', 'sha1_git', 'sha256', 'length', 'status'],
                            cur, item_cb=add_to_objstorage)
 
                 # move metadata in place
                 db.content_add_from_temp(cur)
 
             if missing_skipped:
                 missing_filtered = (cont for cont in content_without_data
                                     if cont['sha1_git'] in missing_skipped)
                 db.mktemp('skipped_content', cur)
                 db.copy_to(missing_filtered, 'tmp_skipped_content',
                            ['sha1', 'sha1_git', 'sha256', 'length',
                             'reason', 'status', 'origin'], cur)
 
                 # move metadata in place
                 db.skipped_content_add_from_temp(cur)
 
     def content_get(self, content):
         """Retrieve in bulk contents and their data.
 
         Args:
             content: iterables of sha1
 
         Returns:
             Generates streams of contents as dict with their raw data:
             - sha1: sha1's content
             - data: bytes data of the content
 
         Raises:
             ValueError in case of too much contents are required.
             cf. BULK_BLOCK_CONTENT_LEN_MAX
 
         """
         # FIXME: Improve on server module to slice the result
         if len(content) > BULK_BLOCK_CONTENT_LEN_MAX:
             raise ValueError(
                 "Send at maximum %s contents." % BULK_BLOCK_CONTENT_LEN_MAX)
 
         for obj_id in content:
             try:
                 data = self.objstorage.get(obj_id)
             except ObjNotFoundError:
                 yield None
                 continue
 
             yield {'sha1': obj_id, 'data': data}
 
     @db_transaction_generator
     def content_missing(self, content, key_hash='sha1', cur=None):
         """List content missing from storage
 
         Args:
             content: iterable of dictionaries containing one key for each
                 checksum algorithm in swh.core.hashutil.ALGORITHMS, mapped to
                 the corresponding checksum, and a length key mapped to the
                 content length.
             key_hash: the name of the hash used as key (default: 'sha1')
 
         Returns:
             an iterable of `key_hash`es missing from the storage
 
         Raises:
             TODO: an exception when we get a hash collision.
 
         """
         db = self.db
 
         keys = ['sha1', 'sha1_git', 'sha256']
 
         if key_hash not in keys:
             raise ValueError("key_hash should be one of %s" % keys)
 
         key_hash_idx = keys.index(key_hash)
 
         # Create temporary table for metadata injection
         db.mktemp('content', cur)
 
         db.copy_to(content, 'tmp_content', keys + ['length'], cur)
 
         for obj in db.content_missing_from_temp(cur):
             yield obj[key_hash_idx]
 
     @db_transaction_generator
     def content_missing_per_sha1(self, contents, cur=None):
         """List content missing from storage based only on sha1.
 
         Args:
             contents: Iterable of sha1 to check for absence.
 
         Returns:
             an iterable of `sha1`s missing from the storage.
 
         Raises:
             TODO: an exception when we get a hash collision.
 
         """
         db = self.db
 
         db.store_tmp_bytea(contents, cur)
         for obj in db.content_missing_per_sha1_from_temp(cur):
             yield obj[0]
 
     @db_transaction_generator
     def skipped_content_missing(self, content, cur=None):
         """List skipped_content missing from storage
 
         Args:
             content: iterable of dictionaries containing the data for each
                 checksum algorithm.
 
         Returns:
             an iterable of signatures missing from the storage
         """
         keys = ['sha1', 'sha1_git', 'sha256']
 
         db = self.db
 
         db.mktemp('skipped_content', cur)
         db.copy_to(content, 'tmp_skipped_content',
                    keys + ['length', 'reason'], cur)
 
         yield from db.skipped_content_missing_from_temp(cur)
 
     @db_transaction
     def content_find(self, content, cur=None):
         """Find a content hash in db.
 
         Args:
             content: a dictionary representing one content hash, mapping
                 checksum algorithm names (see swh.core.hashutil.ALGORITHMS) to
                 checksum values
 
         Returns:
             a triplet (sha1, sha1_git, sha256) if the content exist
             or None otherwise.
 
         Raises:
             ValueError in case the key of the dictionary is not sha1, sha1_git
             nor sha256.
 
         """
         db = self.db
 
         if not set(content).intersection(ALGORITHMS):
             raise ValueError('content keys must contain at least one of: '
                              'sha1, sha1_git, sha256')
 
         c = db.content_find(sha1=content.get('sha1'),
                             sha1_git=content.get('sha1_git'),
                             sha256=content.get('sha256'),
                             cur=cur)
         if c:
             keys = ['sha1', 'sha1_git', 'sha256', 'length', 'ctime', 'status']
             return dict(zip(keys, c))
         return None
 
     @db_transaction
     def content_find_occurrence(self, content, cur=None):
         """Find the content's occurrence.
 
         Args:
             content: a dictionary entry representing one content hash.
             The dictionary key is one of swh.core.hashutil.ALGORITHMS.
             The value mapped to the corresponding checksum.
 
         Returns:
             The occurrence of the content.
 
         Raises:
             ValueError in case the key of the dictionary is not sha1, sha1_git
             nor sha256.
 
         """
         db = self.db
 
         c = self.content_find(content)
 
         if not c:
             return None
 
         sha1 = c['sha1']
 
         found_occ = db.content_find_occurrence(sha1, cur=cur)
         if found_occ:
             keys = ['origin_type', 'origin_url', 'branch', 'target',
                     'target_type', 'path']
             return dict(zip(keys, found_occ))
         return None
 
     def directory_add(self, directories):
         """Add directories to the storage
 
         Args:
             directories: iterable of dictionaries representing the individual
                 directories to add. Each dict has the following keys:
                 - id (sha1_git): the id of the directory to add
                 - entries (list): list of dicts for each entry in the
                     directory.  Each dict has the following keys:
                     - name (bytes)
                     - type (one of 'file', 'dir', 'rev'):
                         type of the directory entry (file, directory, revision)
                     - target (sha1_git): id of the object pointed at by the
                           directory entry
                     - perms (int): entry permissions
         """
         dirs = set()
         dir_entries = {
             'file': defaultdict(list),
             'dir': defaultdict(list),
             'rev': defaultdict(list),
         }
 
         for cur_dir in directories:
             dir_id = cur_dir['id']
             dirs.add(dir_id)
             for src_entry in cur_dir['entries']:
                 entry = src_entry.copy()
                 entry['dir_id'] = dir_id
                 dir_entries[entry['type']][dir_id].append(entry)
 
         dirs_missing = set(self.directory_missing(dirs))
         if not dirs_missing:
             return
 
         db = self.db
         with db.transaction() as cur:
             # Copy directory ids
             dirs_missing_dict = ({'id': dir} for dir in dirs_missing)
             db.mktemp('directory', cur)
             db.copy_to(dirs_missing_dict, 'tmp_directory', ['id'], cur)
 
             # Copy entries
             for entry_type, entry_list in dir_entries.items():
                 entries = itertools.chain.from_iterable(
                     entries_for_dir
                     for dir_id, entries_for_dir
                     in entry_list.items()
                     if dir_id in dirs_missing)
 
                 db.mktemp_dir_entry(entry_type)
 
                 db.copy_to(
                     entries,
                     'tmp_directory_entry_%s' % entry_type,
                     ['target', 'name', 'perms', 'dir_id'],
                     cur,
                 )
 
             # Do the final copy
             db.directory_add_from_temp(cur)
 
     @db_transaction_generator
     def directory_missing(self, directories, cur):
         """List directories missing from storage
 
         Args: an iterable of directory ids
         Returns: a list of missing directory ids
         """
         db = self.db
 
         # Create temporary table for metadata injection
         db.mktemp('directory', cur)
 
         directories_dicts = ({'id': dir} for dir in directories)
 
         db.copy_to(directories_dicts, 'tmp_directory', ['id'], cur)
 
         for obj in db.directory_missing_from_temp(cur):
             yield obj[0]
 
     @db_transaction_generator
     def directory_get(self,
                       directories,
                       cur=None):
         """Get information on directories.
 
         Args:
             - directories: an iterable of directory ids
 
         Returns:
             List of directories as dict with keys and associated values.
 
         """
         db = self.db
         keys = ('id', 'dir_entries', 'file_entries', 'rev_entries')
 
         db.mktemp('directory', cur)
         db.copy_to(({'id': dir_id} for dir_id in directories),
                    'tmp_directory', ['id'], cur)
 
         dirs = db.directory_get_from_temp(cur)
         for line in dirs:
             yield dict(zip(keys, line))
 
     @db_transaction_generator
     def directory_ls(self, directory, recursive=False, cur=None):
         """Get entries for one directory.
 
         Args:
             - directory: the directory to list entries from.
             - recursive: if flag on, this list recursively from this directory.
 
         Returns:
             List of entries for such directory.
 
         """
         db = self.db
         keys = ['dir_id', 'type', 'target', 'name', 'perms', 'status',
                 'sha1', 'sha1_git', 'sha256']
 
         if recursive:
             res_gen = db.directory_walk(directory)
         else:
             res_gen = db.directory_walk_one(directory)
 
         for line in res_gen:
             yield dict(zip(keys, line))
 
     @db_transaction
     def directory_entry_get_by_path(self, directory, paths, cur=None):
         """Get the directory entry (either file or dir) from directory with
         path.
 
         Args:
             - directory: sha1 of the top level directory
             - paths: path to lookup from the top level directory. From left
             (top) to right (bottom).
 
         Returns:
             The corresponding directory entry if found, None otherwise.
 
         """
         db = self.db
         keys = ('dir_id', 'type', 'target', 'name', 'perms', 'status',
                 'sha1', 'sha1_git', 'sha256')
 
         res = db.directory_entry_get_by_path(directory, paths, cur)
         if res:
             return dict(zip(keys, res))
 
     def revision_add(self, revisions):
         """Add revisions to the storage
 
         Args:
             revisions: iterable of dictionaries representing the individual
                 revisions to add. Each dict has the following keys:
                 - id (sha1_git): id of the revision to add
                 - date (datetime.DateTime): date the revision was written
                 - date_offset (int): offset from UTC in minutes the revision
                     was written
                 - date_neg_utc_offset (boolean): whether a null date_offset
                     represents a negative UTC offset
                 - committer_date (datetime.DateTime): date the revision got
                     added to the origin
                 - committer_date_offset (int): offset from UTC in minutes the
                     revision was added to the origin
                 - committer_date_neg_utc_offset (boolean): whether a null
                     committer_date_offset represents a negative UTC offset
                 - type (one of 'git', 'tar'): type of the revision added
                 - directory (sha1_git): the directory the revision points at
                 - message (bytes): the message associated with the revision
                 - author_name (bytes): the name of the revision author
                 - author_email (bytes): the email of the revision author
                 - committer_name (bytes): the name of the revision committer
                 - committer_email (bytes): the email of the revision committer
                 - metadata (jsonb): extra information as dictionary
                 - synthetic (bool): revision's nature (tarball, directory
                     creates synthetic revision)
                 - parents (list of sha1_git): the parents of this revision
         """
         db = self.db
 
         revisions_missing = set(self.revision_missing(
             set(revision['id'] for revision in revisions)))
 
         if not revisions_missing:
             return
 
         with db.transaction() as cur:
             db.mktemp_revision(cur)
 
             revisions_filtered = (
                 converters.revision_to_db(revision) for revision in revisions
                 if revision['id'] in revisions_missing)
 
             parents_filtered = []
 
             db.copy_to(
                 revisions_filtered, 'tmp_revision', db.revision_add_cols,
                 cur,
                 lambda rev: parents_filtered.extend(rev['parents']))
 
             db.revision_add_from_temp(cur)
 
             db.copy_to(parents_filtered, 'revision_history',
                        ['id', 'parent_id', 'parent_rank'], cur)
 
     @db_transaction_generator
     def revision_missing(self, revisions, cur=None):
         """List revisions missing from storage
 
         Args: an iterable of revision ids
 
         Returns: a list of missing revision ids
         """
         db = self.db
 
         db.store_tmp_bytea(revisions, cur)
 
         for obj in db.revision_missing_from_temp(cur):
             yield obj[0]
 
     @db_transaction_generator
     def revision_get(self, revisions, cur):
         """Get all revisions from storage
            Args: an iterable of revision ids
            Returns: an iterable of revisions as dictionaries
                     (or None if the revision doesn't exist)
         """
 
         db = self.db
 
         db.store_tmp_bytea(revisions, cur)
 
         for line in self.db.revision_get_from_temp(cur):
             data = converters.db_to_revision(
                 dict(zip(db.revision_get_cols, line))
             )
             if not data['type']:
                 yield None
                 continue
             yield data
 
     @db_transaction_generator
     def revision_log(self, revisions, limit=None, cur=None):
         """Fetch revision entry from the given root revisions.
 
         Args:
             - revisions: array of root revision to lookup
             - limit: limitation on the output result. Default to null.
 
         Yields:
             List of revision log from such revisions root.
 
         """
         db = self.db
 
         for line in db.revision_log(revisions, limit, cur):
             data = converters.db_to_revision(
                 dict(zip(db.revision_get_cols, line))
             )
             if not data['type']:
                 yield None
                 continue
             yield data
 
     @db_transaction_generator
     def revision_shortlog(self, revisions, limit=None, cur=None):
         """Fetch the shortlog for the given revisions
 
         Args:
             revisions: list of root revisions to lookup
             limit: depth limitation for the output
 
         Yields:
             a list of (id, parents) tuples.
         """
 
         db = self.db
 
         yield from db.revision_shortlog(revisions, limit, cur)
 
     @db_transaction_generator
-    def revision_log_by(self, origin_id, limit=None, cur=None):
+    def revision_log_by(self, origin_id, branch_name=None, timestamp=None,
+                        limit=None, cur=None):
         """Fetch revision entry from the actual origin_id's latest revision.
 
+        Args:
+            - origin_id: the origin id from which deriving the revision
+            - branch_name: (optional) occurrence's branch name
+            - timestamp: (optional) occurrence's time
+            - limit: (optional) depth limitation for the
+              output. Default to None.
+
+        Yields:
+            The revision log starting from the revision derived from
+            the (origin, branch_name, timestamp) combination if any.
+            Returns the [] if no revision matching this combination is
+            found.
+
         """
         db = self.db
 
-        for line in db.revision_log_by(origin_id, limit, cur):
-            data = converters.db_to_revision(
-                dict(zip(db.revision_get_cols, line))
-            )
-            if not data['type']:
-                yield None
-                continue
-            yield data
+        # Retrieve the revision by criterion
+        revisions = list(db.revision_get_by(
+            origin_id, branch_name, timestamp, limit=1))
+
+        if not revisions:
+            return None
+
+        revision_id = revisions[0][0]
+        # otherwise, retrieve the revision log from that revision
+        yield from self.revision_log([revision_id], limit)
 
     def release_add(self, releases):
         """Add releases to the storage
 
         Args:
             releases: iterable of dictionaries representing the individual
                 releases to add. Each dict has the following keys:
                 - id (sha1_git): id of the release to add
                 - revision (sha1_git): id of the revision the release points
                     to
                 - date (datetime.DateTime): the date the release was made
                 - date_offset (int): offset from UTC in minutes the release was
                     made
                 - date_neg_utc_offset (boolean): whether a null date_offset
                     represents a negative UTC offset
                 - name (bytes): the name of the release
                 - comment (bytes): the comment associated with the release
                 - author_name (bytes): the name of the release author
                 - author_email (bytes): the email of the release author
         """
         db = self.db
 
         release_ids = set(release['id'] for release in releases)
         releases_missing = set(self.release_missing(release_ids))
 
         if not releases_missing:
             return
 
         with db.transaction() as cur:
             db.mktemp_release(cur)
 
             releases_filtered = (
                 converters.release_to_db(release) for release in releases
                 if release['id'] in releases_missing
             )
 
             db.copy_to(releases_filtered, 'tmp_release', db.release_add_cols,
                        cur)
 
             db.release_add_from_temp(cur)
 
     @db_transaction_generator
     def release_missing(self, releases, cur=None):
         """List releases missing from storage
 
         Args: an iterable of release ids
         Returns: a list of missing release ids
         """
         db = self.db
 
         # Create temporary table for metadata injection
         db.store_tmp_bytea(releases, cur)
 
         for obj in db.release_missing_from_temp(cur):
             yield obj[0]
 
     @db_transaction_generator
     def release_get(self, releases, cur=None):
         """Given a list of sha1, return the releases's information
 
         Args:
             releases: list of sha1s
 
         Returns:
             Generates the list of releases dict with the following keys:
             - id: origin's id
             - revision: origin's type
             - url: origin's url
             - lister: lister's uuid
             - project: project's uuid (FIXME, retrieve this information)
 
         Raises:
             ValueError if the keys does not match (url and type) nor id.
 
         """
         db = self.db
 
         # Create temporary table for metadata injection
         db.store_tmp_bytea(releases, cur)
 
         for release in db.release_get_from_temp(cur):
             yield converters.db_to_release(
                 dict(zip(db.release_get_cols, release))
             )
 
     @db_transaction
     def occurrence_add(self, occurrences, cur=None):
         """Add occurrences to the storage
 
         Args:
             occurrences: iterable of dictionaries representing the individual
                 occurrences to add. Each dict has the following keys:
                 - origin (int): id of the origin corresponding to the
                     occurrence
                 - branch (str): the reference name of the occurrence
                 - target (sha1_git): the id of the object pointed to by
                     the occurrence
                 - target_type (str): the type of object pointed to by the
                     occurrence
                 - date (datetime.DateTime): the validity date for the given
                     occurrence
         """
         db = self.db
 
         processed = []
         for occurrence in occurrences:
             if isinstance(occurrence['date'], str):
                 occurrence['date'] = dateutil.parser.parse(occurrence['date'])
             processed.append(occurrence)
 
         db.mktemp_occurrence_history(cur)
         db.copy_to(processed, 'tmp_occurrence_history',
                    ['origin', 'branch', 'target', 'target_type', 'date'], cur)
 
         db.occurrence_history_add_from_temp(cur)
 
     @db_transaction_generator
     def occurrence_get(self, origin_id, cur=None):
         """Retrieve occurrence information per origin_id.
 
         Args:
             origin_id: The occurrence's origin.
 
         Yields:
             List of occurrences matching criterion.
 
         """
         db = self.db
         for line in db.occurrence_get(origin_id, cur):
             yield {
                 'origin': line[0],
                 'branch': line[1],
                 'target': line[2],
                 'target_type': line[3],
             }
 
     @db_transaction_generator
     def revision_get_by(self,
                         origin_id,
                         branch_name=None,
                         timestamp=None,
                         limit=None,
                         cur=None):
         """Given an origin_id, retrieve occurrences' list per given criterions.
 
         Args:
             origin_id: The origin to filter on.
-            branch_name: optional branch name.
-            timestamp:
-            limit:
+            branch_name: (optional) branch name.
+            timestamp: (optional) time.
+            limit: (optional) limit
 
         Yields:
             List of occurrences matching the criterions or None if nothing is
             found.
 
         """
         for line in self.db.revision_get_by(origin_id,
                                             branch_name,
                                             timestamp,
                                             limit=limit,
                                             cur=cur):
             data = converters.db_to_revision(
                 dict(zip(self.db.revision_get_cols, line))
             )
             if not data['type']:
                 yield None
                 continue
             yield data
 
     def release_get_by(self, origin_id, limit=None):
         """Given an origin id, return all the tag objects pointing to heads of
         origin_id.
 
         Args:
             origin_id: the origin to filter on.
             limit: None by default
 
         Yields:
             List of releases matching the criterions or None if nothing is
             found.
 
         """
 
         for line in self.db.release_get_by(origin_id, limit=limit):
             data = converters.db_to_release(
                 dict(zip(self.db.release_get_cols, line))
             )
             yield data
 
     @db_transaction
     def object_find_by_sha1_git(self, ids, cur=None):
         """Return the objects found with the given ids.
 
         Args:
             ids: a generator of sha1_gits
         Returns:
             a dict mapping the id to the list of objects found. Each object
             found is itself a dict with keys:
                 sha1_git: the input id
                 type: the type of object found
                 id: the id of the object found
                 object_id: the numeric id of the object found.
         """
         db = self.db
 
         ret = {id: [] for id in ids}
 
         for retval in db.object_find_by_sha1_git(ids):
             if retval[1]:
                 ret[retval[0]].append(dict(zip(db.object_find_by_sha1_git_cols,
                                                retval)))
 
         return ret
 
     @db_transaction
     def origin_get(self, origin, cur=None):
         """Return the origin either identified by its id or its tuple
         (type, url).
 
         Args:
             origin: dictionary representing the individual
                 origin to find.
                 This dict has either the keys type and url:
                 - type (FIXME: enum TBD): the origin type ('git', 'wget', ...)
                 - url (bytes): the url the origin points to
                 either the id:
                 - id: the origin id
 
         Returns:
             the origin dict with the keys:
             - id: origin's id
             - type: origin's type
             - url: origin's url
             - lister: lister's uuid
             - project: project's uuid (FIXME, retrieve this information)
 
         Raises:
             ValueError if the keys does not match (url and type) nor id.
 
         """
         db = self.db
 
         keys = ['id', 'type', 'url', 'lister', 'project']
 
         origin_id = origin.get('id')
         if origin_id:  # check lookup per id first
             ori = db.origin_get(origin_id, cur)
         elif 'type' in origin and 'url' in origin:  # or lookup per type, url
             ori = db.origin_get_with(origin['type'], origin['url'], cur)
         else:  # unsupported lookup
             raise ValueError('Origin must have either id or (type and url).')
 
         if ori:
             return dict(zip(keys, ori))
         return None
 
     @db_transaction
     def _person_add(self, person, cur=None):
         """Add a person in storage.
 
         BEWARE: Internal function for now.
         Do not do anything fancy in case a person already exists.
         Please adapt code if more checks are needed.
 
         Args:
             person dictionary with keys name and email.
 
         Returns:
             Id of the new person.
 
         """
         db = self.db
 
         return db.person_add(person)
 
     @db_transaction_generator
     def person_get(self, person, cur=None):
         """Return the persons identified by their ids.
 
         Args:
             person: array of ids.
 
         Returns:
             The array of persons corresponding of the ids.
 
         """
         db = self.db
 
         for person in db.person_get(person):
             yield dict(zip(db.person_get_cols, person))
 
     @db_transaction
     def origin_add_one(self, origin, cur=None):
         """Add origin to the storage
 
         Args:
             origin: dictionary representing the individual
                 origin to add. This dict has the following keys:
                 - type (FIXME: enum TBD): the origin type ('git', 'wget', ...)
                 - url (bytes): the url the origin points to
 
         Returns:
             the id of the added origin, or of the identical one that already
             exists.
 
         """
         db = self.db
 
         data = db.origin_get_with(origin['type'], origin['url'], cur)
         if data:
             return data[0]
 
         return db.origin_add(origin['type'], origin['url'], cur)
 
     @db_transaction
     def fetch_history_start(self, origin_id, cur=None):
         """Add an entry for origin origin_id in fetch_history. Returns the id
         of the added fetch_history entry
         """
         fetch_history = {
             'origin': origin_id,
             'date': datetime.datetime.now(tz=datetime.timezone.utc),
         }
 
         return self.db.create_fetch_history(fetch_history, cur)
 
     @db_transaction
     def fetch_history_end(self, fetch_history_id, data, cur=None):
         """Close the fetch_history entry with id `fetch_history_id`, replacing
            its data with `data`.
         """
         now = datetime.datetime.now(tz=datetime.timezone.utc)
         fetch_history = self.db.get_fetch_history(fetch_history_id, cur)
 
         if not fetch_history:
             raise ValueError('No fetch_history with id %d' % fetch_history_id)
 
         fetch_history['duration'] = now - fetch_history['date']
 
         fetch_history.update(data)
 
         self.db.update_fetch_history(fetch_history, cur)
 
     @db_transaction
     def fetch_history_get(self, fetch_history_id, cur=None):
         """Get the fetch_history entry with id `fetch_history_id`.
         """
         return self.db.get_fetch_history(fetch_history_id, cur)
 
     @db_transaction
     def entity_add(self, entities, cur=None):
         """Add the given entitites to the database (in entity_history).
 
         Args:
             - entities: iterable of dictionaries containing the following keys:
                 - uuid (uuid): id of the entity
                 - parent (uuid): id of the parent entity
                 - name (str): name of the entity
                 - type (str): type of entity (one of 'organization',
                     'group_of_entities', 'hosting', 'group_of_persons',
                     'person', 'project')
                 - description (str, optional): description of the entity
                 - homepage (str): url of the entity's homepage
                 - active (bool): whether the entity is active
                 - generated (bool): whether the entity was generated
                 - lister_metadata (dict): lister-specific entity metadata
                 - metadata (dict): other metadata for the entity
                 - validity (datetime.DateTime array): timestamps at which we
                     listed the entity.
         """
         db = self.db
 
         cols = list(db.entity_history_cols)
         cols.remove('id')
 
         db.mktemp_entity_history()
         db.copy_to(entities, 'tmp_entity_history', cols, cur)
         db.entity_history_add_from_temp()
 
     @db_transaction_generator
     def entity_get_from_lister_metadata(self, entities, cur=None):
         """Fetch entities from the database, matching with the lister and
            associated metadata.
 
         Args:
             entities: iterable of dictionaries containing the lister metadata
                to look for. Useful keys are 'lister', 'type', 'id', ...
         Returns:
             A generator of fetched entities with all their attributes. If no
             match was found, the returned entity is None.
         """
 
         db = self.db
 
         db.mktemp_entity_lister(cur)
 
         mapped_entities = []
         for i, entity in enumerate(entities):
             mapped_entity = {
                 'id': i,
                 'lister_metadata': entity,
             }
             mapped_entities.append(mapped_entity)
 
         db.copy_to(mapped_entities, 'tmp_entity_lister',
                    ['id', 'lister_metadata'], cur)
 
         cur.execute('''select id, %s
                        from swh_entity_from_tmp_entity_lister()
                        order by id''' %
                     ','.join(db.entity_cols))
 
         for id, *entity_vals in cur:
             fetched_entity = dict(zip(db.entity_cols, entity_vals))
             if fetched_entity['uuid']:
                 yield fetched_entity
             else:
                 yield {
                     'uuid': None,
                     'lister_metadata': entities[i],
                 }
 
     @db_transaction_generator
     def entity_get(self, uuid, cur=None):
         """Returns the list of entity per its uuid identifier and also its
         parent hierarchy.
 
         Args:
             uuid: entity's identifier
 
         Returns:
             List of entities starting with entity with uuid and the parent
             hierarchy from such entity.
 
         """
         db = self.db
         for entity in db.entity_get(uuid, cur):
             yield dict(zip(db.entity_cols, entity))
 
     @db_transaction
     def entity_get_one(self, uuid, cur=None):
         """Returns one entity using its uuid identifier.
 
         Args:
             uuid: entity's identifier
 
         Returns:
             the object corresponding to the given entity
 
         """
         db = self.db
         entity = db.entity_get_one(uuid, cur)
         if entity:
             return dict(zip(db.entity_cols, entity))
         else:
             return None
 
     @db_transaction
     def stat_counters(self, cur=None):
         """compute statistics about the number of tuples in various tables
 
         Returns:
             a dictionary mapping textual labels (e.g., content) to integer
             values (e.g., the number of tuples in table content)
 
         """
         return {k: v for (k, v) in self.db.stat_counters()}
diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py
index 79ba446d2..f5ab8f129 100644
--- a/swh/storage/tests/test_storage.py
+++ b/swh/storage/tests/test_storage.py
@@ -1,1471 +1,1536 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import datetime
 import os
 import psycopg2
 import shutil
 import tempfile
 import unittest
 from uuid import UUID
 
 from unittest.mock import patch
 
 from nose.tools import istest
 from nose.plugins.attrib import attr
 
 from swh.core.tests.db_testing import DbTestFixture
 from swh.core.hashutil import hex_to_hash
 from swh.storage import Storage
 
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 TEST_DATA_DIR = os.path.join(TEST_DIR, '../../../../swh-storage-testdata')
 
 
 @attr('db')
 class AbstractTestStorage(DbTestFixture):
     """Base class for Storage testing.
 
     This class is used as-is to test local storage (see TestStorage
     below) and remote storage (see TestRemoteStorage in
     test_remote_storage.py.
 
     We need to have the two classes inherit from this base class
     separately to avoid nosetests running the tests from the base
     class twice.
 
     """
     TEST_DB_DUMP = os.path.join(TEST_DATA_DIR, 'dumps/swh.dump')
 
     def setUp(self):
         super().setUp()
         self.maxDiff = None
         self.objroot = tempfile.mkdtemp()
         self.storage = Storage(self.conn, self.objroot)
 
         self.cont = {
             'data': b'42\n',
             'length': 3,
             'sha1': hex_to_hash(
                 '34973274ccef6ab4dfaaf86599792fa9c3fe4689'),
             'sha1_git': hex_to_hash(
                 'd81cc0710eb6cf9efd5b920a8453e1e07157b6cd'),
             'sha256': hex_to_hash(
                 '673650f936cb3b0a2f93ce09d81be107'
                 '48b1b203c19e8176b4eefc1964a0cf3a'),
         }
 
         self.cont2 = {
             'data': b'4242\n',
             'length': 5,
             'sha1': hex_to_hash(
                 '61c2b3a30496d329e21af70dd2d7e097046d07b7'),
             'sha1_git': hex_to_hash(
                 '36fade77193cb6d2bd826161a0979d64c28ab4fa'),
             'sha256': hex_to_hash(
                 '859f0b154fdb2d630f45e1ecae4a8629'
                 '15435e663248bb8461d914696fc047cd'),
         }
 
         self.missing_cont = {
             'data': b'missing\n',
             'length': 8,
             'sha1': hex_to_hash(
                 'f9c24e2abb82063a3ba2c44efd2d3c797f28ac90'),
             'sha1_git': hex_to_hash(
                 '33e45d56f88993aae6a0198013efa80716fd8919'),
             'sha256': hex_to_hash(
                 '6bbd052ab054ef222c1c87be60cd191a'
                 'ddedd24cc882d1f5f7f7be61dc61bb3a'),
         }
 
         self.skipped_cont = {
             'length': 1024 * 1024 * 200,
             'sha1_git': hex_to_hash(
                 '33e45d56f88993aae6a0198013efa80716fd8920'),
             'reason': 'Content too long',
             'status': 'absent',
         }
 
         self.skipped_cont2 = {
             'length': 1024 * 1024 * 300,
             'sha1_git': hex_to_hash(
                 '33e45d56f88993aae6a0198013efa80716fd8921'),
             'reason': 'Content too long',
             'status': 'absent',
         }
 
         self.dir = {
             'id': b'4\x013\x422\x531\x000\xf51\xe62\xa73\xff7\xc3\xa90',
             'entries': [
                 {
                     'name': b'foo',
                     'type': 'file',
                     'target': self.cont['sha1_git'],
                     'perms': 0o644,
                 },
                 {
                     'name': b'bar\xc3',
                     'type': 'dir',
                     'target': b'12345678901234567890',
                     'perms': 0o2000,
                 },
             ],
         }
 
         self.dir2 = {
             'id': b'4\x013\x422\x531\x000\xf51\xe62\xa73\xff7\xc3\xa95',
             'entries': [
                 {
                     'name': b'oof',
                     'type': 'file',
                     'target': self.cont2['sha1_git'],
                     'perms': 0o644,
                 }
             ],
         }
 
         self.dir3 = {
             'id': hex_to_hash('33e45d56f88993aae6a0198013efa80716fd8921'),
             'entries': [
                 {
                     'name': b'foo',
                     'type': 'file',
                     'target': self.cont['sha1_git'],
                     'perms': 0o644,
                 },
                 {
                     'name': b'bar',
                     'type': 'dir',
                     'target': b'12345678901234560000',
                     'perms': 0o2000,
                 },
                 {
                     'name': b'hello',
                     'type': 'file',
                     'target': b'12345678901234567890',
                     'perms': 0o644,
                 },
 
             ],
         }
 
         self.minus_offset = datetime.timezone(datetime.timedelta(minutes=-120))
         self.plus_offset = datetime.timezone(datetime.timedelta(minutes=120))
 
         self.revision = {
             'id': b'56789012345678901234',
             'message': b'hello',
             'author': {
                 'name': b'Nicolas Dandrimont',
                 'email': b'nicolas@example.com',
                 'fullname': b'Nicolas Dandrimont <nicolas@example.com> ',
             },
             'date': {
                 'timestamp': 1234567890,
                 'offset': 120,
                 'negative_utc': None,
             },
             'committer': {
                 'name': b'St\xc3fano Zacchiroli',
                 'email': b'stefano@example.com',
                 'fullname': b'St\xc3fano Zacchiroli <stefano@example.com>'
             },
             'committer_date': {
                 'timestamp': 1123456789,
                 'offset': 0,
                 'negative_utc': True,
             },
             'parents': [b'01234567890123456789', b'23434512345123456789'],
             'type': 'git',
             'directory': self.dir['id'],
             'metadata': {
                 'checksums': {
                     'sha1': 'tarball-sha1',
                     'sha256': 'tarball-sha256',
                 },
                 'signed-off-by': 'some-dude',
                 'extra_headers': [
                     ['gpgsig', b'test123'],
                     ['mergetags', [b'foo\\bar', b'\x22\xaf\x89\x80\x01\x00']],
                 ],
             },
             'synthetic': True
         }
 
         self.revision2 = {
             'id': b'87659012345678904321',
             'message': b'hello again',
             'author': {
                 'name': b'Roberto Dicosmo',
                 'email': b'roberto@example.com',
                 'fullname': b'Roberto Dicosmo <roberto@example.com>',
             },
             'date': {
                 'timestamp': 1234567843.22,
                 'offset': -720,
                 'negative_utc': None,
             },
             'committer': {
                 'name': b'tony',
                 'email': b'ar@dumont.fr',
                 'fullname': b'tony <ar@dumont.fr>',
             },
             'committer_date': {
                 'timestamp': 1123456789,
                 'offset': 0,
                 'negative_utc': False,
             },
             'parents': [b'01234567890123456789'],
             'type': 'git',
             'directory': self.dir2['id'],
             'metadata': None,
             'synthetic': False
         }
 
         self.revision3 = {
             'id': hex_to_hash('7026b7c1a2af56521e951c01ed20f255fa054238'),
             'message': b'a simple revision with no parents this time',
             'author': {
                 'name': b'Roberto Dicosmo',
                 'email': b'roberto@example.com',
                 'fullname': b'Roberto Dicosmo <roberto@example.com>',
             },
             'date': {
                 'timestamp': 1234567843.22,
                 'offset': -720,
                 'negative_utc': None,
             },
             'committer': {
                 'name': b'tony',
                 'email': b'ar@dumont.fr',
                 'fullname': b'tony <ar@dumont.fr>',
             },
             'committer_date': {
                 'timestamp': 1127351742,
                 'offset': 0,
                 'negative_utc': False,
             },
             'parents': [],
             'type': 'git',
             'directory': self.dir2['id'],
             'metadata': None,
             'synthetic': True
         }
 
         self.revision4 = {
             'id': hex_to_hash('368a48fe15b7db2383775f97c6b247011b3f14f4'),
             'message': b'parent of self.revision2',
             'author': {
                 'name': b'me',
                 'email': b'me@soft.heri',
                 'fullname': b'me <me@soft.heri>',
             },
             'date': {
                 'timestamp': 1244567843.22,
                 'offset': -720,
                 'negative_utc': None,
             },
             'committer': {
                 'name': b'committer-dude',
                 'email': b'committer@dude.com',
                 'fullname': b'committer-dude <committer@dude.com>',
             },
             'committer_date': {
                 'timestamp': 1244567843.22,
                 'offset': -720,
                 'negative_utc': None,
             },
             'parents': [self.revision3['id']],
             'type': 'git',
             'directory': self.dir['id'],
             'metadata': None,
             'synthetic': False
         }
 
         self.origin = {
             'url': 'file:///dev/null',
             'type': 'git',
         }
 
         self.origin2 = {
             'url': 'file:///dev/zero',
             'type': 'git',
         }
 
         self.occurrence = {
             'branch': b'master',
             'target': b'67890123456789012345',
             'target_type': 'revision',
             'date': datetime.datetime(2015, 1, 1, 23, 0, 0,
                                       tzinfo=datetime.timezone.utc),
         }
 
         self.occurrence2 = {
             'branch': b'master',
             'target': self.revision2['id'],
             'target_type': 'revision',
             'date': datetime.datetime(2015, 1, 1, 23, 0, 0,
                                       tzinfo=datetime.timezone.utc),
         }
 
+        # template occurrence to be filled in test (cf. revision_log_by)
+        self.occurrence3 = {
+            'branch': b'master',
+            'target_type': 'revision',
+            'date': datetime.datetime(2015, 1, 1, 23, 0, 0,
+                                      tzinfo=datetime.timezone.utc),
+        }
+
         self.release = {
             'id': b'87659012345678901234',
             'name': b'v0.0.1',
             'author': {
                 'name': b'olasd',
                 'email': b'nic@olasd.fr',
                 'fullname': b'olasd <nic@olasd.fr>',
             },
             'date': {
                 'timestamp': 1234567890,
                 'offset': 42,
                 'negative_utc': None,
             },
             'target': b'43210987654321098765',
             'target_type': 'revision',
             'message': b'synthetic release',
             'synthetic': True,
         }
 
         self.release2 = {
             'id': b'56789012348765901234',
             'name': b'v0.0.2',
             'author': {
                 'name': b'tony',
                 'email': b'ar@dumont.fr',
                 'fullname': b'tony <ar@dumont.fr>',
             },
             'date': {
                 'timestamp': 1634366813,
                 'offset': -120,
                 'negative_utc': None,
             },
             'target': b'432109\xa9765432\xc309\x00765',
             'target_type': 'revision',
             'message': b'v0.0.2\nMisc performance improvments + bug fixes',
             'synthetic': False
         }
 
         self.release3 = {
             'id': b'87659012345678904321',
             'name': b'v0.0.2',
             'author': {
                 'name': b'tony',
                 'email': b'tony@ardumont.fr',
                 'fullname': b'tony <tony@ardumont.fr>',
             },
             'date': {
                 'timestamp': 1634336813,
                 'offset': 0,
                 'negative_utc': False,
             },
             'target': self.revision2['id'],
             'target_type': 'revision',
             'message': b'yet another synthetic release',
             'synthetic': True,
         }
 
         self.fetch_history_date = datetime.datetime(
             2015, 1, 2, 21, 0, 0,
             tzinfo=datetime.timezone.utc)
         self.fetch_history_end = datetime.datetime(
             2015, 1, 2, 23, 0, 0,
             tzinfo=datetime.timezone.utc)
 
         self.fetch_history_duration = (self.fetch_history_end -
                                        self.fetch_history_date)
 
         self.fetch_history_data = {
             'status': True,
             'result': {'foo': 'bar'},
             'stdout': 'blabla',
             'stderr': 'blablabla',
         }
 
         self.entity1 = {
             'uuid': UUID('f96a7ec1-0058-4920-90cc-7327e4b5a4bf'),
             # GitHub users
             'parent': UUID('ad6df473-c1d2-4f40-bc58-2b091d4a750e'),
             'name': 'github:user:olasd',
             'type': 'person',
             'description': 'Nicolas Dandrimont',
             'homepage': 'http://example.com',
             'active': True,
             'generated': True,
             'lister_metadata': {
                 # swh.lister.github
                 'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
                 'id': 12877,
                 'type': 'user',
                 'last_activity': '2015-11-03',
             },
             'metadata': None,
             'validity': [
                 datetime.datetime(2015, 11, 3, 11, 0, 0,
                                   tzinfo=datetime.timezone.utc),
             ]
         }
 
         self.entity1_query = {
             'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
             'id': 12877,
             'type': 'user',
         }
 
         self.entity2 = {
             'uuid': UUID('3903d075-32d6-46d4-9e29-0aef3612c4eb'),
             # GitHub users
             'parent': UUID('ad6df473-c1d2-4f40-bc58-2b091d4a750e'),
             'name': 'github:user:zacchiro',
             'type': 'person',
             'description': 'Stefano Zacchiroli',
             'homepage': 'http://example.com',
             'active': True,
             'generated': True,
             'lister_metadata': {
                 # swh.lister.github
                 'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
                 'id': 216766,
                 'type': 'user',
                 'last_activity': '2015-11-03',
             },
             'metadata': None,
             'validity': [
                 datetime.datetime(2015, 11, 3, 11, 0, 0,
                                   tzinfo=datetime.timezone.utc),
             ]
         }
 
         self.entity3 = {
             'uuid': UUID('111df473-c1d2-4f40-bc58-2b091d4a7111'),
             # GitHub users
             'parent': UUID('222df473-c1d2-4f40-bc58-2b091d4a7222'),
             'name': 'github:user:ardumont',
             'type': 'person',
             'description': 'Antoine R. Dumont a.k.a tony',
             'homepage': 'https://ardumont.github.io',
             'active': True,
             'generated': True,
             'lister_metadata': {
                 'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
                 'id': 666,
                 'type': 'user',
                 'last_activity': '2016-01-15',
             },
             'metadata': None,
             'validity': [
                 datetime.datetime(2015, 11, 3, 11, 0, 0,
                                   tzinfo=datetime.timezone.utc),
             ]
         }
 
         self.entity4 = {
             'uuid': UUID('222df473-c1d2-4f40-bc58-2b091d4a7222'),
             # GitHub users
             'parent': None,
             'name': 'github:user:ToNyX',
             'type': 'person',
             'description': 'ToNyX',
             'homepage': 'https://ToNyX.github.io',
             'active': True,
             'generated': True,
             'lister_metadata': {
                 'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
                 'id': 999,
                 'type': 'user',
                 'last_activity': '2015-12-24',
             },
             'metadata': None,
             'validity': [
                 datetime.datetime(2015, 11, 3, 11, 0, 0,
                                   tzinfo=datetime.timezone.utc),
             ]
         }
 
         self.entity2_query = {
             'lister_metadata': {
                 'lister': '34bd6b1b-463f-43e5-a697-785107f598e4',
                 'id': 216766,
                 'type': 'user',
             },
         }
 
     def tearDown(self):
         shutil.rmtree(self.objroot)
 
         self.cursor.execute("""SELECT table_name FROM information_schema.tables
                                WHERE table_schema = %s""", ('public',))
 
         tables = set(table for (table,) in self.cursor.fetchall())
         tables -= {'dbversion', 'entity', 'entity_history', 'listable_entity'}
 
         for table in tables:
             self.cursor.execute('truncate table %s cascade' % table)
 
         self.cursor.execute('delete from entity where generated=true')
         self.cursor.execute('delete from entity_history where generated=true')
         self.conn.commit()
 
         super().tearDown()
 
     @istest
     def content_add(self):
         cont = self.cont
 
         self.storage.content_add([cont])
         if hasattr(self.storage, 'objstorage'):
             self.assertIn(cont['sha1'], self.storage.objstorage)
         self.cursor.execute('SELECT sha1, sha1_git, sha256, length, status'
                             ' FROM content WHERE sha1 = %s',
                             (cont['sha1'],))
         datum = self.cursor.fetchone()
         self.assertEqual(
             (datum[0].tobytes(), datum[1].tobytes(), datum[2].tobytes(),
              datum[3], datum[4]),
             (cont['sha1'], cont['sha1_git'], cont['sha256'],
              cont['length'], 'visible'))
 
     @istest
     def content_add_collision(self):
         cont1 = self.cont
 
         # create (corrupted) content with same sha1{,_git} but != sha256
         cont1b = cont1.copy()
         sha256_array = bytearray(cont1b['sha256'])
         sha256_array[0] += 1
         cont1b['sha256'] = bytes(sha256_array)
 
         with self.assertRaises(psycopg2.IntegrityError):
             self.storage.content_add([cont1, cont1b])
 
     @istest
     def skipped_content_add(self):
         cont = self.skipped_cont
         cont2 = self.skipped_cont2
 
         self.storage.content_add([cont])
         self.storage.content_add([cont2])
 
         self.cursor.execute('SELECT sha1, sha1_git, sha256, length, status,'
                             'reason FROM skipped_content ORDER BY sha1_git')
 
         datum = self.cursor.fetchone()
         self.assertEqual(
             (datum[0], datum[1].tobytes(), datum[2],
              datum[3], datum[4], datum[5]),
             (None, cont['sha1_git'], None,
              cont['length'], 'absent', 'Content too long'))
 
         datum2 = self.cursor.fetchone()
         self.assertEqual(
             (datum2[0], datum2[1].tobytes(), datum2[2],
              datum2[3], datum2[4], datum2[5]),
             (None, cont2['sha1_git'], None,
              cont2['length'], 'absent', 'Content too long'))
 
     @istest
     def content_missing(self):
         cont2 = self.cont2
         missing_cont = self.missing_cont
         self.storage.content_add([cont2])
         gen = self.storage.content_missing([cont2, missing_cont])
 
         self.assertEqual(list(gen), [missing_cont['sha1']])
 
     @istest
     def content_missing_per_sha1(self):
         # given
         cont2 = self.cont2
         missing_cont = self.missing_cont
         self.storage.content_add([cont2])
         # when
         gen = self.storage.content_missing_per_sha1([cont2['sha1'],
                                                      missing_cont['sha1']])
 
         # then
         self.assertEqual(list(gen), [missing_cont['sha1']])
 
     @istest
     def directory_get(self):
         # given
         init_missing = list(self.storage.directory_missing([self.dir['id']]))
         self.assertEqual([self.dir['id']], init_missing)
 
         self.storage.directory_add([self.dir])
 
         # when
         actual_dirs = list(self.storage.directory_get([self.dir['id']]))
 
         self.assertEqual(len(actual_dirs), 1)
 
         dir0 = actual_dirs[0]
         self.assertEqual(dir0['id'], self.dir['id'])
         # ids are generated so non deterministic value
         self.assertEqual(len(dir0['file_entries']), 1)
         self.assertEqual(len(dir0['dir_entries']), 1)
         self.assertIsNone(dir0['rev_entries'])
 
         after_missing = list(self.storage.directory_missing([self.dir['id']]))
         self.assertEqual([], after_missing)
 
     @istest
     def directory_add(self):
         init_missing = list(self.storage.directory_missing([self.dir['id']]))
         self.assertEqual([self.dir['id']], init_missing)
 
         self.storage.directory_add([self.dir])
 
         stored_data = list(self.storage.directory_ls(self.dir['id']))
 
         data_to_store = [{
                  'dir_id': self.dir['id'],
                  'type': ent['type'],
                  'target': ent['target'],
                  'name': ent['name'],
                  'perms': ent['perms'],
                  'status': None,
                  'sha1': None,
                  'sha1_git': None,
                  'sha256': None,
             }
             for ent in sorted(self.dir['entries'], key=lambda ent: ent['name'])
         ]
 
         self.assertEqual(data_to_store, stored_data)
 
         after_missing = list(self.storage.directory_missing([self.dir['id']]))
         self.assertEqual([], after_missing)
 
     @istest
     def directory_entry_get_by_path(self):
         # given
         init_missing = list(self.storage.directory_missing([self.dir3['id']]))
         self.assertEqual([self.dir3['id']], init_missing)
 
         self.storage.directory_add([self.dir3])
 
         expected_entries = [
             {
                 'dir_id': self.dir3['id'],
                 'name': b'foo',
                 'type': 'file',
                 'target': self.cont['sha1_git'],
                 'sha1': None,
                 'sha1_git': None,
                 'sha256': None,
                 'status': None,
                 'perms': 0o644,
             },
             {
                 'dir_id': self.dir3['id'],
                 'name': b'bar',
                 'type': 'dir',
                 'target': b'12345678901234560000',
                 'sha1': None,
                 'sha1_git': None,
                 'sha256': None,
                 'status': None,
                 'perms': 0o2000,
             },
             {
                 'dir_id': self.dir3['id'],
                 'name': b'hello',
                 'type': 'file',
                 'target': b'12345678901234567890',
                 'sha1': None,
                 'sha1_git': None,
                 'sha256': None,
                 'status': None,
                 'perms': 0o644,
             },
         ]
 
         # when (all must be found here)
         for entry, expected_entry in zip(self.dir3['entries'],
                                          expected_entries):
             actual_entry = self.storage.directory_entry_get_by_path(
                 self.dir3['id'],
                 [entry['name']])
             self.assertEqual(actual_entry, expected_entry)
 
         # when (nothing should be found here since self.dir is not persisted.)
         for entry in self.dir['entries']:
             actual_entry = self.storage.directory_entry_get_by_path(
                 self.dir['id'],
                 [entry['name']])
             self.assertIsNone(actual_entry)
 
     @istest
     def revision_add(self):
         init_missing = self.storage.revision_missing([self.revision['id']])
         self.assertEqual([self.revision['id']], list(init_missing))
 
         self.storage.revision_add([self.revision])
 
         end_missing = self.storage.revision_missing([self.revision['id']])
         self.assertEqual([], list(end_missing))
 
     @istest
     def revision_log(self):
         # given
         # self.revision4 -is-child-of-> self.revision3
         self.storage.revision_add([self.revision3,
                                    self.revision4])
 
         # when
         actual_results = list(self.storage.revision_log(
             [self.revision4['id']]))
 
         # hack: ids generated
         for actual_result in actual_results:
             del actual_result['author']['id']
             del actual_result['committer']['id']
 
         self.assertEqual(len(actual_results), 2)  # rev4 -child-> rev3
         self.assertEquals(actual_results[0], self.revision4)
         self.assertEquals(actual_results[1], self.revision3)
 
     @istest
     def revision_log_with_limit(self):
         # given
         # self.revision4 -is-child-of-> self.revision3
         self.storage.revision_add([self.revision3,
                                    self.revision4])
         actual_results = list(self.storage.revision_log(
             [self.revision4['id']], 1))
 
         # hack: ids generated
         for actual_result in actual_results:
             del actual_result['author']['id']
             del actual_result['committer']['id']
 
         self.assertEqual(len(actual_results), 1)
         self.assertEquals(actual_results[0], self.revision4)
 
+    @istest
+    def revision_log_by(self):
+        # given
+        origin_id = self.storage.origin_add_one(self.origin2)
+        self.storage.revision_add([self.revision3,
+                                   self.revision4])
+
+        # occurrence3 targets 'revision4'
+        # with branch 'master' and origin origin_id
+        occurrence3 = self.occurrence3.copy()
+        occurrence3.update({
+            'origin': origin_id,
+            'target': self.revision4['id'],
+        })
+
+        self.storage.occurrence_add([occurrence3])
+
+        # self.revision4 -is-child-of-> self.revision3
+        # when
+        actual_results = list(self.storage.revision_log_by(
+            origin_id,
+            branch_name=occurrence3['branch'],
+            timestamp=occurrence3['date']))
+
+        # hack: ids generated
+        for actual_result in actual_results:
+            del actual_result['author']['id']
+            del actual_result['committer']['id']
+
+        self.assertEqual(len(actual_results), 2)
+        self.assertEquals(actual_results[0], self.revision4)
+        self.assertEquals(actual_results[1], self.revision3)
+
+        # when - 2
+        actual_results = list(self.storage.revision_log_by(
+            origin_id,
+            branch_name=None,
+            timestamp=None,
+            limit=1))
+
+        # then
+        for actual_result in actual_results:
+            del actual_result['author']['id']
+            del actual_result['committer']['id']
+
+        self.assertEqual(len(actual_results), 1)
+        self.assertEquals(actual_results[0], self.revision4)
+
+        # when - 3 (revision not found)
+
+        actual_res = list(self.storage.revision_log_by(
+            origin_id,
+            branch_name='inexistant-branch',
+            timestamp=None))
+
+        self.assertEquals(actual_res, [])
+
     @staticmethod
     def _short_revision(revision):
         return [revision['id'], revision['parents']]
 
     @istest
     def revision_shortlog(self):
         # given
         # self.revision4 -is-child-of-> self.revision3
         self.storage.revision_add([self.revision3,
                                    self.revision4])
 
         # when
         actual_results = list(self.storage.revision_shortlog(
             [self.revision4['id']]))
 
         self.assertEqual(len(actual_results), 2)  # rev4 -child-> rev3
         self.assertEquals(list(actual_results[0]),
                           self._short_revision(self.revision4))
         self.assertEquals(list(actual_results[1]),
                           self._short_revision(self.revision3))
 
     @istest
     def revision_shortlog_with_limit(self):
         # given
         # self.revision4 -is-child-of-> self.revision3
         self.storage.revision_add([self.revision3,
                                    self.revision4])
         actual_results = list(self.storage.revision_shortlog(
             [self.revision4['id']], 1))
 
         self.assertEqual(len(actual_results), 1)
         self.assertEquals(list(actual_results[0]),
                           self._short_revision(self.revision4))
 
     @istest
     def revision_get(self):
         self.storage.revision_add([self.revision])
 
         actual_revisions = list(self.storage.revision_get(
             [self.revision['id'], self.revision2['id']]))
 
         # when
         del actual_revisions[0]['author']['id']  # hack: ids are generated
         del actual_revisions[0]['committer']['id']
 
         self.assertEqual(len(actual_revisions), 2)
         self.assertEqual(actual_revisions[0], self.revision)
         self.assertIsNone(actual_revisions[1])
 
     @istest
     def revision_get_no_parents(self):
         self.storage.revision_add([self.revision3])
 
         get = list(self.storage.revision_get([self.revision3['id']]))
 
         self.assertEqual(len(get), 1)
         self.assertEqual(get[0]['parents'], [])  # no parents on this one
 
     @istest
     def revision_get_by(self):
         # given
         self.storage.content_add([self.cont2])
         self.storage.directory_add([self.dir2])  # point to self.cont
         self.storage.revision_add([self.revision2])  # points to self.dir
         origin_id = self.storage.origin_add_one(self.origin2)
 
         # occurrence2 points to 'revision2' with branch 'master', we
         # need to point to the right origin
         occurrence2 = self.occurrence2.copy()
         occurrence2.update({'origin': origin_id})
         self.storage.occurrence_add([occurrence2])
 
         # we want only revision 2
         expected_revisions = list(self.storage.revision_get(
             [self.revision2['id']]))
 
         # when
         actual_results = list(self.storage.revision_get_by(
             origin_id,
             occurrence2['branch'],
             None))
 
         self.assertEqual(actual_results[0], expected_revisions[0])
 
         # when (with no branch filtering, it's still ok)
         actual_results = list(self.storage.revision_get_by(
             origin_id,
             None,
             None))
 
         self.assertEqual(actual_results[0], expected_revisions[0])
 
     @istest
     def revision_get_by_multiple_occurrence(self):
         # 2 occurrences pointing to 2 different revisions
         # each occurence have 1 hour delta
         # the api must return the revision whose occurrence is the nearest.
 
         # given
         self.storage.content_add([self.cont2])
         self.storage.directory_add([self.dir2])
         self.storage.revision_add([self.revision2, self.revision3])
         origin_id = self.storage.origin_add_one(self.origin2)
 
         # occurrence2 points to 'revision2' with branch 'master', we
         # need to point to the right origin
         occurrence2 = self.occurrence2.copy()
         occurrence2.update({'origin': origin_id,
                             'date': occurrence2['date']})
 
         dt = datetime.timedelta(days=1)
 
         occurrence3 = self.occurrence2.copy()
         occurrence3.update({'origin': origin_id,
                             'date': occurrence3['date'] + dt,
                             'target': self.revision3['id']})
 
         # 2 occurrences on same revision with lower validity date with 1h delta
         self.storage.occurrence_add([occurrence2])
         self.storage.occurrence_add([occurrence3])
 
         # when
         actual_results0 = list(self.storage.revision_get_by(
             origin_id,
             occurrence2['branch'],
             occurrence2['date']))
 
         # hack: ids are generated
         del actual_results0[0]['author']['id']
         del actual_results0[0]['committer']['id']
 
         self.assertEquals(len(actual_results0), 1)
         self.assertEqual(actual_results0, [self.revision2])
 
         # when
         actual_results1 = list(self.storage.revision_get_by(
             origin_id,
             occurrence2['branch'],
             occurrence2['date'] + dt/3))  # closer to occurrence2
 
         # hack: ids are generated
         del actual_results1[0]['author']['id']
         del actual_results1[0]['committer']['id']
 
         self.assertEquals(len(actual_results1), 1)
         self.assertEqual(actual_results1, [self.revision2])
 
         # when
         actual_results2 = list(self.storage.revision_get_by(
             origin_id,
             occurrence2['branch'],
             occurrence2['date'] + 2*dt/3))  # closer to occurrence3
 
         del actual_results2[0]['author']['id']
         del actual_results2[0]['committer']['id']
 
         self.assertEquals(len(actual_results2), 1)
         self.assertEqual(actual_results2, [self.revision3])
 
         # when
         actual_results3 = list(self.storage.revision_get_by(
             origin_id,
             occurrence3['branch'],
             occurrence3['date']))
 
         # hack: ids are generated
         del actual_results3[0]['author']['id']
         del actual_results3[0]['committer']['id']
 
         self.assertEquals(len(actual_results3), 1)
         self.assertEqual(actual_results3, [self.revision3])
 
         # when
         actual_results4 = list(self.storage.revision_get_by(
             origin_id,
             None,
             None))
 
         for actual_result in actual_results4:
             del actual_result['author']['id']
             del actual_result['committer']['id']
 
         self.assertEquals(len(actual_results4), 2)
         self.assertCountEqual(actual_results4,
                               [self.revision3, self.revision2])
 
     @istest
     def release_add(self):
         init_missing = self.storage.release_missing([self.release['id'],
                                                      self.release2['id']])
         self.assertEqual([self.release['id'], self.release2['id']],
                          list(init_missing))
 
         self.storage.release_add([self.release, self.release2])
 
         end_missing = self.storage.release_missing([self.release['id'],
                                                     self.release2['id']])
         self.assertEqual([], list(end_missing))
 
     @istest
     def release_get(self):
         # given
         self.storage.release_add([self.release, self.release2])
 
         # when
         actual_releases = list(self.storage.release_get([self.release['id'],
                                                          self.release2['id']]))
 
         # then
         for actual_release in actual_releases:
             del actual_release['author']['id']  # hack: ids are generated
 
         self.assertEquals([self.release, self.release2],
                           [actual_releases[0], actual_releases[1]])
 
     @istest
     def release_get_by(self):
         # given
         self.storage.revision_add([self.revision2])  # points to self.dir
         self.storage.release_add([self.release3])
         origin_id = self.storage.origin_add_one(self.origin2)
 
         # occurrence2 points to 'revision2' with branch 'master', we
         # need to point to the right origin
         occurrence2 = self.occurrence2.copy()
         occurrence2.update({'origin': origin_id})
         self.storage.occurrence_add([occurrence2])
 
         # we want only revision 2
         expected_releases = list(self.storage.release_get(
             [self.release3['id']]))
 
         # when
         actual_results = list(self.storage.release_get_by(
             occurrence2['origin']))
 
         # then
         self.assertEqual(actual_results[0], expected_releases[0])
 
     @istest
     def origin_add_one(self):
         origin0 = self.storage.origin_get(self.origin)
         self.assertIsNone(origin0)
 
         id = self.storage.origin_add_one(self.origin)
 
         actual_origin = self.storage.origin_get({'url': self.origin['url'],
                                                  'type': self.origin['type']})
         self.assertEqual(actual_origin['id'], id)
 
         id2 = self.storage.origin_add_one(self.origin)
 
         self.assertEqual(id, id2)
 
     @istest
     def origin_get(self):
         self.assertIsNone(self.storage.origin_get(self.origin))
         id = self.storage.origin_add_one(self.origin)
 
         # lookup per type and url (returns id)
         actual_origin0 = self.storage.origin_get({'url': self.origin['url'],
                                                   'type': self.origin['type']})
         self.assertEqual(actual_origin0['id'], id)
 
         # lookup per id (returns dict)
         actual_origin1 = self.storage.origin_get({'id': id})
 
         self.assertEqual(actual_origin1, {'id': id,
                                           'type': self.origin['type'],
                                           'url': self.origin['url'],
                                           'lister': None,
                                           'project': None})
 
     @istest
     def occurrence_add(self):
         origin_id = self.storage.origin_add_one(self.origin2)
 
         revision = self.revision.copy()
         revision['id'] = self.occurrence['target']
         self.storage.revision_add([revision])
 
         occur = self.occurrence
         occur['origin'] = origin_id
         self.storage.occurrence_add([occur])
         self.storage.occurrence_add([occur])
 
         test_query = '''
         with indiv_occurrences as (
           select origin, branch, target, target_type, unnest(visits) as visit
           from occurrence_history
         )
         select origin, branch, target, target_type, date
         from indiv_occurrences
         left join origin_visit using(origin, visit)
         order by origin, date'''
 
         self.cursor.execute(test_query)
         ret = self.cursor.fetchall()
         self.assertEqual(len(ret), 1)
         self.assertEqual(
             (ret[0][0], ret[0][1].tobytes(), ret[0][2].tobytes(),
              ret[0][3], ret[0][4]),
             (occur['origin'], occur['branch'], occur['target'],
              occur['target_type'], occur['date']))
 
         orig_date = occur['date']
         occur['date'] += datetime.timedelta(hours=10)
         self.storage.occurrence_add([occur])
 
         self.cursor.execute(test_query)
         ret = self.cursor.fetchall()
         self.assertEqual(len(ret), 2)
         self.assertEqual(
             (ret[0][0], ret[0][1].tobytes(), ret[0][2].tobytes(),
              ret[0][3], ret[0][4]),
             (occur['origin'], occur['branch'], occur['target'],
              occur['target_type'], orig_date))
         self.assertEqual(
             (ret[1][0], ret[1][1].tobytes(), ret[1][2].tobytes(),
              ret[1][3], ret[1][4]),
             (occur['origin'], occur['branch'], occur['target'],
              occur['target_type'], occur['date']))
 
     @istest
     def occurrence_get(self):
         # given
         origin_id = self.storage.origin_add_one(self.origin2)
 
         revision = self.revision.copy()
         revision['id'] = self.occurrence['target']
         self.storage.revision_add([revision])
 
         occur = self.occurrence
         occur['origin'] = origin_id
         self.storage.occurrence_add([occur])
         self.storage.occurrence_add([occur])
 
         # when
         actual_occurrence = list(self.storage.occurrence_get(origin_id))
 
         # then
         expected_occur = occur.copy()
         del expected_occur['date']
 
         self.assertEquals(len(actual_occurrence), 1)
         self.assertEquals(actual_occurrence[0], expected_occur)
 
     @istest
     def content_find_occurrence_with_present_content(self):
         # 1. with something to find
         # given
         self.storage.content_add([self.cont2])
         self.storage.directory_add([self.dir2])  # point to self.cont
         self.storage.revision_add([self.revision2])  # points to self.dir
         origin_id = self.storage.origin_add_one(self.origin2)
         occurrence = self.occurrence2
         occurrence.update({'origin': origin_id})
         self.storage.occurrence_add([occurrence])
 
         # when
         occ = self.storage.content_find_occurrence(
             {'sha1': self.cont2['sha1']})
 
         # then
         self.assertEquals(occ['origin_type'], self.origin2['type'])
         self.assertEquals(occ['origin_url'], self.origin2['url'])
         self.assertEquals(occ['branch'], self.occurrence2['branch'])
         self.assertEquals(occ['target'], self.revision2['id'])
         self.assertEquals(occ['target_type'], self.occurrence2['target_type'])
         self.assertEquals(occ['path'], self.dir2['entries'][0]['name'])
 
         occ2 = self.storage.content_find_occurrence(
             {'sha1_git': self.cont2['sha1_git']})
 
         self.assertEquals(occ2['origin_type'], self.origin2['type'])
         self.assertEquals(occ2['origin_url'], self.origin2['url'])
         self.assertEquals(occ2['branch'], self.occurrence2['branch'])
         self.assertEquals(occ2['target'], self.revision2['id'])
         self.assertEquals(occ2['target_type'], self.occurrence2['target_type'])
         self.assertEquals(occ2['path'], self.dir2['entries'][0]['name'])
 
         occ3 = self.storage.content_find_occurrence(
             {'sha256': self.cont2['sha256']})
 
         self.assertEquals(occ3['origin_type'], self.origin2['type'])
         self.assertEquals(occ3['origin_url'], self.origin2['url'])
         self.assertEquals(occ3['branch'], self.occurrence2['branch'])
         self.assertEquals(occ3['target'], self.revision2['id'])
         self.assertEquals(occ3['target_type'], self.occurrence2['target_type'])
         self.assertEquals(occ3['path'], self.dir2['entries'][0]['name'])
 
     @istest
     def content_find_occurrence_with_non_present_content(self):
         # 1. with something that does not exist
         missing_cont = self.missing_cont
 
         occ = self.storage.content_find_occurrence(
             {'sha1': missing_cont['sha1']})
 
         self.assertEquals(occ, None,
                           "Content does not exist so no occurrence")
 
         # 2. with something that does not exist
         occ = self.storage.content_find_occurrence(
             {'sha1_git': missing_cont['sha1_git']})
 
         self.assertEquals(occ, None,
                           "Content does not exist so no occurrence")
 
         # 3. with something that does not exist
         occ = self.storage.content_find_occurrence(
             {'sha256': missing_cont['sha256']})
 
         self.assertEquals(occ, None,
                           "Content does not exist so no occurrence")
 
     @istest
     def content_find_occurrence_bad_input(self):
         # 1. with bad input
         with self.assertRaises(ValueError) as cm:
             self.storage.content_find_occurrence({})  # empty is bad
         self.assertIn('content keys', cm.exception.args[0])
 
         # 2. with bad input
         with self.assertRaises(ValueError) as cm:
             self.storage.content_find_occurrence(
                 {'unknown-sha1': 'something'})  # not the right key
         self.assertIn('content keys', cm.exception.args[0])
 
     @istest
     def entity_get_from_lister_metadata(self):
         self.storage.entity_add([self.entity1])
 
         fetched_entities = list(
             self.storage.entity_get_from_lister_metadata(
                 [self.entity1_query, self.entity2_query]))
 
         # Entity 1 should have full metadata, with last_seen/last_id instead
         # of validity
         entity1 = self.entity1.copy()
         entity1['last_seen'] = entity1['validity'][0]
         del fetched_entities[0]['last_id']
         del entity1['validity']
         # Entity 2 should have no metadata
         entity2 = {
             'uuid': None,
             'lister_metadata': self.entity2_query.copy(),
         }
 
         self.assertEquals(fetched_entities, [entity1, entity2])
 
     @istest
     def entity_get_from_lister_metadata_twice(self):
         self.storage.entity_add([self.entity1])
 
         fetched_entities1 = list(
             self.storage.entity_get_from_lister_metadata(
                 [self.entity1_query]))
         fetched_entities2 = list(
             self.storage.entity_get_from_lister_metadata(
                 [self.entity1_query]))
 
         self.assertEquals(fetched_entities1, fetched_entities2)
 
     @istest
     def entity_get(self):
         # given
         self.storage.entity_add([self.entity4])
         self.storage.entity_add([self.entity3])
 
         # when: entity3 -child-of-> entity4
         actual_entity3 = list(self.storage.entity_get(self.entity3['uuid']))
 
         self.assertEquals(len(actual_entity3), 2)
         # remove dynamic data (modified by db)
         entity3 = self.entity3.copy()
         entity4 = self.entity4.copy()
         del entity3['validity']
         del entity4['validity']
         del actual_entity3[0]['last_seen']
         del actual_entity3[0]['last_id']
         del actual_entity3[1]['last_seen']
         del actual_entity3[1]['last_id']
         self.assertEquals(actual_entity3, [entity3, entity4])
 
         # when: entity4 only child
         actual_entity4 = list(self.storage.entity_get(self.entity4['uuid']))
 
         self.assertEquals(len(actual_entity4), 1)
         # remove dynamic data (modified by db)
         entity4 = self.entity4.copy()
         del entity4['validity']
         del actual_entity4[0]['last_id']
         del actual_entity4[0]['last_seen']
 
         self.assertEquals(actual_entity4, [entity4])
 
     @istest
     def entity_get_one(self):
         # given
         self.storage.entity_add([self.entity3, self.entity4])
 
         # when: entity3 -child-of-> entity4
         actual_entity3 = self.storage.entity_get_one(self.entity3['uuid'])
 
         # remove dynamic data (modified by db)
         entity3 = self.entity3.copy()
         del entity3['validity']
         del actual_entity3['last_seen']
         del actual_entity3['last_id']
         self.assertEquals(actual_entity3, entity3)
 
     @istest
     def stat_counters(self):
         expected_keys = ['content', 'directory', 'directory_entry_dir',
                          'occurrence', 'origin', 'person', 'revision']
         counters = self.storage.stat_counters()
 
         self.assertTrue(set(expected_keys) <= set(counters))
         self.assertIsInstance(counters[expected_keys[0]], int)
 
     @istest
     def content_find_with_present_content(self):
         # 1. with something to find
         cont = self.cont
         self.storage.content_add([cont])
 
         actually_present = self.storage.content_find({'sha1': cont['sha1']})
 
         actually_present.pop('ctime')
         self.assertEqual(actually_present, {
             'sha1': cont['sha1'],
             'sha256': cont['sha256'],
             'sha1_git': cont['sha1_git'],
             'length': cont['length'],
             'status': 'visible'
         })
 
         # 2. with something to find
         actually_present = self.storage.content_find(
             {'sha1_git': cont['sha1_git']})
 
         actually_present.pop('ctime')
         self.assertEqual(actually_present, {
             'sha1': cont['sha1'],
             'sha256': cont['sha256'],
             'sha1_git': cont['sha1_git'],
             'length': cont['length'],
             'status': 'visible'
         })
 
         # 3. with something to find
         actually_present = self.storage.content_find(
             {'sha256': cont['sha256']})
 
         actually_present.pop('ctime')
         self.assertEqual(actually_present, {
             'sha1': cont['sha1'],
             'sha256': cont['sha256'],
             'sha1_git': cont['sha1_git'],
             'length': cont['length'],
             'status': 'visible'
         })
 
         # 4. with something to find
         actually_present = self.storage.content_find(
             {'sha1': cont['sha1'],
              'sha1_git': cont['sha1_git'],
              'sha256': cont['sha256']})
 
         actually_present.pop('ctime')
         self.assertEqual(actually_present, {
             'sha1': cont['sha1'],
             'sha256': cont['sha256'],
             'sha1_git': cont['sha1_git'],
             'length': cont['length'],
             'status': 'visible'
         })
 
     @istest
     def content_find_with_non_present_content(self):
         # 1. with something that does not exist
         missing_cont = self.missing_cont
 
         actually_present = self.storage.content_find(
             {'sha1': missing_cont['sha1']})
 
         self.assertIsNone(actually_present)
 
         # 2. with something that does not exist
         actually_present = self.storage.content_find(
             {'sha1_git': missing_cont['sha1_git']})
 
         self.assertIsNone(actually_present)
 
         # 3. with something that does not exist
         actually_present = self.storage.content_find(
             {'sha256': missing_cont['sha256']})
 
         self.assertIsNone(actually_present)
 
     @istest
     def content_find_bad_input(self):
         # 1. with bad input
         with self.assertRaises(ValueError):
             self.storage.content_find({})  # empty is bad
 
         # 2. with bad input
         with self.assertRaises(ValueError):
             self.storage.content_find(
                 {'unknown-sha1': 'something'})  # not the right key
 
     @istest
     def object_find_by_sha1_git(self):
         sha1_gits = [b'00000000000000000000']
         expected = {
             b'00000000000000000000': [],
         }
 
         self.storage.content_add([self.cont])
         sha1_gits.append(self.cont['sha1_git'])
         expected[self.cont['sha1_git']] = [{
             'sha1_git': self.cont['sha1_git'],
             'type': 'content',
             'id': self.cont['sha1'],
         }]
 
         self.storage.directory_add([self.dir])
         sha1_gits.append(self.dir['id'])
         expected[self.dir['id']] = [{
             'sha1_git': self.dir['id'],
             'type': 'directory',
             'id': self.dir['id'],
         }]
 
         self.storage.revision_add([self.revision])
         sha1_gits.append(self.revision['id'])
         expected[self.revision['id']] = [{
             'sha1_git': self.revision['id'],
             'type': 'revision',
             'id': self.revision['id'],
         }]
 
         self.storage.release_add([self.release])
         sha1_gits.append(self.release['id'])
         expected[self.release['id']] = [{
             'sha1_git': self.release['id'],
             'type': 'release',
             'id': self.release['id'],
         }]
 
         ret = self.storage.object_find_by_sha1_git(sha1_gits)
         for val in ret.values():
             for obj in val:
                 del obj['object_id']
 
         self.assertEqual(expected, ret)
 
 
 class TestStorage(AbstractTestStorage, unittest.TestCase):
     """Test the local storage"""
 
     # Can only be tested with local storage as you can't mock
     # datetimes for the remote server
     @istest
     def fetch_history(self):
         origin = self.storage.origin_add_one(self.origin)
         with patch('datetime.datetime'):
             datetime.datetime.now.return_value = self.fetch_history_date
             fetch_history_id = self.storage.fetch_history_start(origin)
             datetime.datetime.now.assert_called_with(tz=datetime.timezone.utc)
 
         with patch('datetime.datetime'):
             datetime.datetime.now.return_value = self.fetch_history_end
             self.storage.fetch_history_end(fetch_history_id,
                                            self.fetch_history_data)
 
         fetch_history = self.storage.fetch_history_get(fetch_history_id)
         expected_fetch_history = self.fetch_history_data.copy()
 
         expected_fetch_history['id'] = fetch_history_id
         expected_fetch_history['origin'] = origin
         expected_fetch_history['date'] = self.fetch_history_date
         expected_fetch_history['duration'] = self.fetch_history_duration
 
         self.assertEqual(expected_fetch_history, fetch_history)
 
     @istest
     def person_get(self):
         # given
         person0 = {
             'fullname': b'bob <alice@bob>',
             'name': b'bob',
             'email': b'alice@bob',
         }
         id0 = self.storage._person_add(person0)
 
         person1 = {
             'fullname': b'tony <tony@bob>',
             'name': b'tony',
             'email': b'tony@bob',
         }
         id1 = self.storage._person_add(person1)
 
         # when
         actual_persons = self.storage.person_get([id0, id1])
 
         # given (person injection through release for example)
         self.assertEqual(
             list(actual_persons), [
                 {
                     'id': id0,
                     'fullname': person0['fullname'],
                     'name': person0['name'],
                     'email': person0['email'],
                 },
                 {
                     'id': id1,
                     'fullname': person1['fullname'],
                     'name': person1['name'],
                     'email': person1['email'],
                 },
             ])