sourcehut
/
man.sr.ht
mirror of https://git.sr.ht/~sircmpwn/man.sr.ht
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix issues with empty wikis

This commit is contained in:
Drew DeVault 2019-08-02 12:18:02 -04:00
parent fb828d4bc8
commit 06c0ef62df
2 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
contrib/git-export
View File

@ -37,9 +37,6 @@ repo_api = GitRepoApi()
def migrate_repo(path, username, repo_name, is_root=False):
print(f"Importing ~{username}/{repo_name}", file=sys.stderr)
with GitRepository(path) as repo:
if repo.is_empty:
print("Skipping - empty wiki", file=sys.stderr)
return
user = User.query.filter(User.username == username).one_or_none()
if not user:
print("Skipping - unknown user", file=sys.stderr)
@ -65,6 +62,7 @@ def migrate_repo(path, username, repo_name, is_root=False):
return
else:
repo_name = name_re.sub("_", repo_name)
repo_name = repo_name[0].lower() + repo_name[1:]
valid = Validation({
"name": repo_name,
"description": "auto-created from man.sr.ht wiki",
@ -75,28 +73,44 @@ def migrate_repo(path, username, repo_name, is_root=False):
print(f"Skipping - validation errors: {valid.response}",
file=sys.stderr)
return
proc = subprocess.run([
"git", "-C", path,
"push", git_repo.path, f"master:{ref}"],
stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
if proc.returncode != 0:
print("Error during git push: " + str(proc.stdout), file=sys.stderr)
return
db.session.flush()
commit = repo.get(repo.head.target)
return {
"id": git_repo.id,
"new": new,
"name": repo_name,
"owner": user.username,
"ref": ref,
"commit_sha": str(commit.oid),
"commit_author": commit.author.name,
"commit_email": commit.author.email,
"commit_time": commit_time(commit).strftime(DATE_FORMAT),
"commit_message": commit.message,
"tree_sha": str(commit.tree_id),
}
if not repo.is_empty:
proc = subprocess.run([
"git", "-C", path,
"push", git_repo.path, f"master:{ref}"],
stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
if proc.returncode != 0:
print("Error during git push: " + str(proc.stdout), file=sys.stderr)
return
db.session.commit()
commit = repo.get(repo.head.target)
return {
"id": git_repo.id,
"new": new,
"name": repo_name,
"owner": user.username,
"ref": ref,
"commit_sha": str(commit.oid),
"commit_author": commit.author.name,
"commit_email": commit.author.email,
"commit_time": commit_time(commit).strftime(DATE_FORMAT),
"commit_message": commit.message,
"tree_sha": str(commit.tree_id),
}
else:
db.session.commit()
return {
"id": git_repo.id,
"new": new,
"name": repo_name,
"owner": user.username,
"ref": ref,
"commit_sha": None,
"commit_author": None,
"commit_email": None,
"commit_time": None,
"commit_message": None,
"tree_sha": None,
}
manifests = []
root = migrate_repo(os.path.join(man_repos, "root"), admin, root_wiki, is_root=True)

8
contrib/git-import
View File

@ -49,8 +49,12 @@ def import_repo(repo, is_root=False):
db.session.add(brepo)
db.session.flush()
backend.ensure_repo_postupdate(brepo)
backend.ensure_repo_update()
try:
backend.ensure_repo_postupdate(brepo)
backend.ensure_repo_update()
except:
db.session.rollback()
return
wiki.repo_id = brepo.id
if is_root: