[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

mqcmd196 · 2023-06-21T12:21:46Z

Background

Untracked files are not stashed
The script assumes that jsk_robot is in src/jsk-ros-pkg/jsk_robot
If you accidentally leave only local commits within the robot body on a branch configured for rosinstall, such as develop/fetch, the changes will disappear.

What has been changed?

git stash -u instead
execute wstool update -t $WORKSPACE/src $(rospack find jsk_robot_startup)/../.. --delete-changed-uris instead of wstool update -t $WORKSPACE/src jsk-ros-pkg/jsk_robot --delete-changed-uris
If some commits in the branch configured for rosinstall were found, the script evacuates those commits to another branch, like develop/fetch-patch-${current date}

mqcmd196 · 2023-06-22T02:01:40Z

rebased current origin/develop/fetch and checked work correctly

jsk_robot_common/jsk_robot_startup/scripts/update_workspace_main.sh

Co-authored-by: Koki Shinjo <[email protected]>

…ostics

…tector

…r in go-to-kitchen demo

…ost:11311

…_jsk app

* [jsk_fetch_startup] add write-message-on-message-board to navigation-utils.l * [jsk_fetch_startup] Use write-message-on-message-board in kitchen-demo * Update jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l add package existence check for esp_now_ros Co-authored-by: Naoto Tsukamoto <[email protected]> * [jsk_fetch_startup] publish dummy packet before write message on message board * Add more message and debug output * [jsk_fetch_startup] fix error * [jsk_fetch_starup] get rid of dummy message writing * [jsk_fetch_startup] Change enr_message_board address --------- Co-authored-by: Naoto Tsukamoto <[email protected]>

This reverts commit 3ab1283.

sktometometo · 2023-07-13T05:09:21Z

@mqcmd196 kindly ping, I would appreciate any comments on the progress of this Pull Request and previous discussions.

mqcmd196 · 2023-07-13T17:15:20Z

@sktometometo
Sorry for late, please check 8b5ee72

mqcmd196 · 2023-07-13T17:33:15Z

I have to check on real robot

sktometometo · 2023-07-13T23:08:16Z

jsk_robot_common/jsk_robot_startup/scripts/update_workspace_main.sh

-    # Forcefully checkout specified branch
-    wstool foreach -t $WORKSPACE/src --git --shell 'branchname=$(git rev-parse --abbrev-ref HEAD); if [ $branchname != "HEAD" ]; then git reset --hard HEAD; git checkout origin/$branchname; git branch -D $branchname; git checkout -b $branchname --track origin/$branchname; fi'
+    # When the repository's Spec-Version branch has commits which are not pushed to remote, they are evacuated to another branch
+    wstool foreach -t $WORKSPACE/src --git --shell 'expected_version=$(wstool info . | grep Spec-Version: | awk '\''{print $2}'\''); current_version=$(git rev-parse --abbrev-ref HEAD); remote_diff_head_origin=$(git rev-list HEAD..origin); remote_diff_origin_head=$(git rev-list origin..HEAD); remote_diff="${remote_diff_head_origin}${remote_diff_origin_head}"; if [ "$expected_version" = "$current_version" ] && [ -n "$remote_diff" ]; then git checkout -b ${expected_version}-patch-$(date +%Y%m%d%H%M%S); git checkout origin/$expected_version; git branch -D $expected_version; git checkout -b $expected_version --track origin/$expected_version; fi'


Looks almost good!. There is one point to change.

We would like to check rev-list from current HEAD to desired branch in origin, but with this case, origin sometimes stands for another branch, (e.g. it stands for origin/master at jsk_robot, not develop/fetch)

So it would be nice to use origin/$(expected_version) instead of origin.

sktometometo · 2023-07-13T23:17:26Z

jsk_robot_common/jsk_robot_startup/scripts/update_workspace_main.sh

-    # Forcefully checkout specified branch
-    wstool foreach -t $WORKSPACE/src --git --shell 'branchname=$(git rev-parse --abbrev-ref HEAD); if [ $branchname != "HEAD" ]; then git reset --hard HEAD; git checkout origin/$branchname; git branch -D $branchname; git checkout -b $branchname --track origin/$branchname; fi'
+    # When the repository's Spec-Version branch has commits which are not pushed to remote, they are evacuated to another branch
+    wstool foreach -t $WORKSPACE/src --git --shell 'expected_version=$(wstool info . | grep Spec-Version: | awk '\''{print $2}'\''); current_version=$(git rev-parse --abbrev-ref HEAD); remote_diff_head_origin=$(git rev-list HEAD..origin); remote_diff_origin_head=$(git rev-list origin..HEAD); remote_diff="${remote_diff_head_origin}${remote_diff_origin_head}"; if [ "$expected_version" = "$current_version" ] && [ -n "$remote_diff" ]; then git checkout -b ${expected_version}-patch-$(date +%Y%m%d%H%M%S); git checkout origin/$expected_version; git branch -D $expected_version; git checkout -b $expected_version --track origin/$expected_version; fi'


Suggested change

wstool foreach -t $WORKSPACE/src --git --shell 'expected_version=$(wstool info . | grep Spec-Version: | awk '\''{print $2}'\''); current_version=$(git rev-parse --abbrev-ref HEAD); remote_diff_head_origin=$(git rev-list HEAD..origin); remote_diff_origin_head=$(git rev-list origin..HEAD); remote_diff="${remote_diff_head_origin}${remote_diff_origin_head}"; if [ "$expected_version" = "$current_version" ] && [ -n "$remote_diff" ]; then git checkout -b ${expected_version}-patch-$(date +%Y%m%d%H%M%S); git checkout origin/$expected_version; git branch -D $expected_version; git checkout -b $expected_version --track origin/$expected_version; fi'

wstool foreach -t $WORKSPACE/src --git --shell 'expected_version=$(wstool info . | grep Spec-Version: | awk '\''{print $2}'\''); current_version=$(git rev-parse --abbrev-ref HEAD); remote_diff_head_origin=$(git rev-list HEAD..origin/$expected_version); remote_diff_origin_head=$(git rev-list origin/$expected_version..HEAD); remote_diff="${remote_diff_head_origin}${remote_diff_origin_head}"; if [ "$expected_version" = "$current_version" ] && [ -n "$remote_diff" ]; then git checkout -b ${expected_version}-patch-$(date +%Y%m%d%H%M%S); git checkout origin/$expected_version; git branch -D $expected_version; git checkout -b $expected_version --track origin/$expected_version; fi'

sktometometo · 2023-07-14T04:34:45Z

Let's merge and check with a robot.

mqcmd196 · 2023-07-14T05:39:20Z

After tomorrow, I'll go to the lab and check it.

github-actions bot added the develop/fetch label Jun 21, 2023

mqcmd196 force-pushed the PR/fix_update_ws branch from 52ecc8b to 084e34c Compare June 21, 2023 13:01

mqcmd196 changed the title ~~Pr/fix update ws~~ [develop/fetch] [jsk_robot_startup] Work around update_workspace Jun 22, 2023

mqcmd196 marked this pull request as ready for review June 22, 2023 01:27

mqcmd196 force-pushed the PR/fix_update_ws branch from 1235749 to 5df35e0 Compare June 22, 2023 02:00

mqcmd196 requested review from tkmtnt7000 and sktometometo June 22, 2023 02:01

sktometometo reviewed Jun 22, 2023

View reviewed changes

jsk_robot_common/jsk_robot_startup/scripts/update_workspace_main.sh Outdated Show resolved Hide resolved

JSK fetch user and others added 21 commits June 26, 2023 12:58

move jsk-network-monitor because it requires root user to run

20e9d5d

update tmuxinator log.yml

3929b2e

Update jsk_fetch_robot/jsk_fetch_startup/config/install_supervisor.sh

89822e5

Co-authored-by: Koki Shinjo <[email protected]>

add fetch_coral.launch

83f65f4

fix typo

f643974

fix typo in fetch_coral.launch

78933a8

[jsk_fetch_startup] Set vital_rate 0.1 in go-to-kitchen demo

ca583d7

[jsk_fetch_startup] Set small hz vital_rate to suppress audible diagn…

ac928db

…ostics

[jsk_fetch_startup] Use smaller size images for trashbin occupancy de…

de36ae9

…tector

[jsk_fetch_startup] Launch rfcomm bind job as root

7e0bd8a

[jsk_fetch_startup] Launch shutdown node as root

12a8ff3

[jsk_fetch_startup] Disable L515 to reduce CPU usage

fb3884d

[jsk_robot_startup] Add sigint and sigterm timeout arg for app_manager

c5f0b0d

[jsk_fetch_startup] Add sigint_timeout for fetch's app_manager

c7cdc02

[jsk_fetch_startup] Replace audio/vidoe recorder with rosbag converte…

3e6bc1c

…r in go-to-kitchen demo

[jsk_fetch_startup] Remove unused topic_hz_converter

29fdca3

[jsk_fetch_startup] Use ROS_HOSTNAME and ROS_MASTER_URI=http://localh…

094531b

…ost:11311

[jsk_fetch_startup] Use launch instead of single roseus in welcome_to…

e66b9bc

…_jsk app

Add roseus_resume interrupt and resume apps

7c28962

[jsk_fetch_startup] Add hz_measure node to monitor rgb/depth topics

d1056eb

[jsk_fetch_startup/sanity_diagnostics] Make clear_params true

6400c7f

sktometometo and others added 2 commits June 27, 2023 17:16

Revert "[Fetch] Use bugfix branch of executive_smach_visualization"

db7ed5b

This reverts commit 3ab1283.

github-actions bot added the PleaseResolveConflicts label Jun 28, 2023

tkmtnt7000 added 8 commits July 3, 2023 13:11

[jsk_fetch_startup] Add TimeSignal.cfg

0bd3f14

[jsk_fetch_startup] Add dynamic_reconfigure to dependency

7b894dd

[jsk_fetch_startup] Enable dynamic_recongiure

5906221

[jsk_fetch_startup] Set volume dynamically in time_signal.py

e85db11

[jsk_robot_startup] Add time_signal to auto speak volume control app

0dfccd5

[Fetch] Use run-name-entry-fetch15 branch in app_manager

ae0e41d

[jsk_fetch_startup] Add run_name to time_signal.py to specify node name

1406ce7

[jsk_robot_startup] Fix mongodb_replicate_on_write param

f084277

mqcmd196 force-pushed the PR/fix_update_ws branch from 5df35e0 to 4cd5497 Compare July 13, 2023 16:24

github-actions bot added Fetch jsk_robot_startup PR2 labels Jul 13, 2023

mqcmd196 force-pushed the PR/fix_update_ws branch from 4cd5497 to 7ff6f98 Compare July 13, 2023 16:30

github-actions bot removed Fetch PR2 labels Jul 13, 2023

[jsk_robot_startup] not to delete branch everytime

1c61c3f

mqcmd196 force-pushed the PR/fix_update_ws branch from 7ff6f98 to 1c61c3f Compare July 13, 2023 16:32

[jsk_robot_startup] use rev-list to check diverge

8b5ee72

sktometometo requested changes Jul 13, 2023

View reviewed changes

[develop/fetch] check origin/ instead

a3d2f7d

sktometometo approved these changes Jul 14, 2023

View reviewed changes

tkmtnt7000 force-pushed the develop/fetch branch from a94818f to 23037db Compare November 9, 2023 05:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

mqcmd196 commented Jun 21, 2023 •

edited

Loading

mqcmd196 commented Jun 22, 2023 •

edited

Loading

sktometometo commented Jul 13, 2023

mqcmd196 commented Jul 13, 2023

mqcmd196 commented Jul 13, 2023

sktometometo Jul 13, 2023

sktometometo Jul 13, 2023

sktometometo commented Jul 14, 2023

mqcmd196 commented Jul 14, 2023

[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

Are you sure you want to change the base?

[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

Conversation

mqcmd196 commented Jun 21, 2023 • edited Loading

Background

What has been changed?

mqcmd196 commented Jun 22, 2023 • edited Loading

sktometometo commented Jul 13, 2023

mqcmd196 commented Jul 13, 2023

mqcmd196 commented Jul 13, 2023

sktometometo Jul 13, 2023

Choose a reason for hiding this comment

sktometometo Jul 13, 2023

Choose a reason for hiding this comment

sktometometo commented Jul 14, 2023

mqcmd196 commented Jul 14, 2023

mqcmd196 commented Jun 21, 2023 •

edited

Loading

mqcmd196 commented Jun 22, 2023 •

edited

Loading