Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[humble] Remove rcpputils::fs dependencies from rosbag2_storages (backport #1558) #1565

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #1558 done by Mergify.
Cherry-pick of edda376 has failed:

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

You are currently cherry-picking commit edda376.
  (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)

Changes to be committed:
	modified:   rosbag2_storage/package.xml
	modified:   rosbag2_storage/src/rosbag2_storage/metadata_io.cpp
	modified:   rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp
	modified:   rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/test_sqlite_wrapper.cpp
	modified:   rosbag2_storage_mcap/CMakeLists.txt
	modified:   rosbag2_storage_mcap/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_storage/CMakeLists.txt
	both modified:   rosbag2_storage_default_plugins/src/rosbag2_storage_default_plugins/sqlite/sqlite_storage.cpp
	both modified:   rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/test_sqlite_storage.cpp
	both modified:   rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Remove rcpputils::fs dependencies from rosbag2_storages

Original author: Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Use path::generic_string() for Windows compatibility

Co-authored with Kenta Yonekura <yoneken@ieee.org>

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

* Fix linter errors in osbag2_storage_sqlite3

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>

---------

Signed-off-by: Roman Sokolkov <rsokolkov@gmail.com>
Co-authored-by: Kenta Yonekura <yoneken@ieee.org>
(cherry picked from commit edda376)

# Conflicts:
#	rosbag2_storage/CMakeLists.txt
#	rosbag2_storage_default_plugins/src/rosbag2_storage_default_plugins/sqlite/sqlite_storage.cpp
#	rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/test_sqlite_storage.cpp
#	rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_mcap_storage.cpp
@mergify mergify bot requested a review from a team as a code owner February 2, 2024 18:31
@mergify mergify bot removed the request for review from a team February 2, 2024 18:31
@mergify mergify bot added the conflicts label Feb 2, 2024
@mergify mergify bot requested review from emersonknapp and hidmic February 2, 2024 18:31
@MichaelOrlov MichaelOrlov changed the title Remove rcpputils::fs dependencies from rosbag2_storages (backport #1558) [humble] Remove rcpputils::fs dependencies from rosbag2_storages (backport #1558) Feb 2, 2024
@clalancette
Copy link
Contributor

Same comment as #1564 (comment)

@MichaelOrlov
Copy link
Contributor

  • Close as will not be done due to the merge conflicts and very low importance for backporting.

@mergify mergify bot deleted the mergify/bp/humble/pr-1558 branch February 2, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants