From 653e285d51460f23180405e0a2e88279996f3630 Mon Sep 17 00:00:00 2001 From: RonaldsonBellande Date: Thu, 28 Sep 2023 09:50:37 -0400 Subject: [PATCH] latest pushes --- .travis.yml | 2 +- fix_errors.sh | 31 +++++ .../CHANGELOG.rst | 4 +- .../CMakeLists.txt | 2 +- .../msg/JointCtrlModule.msg | 0 .../msg/StatusMsg.msg | 0 .../msg/SyncWriteItem.msg | 0 .../msg/WriteControlTable.msg | 0 .../package.xml | 4 +- .../srv/GetJointModule.srv | 0 .../srv/LoadOffset.srv | 0 .../srv/SetJointModule.srv | 0 .../srv/SetModule.srv | 0 .../CHANGELOG.rst | 2 +- .../CMakeLists.txt | 2 +- .../package.xml | 2 +- push.sh | 4 + repository_recal.sh | 110 ++++++++++++++++++ 18 files changed, 154 insertions(+), 9 deletions(-) create mode 100755 fix_errors.sh rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/CHANGELOG.rst (92%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/CMakeLists.txt (98%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/msg/JointCtrlModule.msg (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/msg/StatusMsg.msg (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/msg/SyncWriteItem.msg (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/msg/WriteControlTable.msg (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/package.xml (90%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/srv/GetJointModule.srv (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/srv/LoadOffset.srv (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/srv/SetJointModule.srv (100%) rename {robotis_controller_msgs => humanoid_robot_controller_msgs}/srv/SetModule.srv (100%) rename {robotis_humanoid_robot_msgs => humanoid_robot_msgs}/CHANGELOG.rst (93%) rename {robotis_humanoid_robot_msgs => humanoid_robot_msgs}/CMakeLists.txt (70%) rename {robotis_humanoid_robot_msgs => humanoid_robot_msgs}/package.xml (96%) create mode 100755 push.sh create mode 100755 repository_recal.sh diff --git a/.travis.yml b/.travis.yml index c52064e..f592935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ notifications: on_success: change on_failure: always recipients: - - pyo@robotis.com + - pyo@humanoid_robot.com env: matrix: - ROS_DISTRO=noetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian diff --git a/fix_errors.sh b/fix_errors.sh new file mode 100755 index 0000000..2ebdbee --- /dev/null +++ b/fix_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Get the URL from .git/config +git_url=$(git config --get remote.origin.url) + +# Check if a URL is found +if [ -z "$git_url" ]; then + echo "No remote URL found in .git/config." + exit 1 +fi + +# Clone the repository into a temporary folder +git clone "$git_url" tmp_clone + +# Check if the clone was successful +if [ $? -eq 0 ]; then + # Remove the existing .git directory if it exists + if [ -d ".git" ]; then + rm -rf .git + fi + + # Copy the .git directory from the clone to the current repository + cp -r tmp_clone/.git . + + # Remove the clone directory + rm -rf tmp_clone + + echo "Repository cloned and .git directory copied successfully." +else + echo "Failed to clone the repository." +fi diff --git a/robotis_controller_msgs/CHANGELOG.rst b/humanoid_robot_controller_msgs/CHANGELOG.rst similarity index 92% rename from robotis_controller_msgs/CHANGELOG.rst rename to humanoid_robot_controller_msgs/CHANGELOG.rst index 9731b8f..812b401 100644 --- a/robotis_controller_msgs/CHANGELOG.rst +++ b/humanoid_robot_controller_msgs/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package robotis_controller_msgs +Changelog for package humanoid_robot_controller_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.1 (2023-09-27) @@ -43,5 +43,5 @@ Changelog for package robotis_controller_msgs ------------------ * first public release for Kinetic * modified the package information -* added robotis_controller_msgs +* added humanoid_robot_controller_msgs * Contributors: Zerom, Pyo diff --git a/robotis_controller_msgs/CMakeLists.txt b/humanoid_robot_controller_msgs/CMakeLists.txt similarity index 98% rename from robotis_controller_msgs/CMakeLists.txt rename to humanoid_robot_controller_msgs/CMakeLists.txt index d7459f5..2f4cdb1 100755 --- a/robotis_controller_msgs/CMakeLists.txt +++ b/humanoid_robot_controller_msgs/CMakeLists.txt @@ -2,7 +2,7 @@ # Set minimum required version of cmake, project name and compile options ################################################################################ cmake_minimum_required(VERSION 3.0.2) -project(robotis_controller_msgs) +project(humanoid_robot_controller_msgs) ################################################################################ # Find catkin packages and libraries for catkin and system dependencies diff --git a/robotis_controller_msgs/msg/JointCtrlModule.msg b/humanoid_robot_controller_msgs/msg/JointCtrlModule.msg similarity index 100% rename from robotis_controller_msgs/msg/JointCtrlModule.msg rename to humanoid_robot_controller_msgs/msg/JointCtrlModule.msg diff --git a/robotis_controller_msgs/msg/StatusMsg.msg b/humanoid_robot_controller_msgs/msg/StatusMsg.msg similarity index 100% rename from robotis_controller_msgs/msg/StatusMsg.msg rename to humanoid_robot_controller_msgs/msg/StatusMsg.msg diff --git a/robotis_controller_msgs/msg/SyncWriteItem.msg b/humanoid_robot_controller_msgs/msg/SyncWriteItem.msg similarity index 100% rename from robotis_controller_msgs/msg/SyncWriteItem.msg rename to humanoid_robot_controller_msgs/msg/SyncWriteItem.msg diff --git a/robotis_controller_msgs/msg/WriteControlTable.msg b/humanoid_robot_controller_msgs/msg/WriteControlTable.msg similarity index 100% rename from robotis_controller_msgs/msg/WriteControlTable.msg rename to humanoid_robot_controller_msgs/msg/WriteControlTable.msg diff --git a/robotis_controller_msgs/package.xml b/humanoid_robot_controller_msgs/package.xml similarity index 90% rename from robotis_controller_msgs/package.xml rename to humanoid_robot_controller_msgs/package.xml index 26b0a11..149eb24 100644 --- a/robotis_controller_msgs/package.xml +++ b/humanoid_robot_controller_msgs/package.xml @@ -1,8 +1,8 @@ - robotis_controller_msgs + humanoid_robot_controller_msgs 0.3.0 - This package includes ROS messages and services for robotis_framework packages + This package includes ROS messages and services for humanoid_robot_framework packages Apache 2.0 Ronaldson Bellande diff --git a/robotis_controller_msgs/srv/GetJointModule.srv b/humanoid_robot_controller_msgs/srv/GetJointModule.srv similarity index 100% rename from robotis_controller_msgs/srv/GetJointModule.srv rename to humanoid_robot_controller_msgs/srv/GetJointModule.srv diff --git a/robotis_controller_msgs/srv/LoadOffset.srv b/humanoid_robot_controller_msgs/srv/LoadOffset.srv similarity index 100% rename from robotis_controller_msgs/srv/LoadOffset.srv rename to humanoid_robot_controller_msgs/srv/LoadOffset.srv diff --git a/robotis_controller_msgs/srv/SetJointModule.srv b/humanoid_robot_controller_msgs/srv/SetJointModule.srv similarity index 100% rename from robotis_controller_msgs/srv/SetJointModule.srv rename to humanoid_robot_controller_msgs/srv/SetJointModule.srv diff --git a/robotis_controller_msgs/srv/SetModule.srv b/humanoid_robot_controller_msgs/srv/SetModule.srv similarity index 100% rename from robotis_controller_msgs/srv/SetModule.srv rename to humanoid_robot_controller_msgs/srv/SetModule.srv diff --git a/robotis_humanoid_robot_msgs/CHANGELOG.rst b/humanoid_robot_msgs/CHANGELOG.rst similarity index 93% rename from robotis_humanoid_robot_msgs/CHANGELOG.rst rename to humanoid_robot_msgs/CHANGELOG.rst index 4f749ec..5709b0c 100644 --- a/robotis_humanoid_robot_msgs/CHANGELOG.rst +++ b/humanoid_robot_msgs/CHANGELOG.rst @@ -1,5 +1,5 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package robotis_humanoid_robot_msgs +Changelog for package humanoid_robot_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.3.1 (2023-09-27) diff --git a/robotis_humanoid_robot_msgs/CMakeLists.txt b/humanoid_robot_msgs/CMakeLists.txt similarity index 70% rename from robotis_humanoid_robot_msgs/CMakeLists.txt rename to humanoid_robot_msgs/CMakeLists.txt index ce89d5f..5263f49 100644 --- a/robotis_humanoid_robot_msgs/CMakeLists.txt +++ b/humanoid_robot_msgs/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 0.3.0) -project(robotis_humanoid_robot_msgs) +project(humanoid_robot_msgs) find_package(catkin REQUIRED) catkin_metapackage() diff --git a/robotis_humanoid_robot_msgs/package.xml b/humanoid_robot_msgs/package.xml similarity index 96% rename from robotis_humanoid_robot_msgs/package.xml rename to humanoid_robot_msgs/package.xml index 1e88c9d..21be6a5 100644 --- a/robotis_humanoid_robot_msgs/package.xml +++ b/humanoid_robot_msgs/package.xml @@ -1,6 +1,6 @@ - robotis_humanoid_robot_msgs + humanoid_robot_msgs 0.3.0 ROS messages packages for the ROBOTIS HUMANOID_ROBOT (meta package) Apache 2.0 diff --git a/push.sh b/push.sh new file mode 100755 index 0000000..3435685 --- /dev/null +++ b/push.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# Git push what is already in the repository +git pull --no-edit; git fetch; git add .; git commit -am "latest pushes"; git push diff --git a/repository_recal.sh b/repository_recal.sh new file mode 100755 index 0000000..4c7fd4f --- /dev/null +++ b/repository_recal.sh @@ -0,0 +1,110 @@ +#!/bin/bash + +# Git push what is already in the repository +git pull --no-edit; git fetch; git add .; git commit -am "latest pushes"; git push + +# Get the current directory +current_dir=$(pwd) + +# Read the remote repository URL from .git/config +remote_repo_url=$(git -C "$current_dir" config --get remote.origin.url) + +# Create a temporary directory for cloning the repository +temp_dir=$(mktemp -d) + +# Clone the repository into the temporary directory without using local references +git clone --no-local "$current_dir" "$temp_dir" + +# Switch to the temporary directory +cd "$temp_dir" + +# Create a temporary file to store the file list +tmp_file=$(mktemp) +# Create a temporary file to store the processed commits +processed_commits_file=$(mktemp) + +# Function to check if a commit has already been processed +is_commit_processed() { + local commit="$1" + + # Check if the commit is already processed + grep -Fxq "$commit" "$processed_commits_file" +} + +# Function to mark a commit as processed +mark_commit_processed() { + local commit="$1" + + # Mark the commit as processed + echo "$commit" >> "$processed_commits_file" +} + +# Function to check if a file or folder exists in the repository +file_exists_in_repo() { + local file_path="$1" + + # Check if the file or folder exists in the repository + git ls-tree --name-only -r HEAD | grep -Fxq "$file_path" +} + +# Function to process the files and folders in each commit +process_commit_files() { + local commit="$1" + + # Check if the commit has already been processed + if is_commit_processed "$commit"; then + echo "Commit $commit already processed. Skipping..." + return + fi + + # Get the list of files and folders in the commit (including subfolders) + git ls-tree --name-only -r "$commit" >> "$tmp_file" + + # Process each file or folder in the commit + while IFS= read -r line + do + # Check if the file or folder exists in the current push + if file_exists_in_repo "$line"; then + echo "Keeping: $line" + else + echo "Deleting: $line" + git filter-repo --path "$line" --invert-paths + fi + done < "$tmp_file" + + # Mark the commit as processed + mark_commit_processed "$commit" + + # Clear the temporary file + > "$tmp_file" +} + +# Iterate over each commit in the repository +git rev-list --all | while IFS= read -r commit +do + process_commit_files "$commit" +done + +# Push the filtered changes to the original repository +git remote add origin "$remote_repo_url" +git push --force origin main + +# Perform a history rewrite to remove the filtered files +git filter-repo --force + +# Fetch the changes from the remote repository +git -C "$current_dir" fetch origin + +# Merge the remote changes into the local repository +git -C "$current_dir" merge origin/main --no-edit + +# Update the local repository and reduce the size of .git if needed +git -C "$current_dir" gc --prune=now +git -C "$current_dir" reflog expire --expire=now --all +git -C "$current_dir" repack -ad + +# Clean up temporary files and directories +cd "$current_dir" +rm -rf "$temp_dir" +rm "$tmp_file" +rm "$processed_commits_file"