Merge pull request 'Add force push for the devel branch' (#21) from add_force into main

Reviewed-on: https://gitea.opensuse.org/importers/git-importer/pulls/21
This commit is contained in:
Alberto Planas 2022-12-02 09:35:40 +01:00
commit 9962673eff
2 changed files with 8 additions and 4 deletions

View File

@ -215,13 +215,17 @@ class Git:
url = f"gitea@gitea.opensuse.org:{org_name}/{repo_name}.git"
self.repo.remotes.create("origin", url)
def push(self):
def push(self, force=False):
remo = self.repo.remotes["origin"]
keypair = pygit2.KeypairFromAgent("gitea")
callbacks = pygit2.RemoteCallbacks(credentials=keypair)
refspecs = ["refs/heads/factory"]
if "refs/heads/devel" in self.repo.references:
refspecs.append("refs/heads/devel")
develspec = "refs/heads/devel"
if develspec in self.repo.references:
if force:
refspecs.append(f"+{develspec}:{develspec}")
else:
refspecs.append("{develspec}:{develspec}")
remo.push(refspecs, callbacks=callbacks)

View File

@ -86,7 +86,7 @@ class GitExporter:
logging.debug(f"Committing {flat}")
self.commit_flat(flat, branch_state)
self.git.push()
self.git.push(force=True)
def run_gc(self):
self.gc_cnt = self.gc_interval