expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

Be more specific about what is being commited and do not check for unadded changes, and then through an error at the user, which they are unlikely to understand.

Browse Source
This commit is contained in:
Martin Green 2023-04-30 21:04:05 +01:00
parent 10ff8a5aab
commit e8d1265ee4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/utils.py
View File

@ -144,23 +144,23 @@ def write_and_commit(files, message):
)
else:
print(f"No change {filepath}")
subprocess.run([git, "commit", "-m", message], cwd=cwd, capture_output=True, text=True)
cp_status = subprocess.run([git, "status"], cwd=cwd, capture_output=True, text=True)
subprocess.run([git, "commit", filename, "-m", message], cwd=cwd, capture_output=True, text=True)
#cp_status = subprocess.run([git, "status"], cwd=cwd, capture_output=True, text=True)
# This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb
if cp_status.stdout.split("\n")[-2] != "nothing to commit, working tree clean":
print("FOO: ", cp_status.stdout.split("\n")[-2])
msgdata = (
"Ask a nerd to fix this.\n\n"
+ cp_status.stderr
+ "\n\n"
+ cp_status.stdout
+ "\n\nreturn code: "
+ str(cp_status.returncode)
)
raise WriteAndCommitError(
f"Error code with git on server for this file {filename}. Edits saved, added to git, but NOT committed.\n\n"
+ msgdata
)
#if cp_status.stdout.split("\n")[-2] != "nothing to commit, working tree clean":
# print("FOO: ", cp_status.stdout.split("\n")[-2])
# msgdata = (
# "Ask a nerd to fix this.\n\n"
# + cp_status.stderr
# + "\n\n"
# + cp_status.stdout
# + "\n\nreturn code: "
# + str(cp_status.returncode)
# )
# raise WriteAndCommitError(
# f"Error code with git on server for this file {filename}. Edits saved, added to git, but NOT committed.\n\n"
# + msgdata
# )
except subprocess.SubprocessError:
raise WriteAndCommitError(
f"CANNOT git on server for this file {filename}. Subprocess error. Edits not saved.\nAsk a nerd to fix this."