Allow to import multiple packages in one go

This way we avoid duplicating all startup and SQL queries

lib/git.py

@@ -109,69 +109,6 @@ class Git:
             "HEAD", author, committer, message, tree, parents
         )
 
-    def merge(
-        self,
-        user,
-        user_email,
-        user_time,
-        message,
-        commit,
-        committer=None,
-        committer_email=None,
-        committer_time=None,
-        clean_on_conflict=True,
-        merged=False,
-        allow_empty=False,
-    ):
-        new_branch = False
-
-        if not merged:
-            try:
-                self.repo.merge(commit)
-            except KeyError:
-                # If it is the first commit, we will have a missing
-                # "HEAD", but the files will be there.  We can proceed
-                # to the commit directly.
-                new_branch = True
-
-        if not merged and self.repo.index.conflicts:
-            for conflict in self.repo.index.conflicts:
-                conflict = [c for c in conflict if c]
-                if conflict:
-                    logging.info(f"CONFLICT {conflict[0].path}")
-
-            if clean_on_conflict:
-                self.clean()
-            # Now I miss Rust enums
-            return "CONFLICT"
-
-        # Some merges are empty in OBS (no changes, not sure
-        # why), for now we signal them
-        if not allow_empty and not self.is_dirty():
-            # I really really do miss Rust enums
-            return "EMPTY"
-
-        if new_branch:
-            parents = [commit]
-        else:
-            parents = [
-                self.repo.head.target,
-                commit,
-            ]
-        commit = self.commit(
-            user,
-            user_email,
-            user_time,
-            message,
-            parents,
-            committer,
-            committer_email,
-            committer_time,
-            allow_empty=allow_empty,
-        )
-
-        return commit
-
     def merge_abort(self):
         self.repo.state_cleanup()
 
@@ -188,7 +125,7 @@ class Git:
         self.repo.references["refs/heads/" + branch].set_target(commit)
 
     def gc(self):
-        logging.info(f"Garbage recollect and repackage {self.path}")
+        logging.debug(f"Garbage recollect and repackage {self.path}")
         subprocess.run(
             ["git", "gc", "--auto"],
             cwd=self.path,