git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity

importer: follow scmsync'ed repos HEAD

Browse Source
This commit is contained in:
Adam Majer
2025-08-13 16:45:47 +02:00
parent 878df15e58
commit 17e925bfd7
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
devel-importer/main.go
View File

@@ -146,7 +146,9 @@ func listMaintainers(obs *common.ObsClient, prj string, pkgs []string) {
log.Panicln(err) log.Panicln(err)
} }
contact_email = append(contact_email, fmt.Sprintf("%s <%s>", user.Name, user.Email)) if user != nil {
contact_email = append(contact_email, fmt.Sprintf("%s <%s>", user.Name, user.Email))
}
} }
log.Println(strings.Join(contact_email, ", ")) log.Println(strings.Join(contact_email, ", "))
} }
@@ -409,6 +411,9 @@ func importDevelRepoAndCheckHistory(pkg string, meta *common.PackageMeta) *model
if err2 := cloneDevel(git, "", pkg, meta.ScmSync, "origin", true); err2 != nil { if err2 := cloneDevel(git, "", pkg, meta.ScmSync, "origin", true); err2 != nil {
log.Panicln(err2) log.Panicln(err2)
} }
if len(u.Fragment) == 0 {
u.Fragment = "HEAD"
}
git.GitExecOrPanic(pkg, "checkout", "-B", "main", u.Fragment) git.GitExecOrPanic(pkg, "checkout", "-B", "main", u.Fragment)
} }
common.LogDebug("skip check for scmsync") common.LogDebug("skip check for scmsync")
@@ -454,6 +459,24 @@ func importDevelRepoAndCheckHistory(pkg string, meta *common.PackageMeta) *model
return repo return repo
} }
return repo
}
func SetMainBranch(pkg string) {
// scnsync, follow that and don't care
remotes := common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkg, "remote", "show"), "\n")
if slices.Contains(remotes, "origin") {
git.GitExecOrPanic(pkg, "checkout", "-B", "main", "origin/HEAD")
return
}
// check if we have factory
if _, err := git.GitBranchHead(pkg, "factory"); err != nil {
if len(git.GitExecWithOutputOrPanic(pkg, "show-ref", "pool/factory")) > 20 {
git.GitExecOrPanic(pkg, "branch", "factory", "pool/factory")
}
}
// mark newer branch as main // mark newer branch as main
branch := "factory" branch := "factory"
if len(common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkg, "rev-list", "^factory", "devel"), "\n")) > 0 { if len(common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkg, "rev-list", "^factory", "devel"), "\n")) > 0 {
@@ -461,7 +484,6 @@ func importDevelRepoAndCheckHistory(pkg string, meta *common.PackageMeta) *model
} }
common.LogInfo("setting main to", branch) common.LogInfo("setting main to", branch)
git.GitExecOrPanic(pkg, "checkout", "-B", "main", branch) git.GitExecOrPanic(pkg, "checkout", "-B", "main", branch)
return repo
} }
func ObsToRepoName(obspkg string) string { func ObsToRepoName(obspkg string) string {
@@ -500,6 +522,7 @@ func importRepo(pkg string) (BrokenFactoryPackage, FailedImport bool) {
develRepo = importDevelRepoAndCheckHistory(pkg, meta) develRepo = importDevelRepoAndCheckHistory(pkg, meta)
} }
SetMainBranch(pkg)
PushRepository(factoryRepo, develRepo, pkg) PushRepository(factoryRepo, develRepo, pkg)
return return
} }