Skip to content

move TrajectoryExecutionManager::clear() to private (backport #3226) - #3237

Merged
sea-bass merged 2 commits into
humblefrom
mergify/bp/humble/pr-3226
Jan 12, 2025
Merged

sea-bass merged 2 commits into
humblefrom
mergify/bp/humble/pr-3226

Conversation

@mergify

@mergify mergify Bot commented Jan 12, 2025

Copy link
Copy Markdown

Description

previously discussed here #3198 (comment)

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3226 done by [Mergify](https://mergify.com).

* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 3ec75ab)

# Conflicts:
#	moveit_py/src/moveit/moveit_ros/trajectory_execution_manager/trajectory_execution_manager.cpp
#	moveit_ros/move_group/src/default_capabilities/execute_trajectory_action_capability.cpp
#	moveit_ros/planning/plan_execution/src/plan_execution.cpp
#	moveit_ros/planning/trajectory_execution_manager/include/moveit/trajectory_execution_manager/trajectory_execution_manager.hpp
@mergify mergify Bot added the conflicts label Jan 12, 2025
@mergify

mergify Bot commented Jan 12, 2025

Copy link
Copy Markdown
Author

Cherry-pick of 3ec75ab has failed:

On branch mergify/bp/humble/pr-3226
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 3ec75aba1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   moveit_py/src/moveit/moveit_ros/trajectory_execution_manager/trajectory_execution_manager.cpp
	both modified:   moveit_ros/move_group/src/default_capabilities/execute_trajectory_action_capability.cpp
	both modified:   moveit_ros/planning/plan_execution/src/plan_execution.cpp
	deleted by us:   moveit_ros/planning/trajectory_execution_manager/include/moveit/trajectory_execution_manager/trajectory_execution_manager.hpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@sea-bass
sea-bass requested a review from rhaschke January 12, 2025 20:35
@sea-bass

Copy link
Copy Markdown
Contributor

@rhaschke Technically this changes the API for Humble, which is not ideal... but it's pretty unlikely that people are using this clear() method. However, interested in your thoughts on whether this + the other PR (#3239) should actually make it back to Humble.

@codecov-commenter

codecov-commenter commented Jan 12, 2025 •

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.41%. Comparing base (7a425d9) to head (4ae0a31).
Report is 2 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##           humble    #3237   +/-   ##
=======================================
  Coverage   51.41%   51.41%           
=======================================
  Files         382      382           
  Lines       31893    31893           
=======================================
  Hits        16396    16396           
  Misses      15497    15497           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rhaschke

Copy link
Copy Markdown
Contributor

Yes, I think so. I backported it to MoveIt1 as well.

@sea-bass
sea-bass merged commit 5333395 into humble Jan 12, 2025
@sea-bass
sea-bass deleted the mergify/bp/humble/pr-3226 branch January 12, 2025 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants