importtest/git-importer
4
0
Fork 0
forked from adamm/git-importer
Code Pull Requests Activity

Split out Flat generator to be able to test it

Browse Source
This commit is contained in:
Stephan Kulow
2022-11-02 07:20:53 +01:00
parent c94d13d74e
commit 4ff9b9771a
11 changed files with 421 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/importer.py
View File

@@ -10,8 +10,8 @@ from lib.db_revision import DBRevision
from lib.git import Git
from lib.obs import OBS
from lib.obs_revision import OBSRevision
from lib.proxy_sha256 import ProxySHA256, md5, sha256
from lib.tree_builder import AbstractWalker, TreeBuilder, TreeNode
from lib.proxy_sha256 import ProxySHA256, md5
from lib.tree_builder import AbstractWalker, TreeBuilder
from lib.user import User
@@ -251,65 +251,8 @@ class Importer:
def export_as_git(self):
db = DB()
tree = TreeBuilder(db).build(self.package)
flats = tree.as_flat_list()
class FlatNode:
def __init__(self, branch, commit, parent1=None, parent2=None) -> None:
self.branch = branch
self.commit = commit
self.parent1 = parent1
self.parent2 = parent2
def __str__(self) -> str:
p1_str = ""
if self.parent1:
p1_str = f" p1:{self.parent1.short_string()}"
p2_str = ""
if self.parent2:
p2_str = f" p2:{self.parent2.short_string()}"
return f"{self.branch} c:{self.commit.short_string()}{p1_str}{p2_str}"
class FlatTreeWalker(AbstractWalker):
"""While walking the tree, record the commits to do one after the other. These
FlatNodes are in the end in the flats array."""
def __init__(self, rebase_devel=False) -> None:
super().__init__()
self.flats = []
# the rebase_devel won't work as such as rebasing the branch needs an explicit action
self.rebase_devel = rebase_devel
# remember the last merge point so we can know the parent of it for the root of the sources
self.last_merge = None
def add(self, branch, commit, parent1=None, parent2=None):
self.flats.append(FlatNode(branch, commit, parent1, parent2))
def handle_source_node(self, node) -> None:
if self.rebase_devel and node.parent and node.parent.merged_into:
self.add("devel", node.revision, node.parent.merged_into.revision)
return
if node.parent:
self.add("devel", node.revision, node.parent.revision)
elif self.last_merge:
self.add("devel", node.revision, self.last_merge.parent.revision)
def call(self, node, is_source) -> None:
if is_source:
self.handle_source_node(node)
return
if not node.parent:
self.add("factory", node.revision)
return
if not node.merged:
self.add("factory", node.revision, node.parent.revision)
return
self.add(
"factory", node.revision, node.parent.revision, node.merged.revision
)
self.last_merge = node
ftw = FlatTreeWalker()
tree.walk(ftw)
branch_state = {"factory": None, "devel": None}
state_data = dict()
if os.path.exists(self.state_file):
@@ -318,7 +261,7 @@ class Importer:
if type(state_data) != dict:
state_data = {}
left_to_commit = []
for flat in reversed(ftw.flats):
for flat in reversed(flats):
found_state = False
for branch in ["factory", "devel"]:
if flat.commit.dbid == state_data.get(branch):