cyy/go2_rl_robotlab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add commit ID to git diff output in logger and logger_cts.

Browse Source
This commit is contained in:
wertyuilife
2026-04-28 15:27:25 +08:00
parent 411236eb3c
commit c9cd1d757a
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/rsl_rl/rsl_rl/utils/logger.py
View File

@@ -266,20 +266,26 @@ class Logger:
for repository_file_path in self.git_status_repos: for repository_file_path in self.git_status_repos:
try: try:
repo = git.Repo(repository_file_path, search_parent_directories=True) repo = git.Repo(repository_file_path, search_parent_directories=True)
t = repo.head.commit.tree commit = repo.head.commit
t = commit.tree
except Exception: except Exception:
print(f"Could not find git repository in {repository_file_path}. Skipping.") print(f"Could not find git repository in {repository_file_path}. Skipping.")
continue continue
# Get the name of the repository # Get the name of the repository
repo_name = pathlib.Path(repo.working_dir).name repo_name = pathlib.Path(repo.working_dir).name
diff_file_name = os.path.join(git_log_dir, f"{repo_name}.diff") diff_file_name = os.path.join(git_log_dir, f"{repo_name}.diff")
# Check if the diff file already exists
if os.path.isfile(diff_file_name):
continue
# Write the diff file # Write the diff file
print(f"Storing git diff for '{repo_name}' in: {diff_file_name}") print(f"Storing git diff for '{repo_name}' in: {diff_file_name}")
with open(diff_file_name, "x", encoding="utf-8") as f: with open(diff_file_name, "w", encoding="utf-8") as f:
content = f"--- git status ---\n{repo.git.status()} \n\n\n--- git diff ---\n{repo.git.diff(t)}" content = (
"--- git commit ---\n"
f"commit: {commit.hexsha}\n"
f"author: {commit.author.name} <{commit.author.email}>\n"
f"date: {commit.committed_datetime.isoformat()}\n"
f"message:\n{commit.message.rstrip()}\n\n\n"
f"--- git status ---\n{repo.git.status()} \n\n\n"
f"--- git diff ---\n{repo.git.diff(t)}"
)
f.write(content) f.write(content)
# Add the file path to the list of files to be uploaded # Add the file path to the list of files to be uploaded
file_paths.append(diff_file_name) file_paths.append(diff_file_name)

18
source/rsl_rl/rsl_rl/utils/logger_cts.py
View File

@@ -287,20 +287,26 @@ class LoggerCTS:
for repository_file_path in self.git_status_repos: for repository_file_path in self.git_status_repos:
try: try:
repo = git.Repo(repository_file_path, search_parent_directories=True) repo = git.Repo(repository_file_path, search_parent_directories=True)
t = repo.head.commit.tree commit = repo.head.commit
t = commit.tree
except Exception: except Exception:
print(f"Could not find git repository in {repository_file_path}. Skipping.") print(f"Could not find git repository in {repository_file_path}. Skipping.")
continue continue
# Get the name of the repository # Get the name of the repository
repo_name = pathlib.Path(repo.working_dir).name repo_name = pathlib.Path(repo.working_dir).name
diff_file_name = os.path.join(git_log_dir, f"{repo_name}.diff") diff_file_name = os.path.join(git_log_dir, f"{repo_name}.diff")
# Check if the diff file already exists
if os.path.isfile(diff_file_name):
continue
# Write the diff file # Write the diff file
print(f"Storing git diff for '{repo_name}' in: {diff_file_name}") print(f"Storing git diff for '{repo_name}' in: {diff_file_name}")
with open(diff_file_name, "x", encoding="utf-8") as f: with open(diff_file_name, "w", encoding="utf-8") as f:
content = f"--- git status ---\n{repo.git.status()} \n\n\n--- git diff ---\n{repo.git.diff(t)}" content = (
"--- git commit ---\n"
f"commit: {commit.hexsha}\n"
f"author: {commit.author.name} <{commit.author.email}>\n"
f"date: {commit.committed_datetime.isoformat()}\n"
f"message:\n{commit.message.rstrip()}\n\n\n"
f"--- git status ---\n{repo.git.status()} \n\n\n"
f"--- git diff ---\n{repo.git.diff(t)}"
)
f.write(content) f.write(content)
# Add the file path to the list of files to be uploaded # Add the file path to the list of files to be uploaded
file_paths.append(diff_file_name) file_paths.append(diff_file_name)