Skip to content

Commit 9c45092

Browse files
authored
Use REPOS_FILE_BRANCH wherever we can. (ros2#2452)
That way, once we backport this most of the tutorials will point to the correct branch. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 29c915b commit 9c45092

22 files changed

+61
-61
lines changed

source/Tutorials/Actions/Writing-a-Cpp-Action-Server-Client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,6 @@ In this tutorial, you put together a C++ action server and action client line by
385385
Related content
386386
---------------
387387

388-
* There are several ways you could write an action server and client in C++; check out the ``minimal_action_server`` and ``minimal_action_client`` packages in the `ros2/examples <https://github.com/ros2/examples/tree/master/rclcpp>`_ repo.
388+
* There are several ways you could write an action server and client in C++; check out the ``minimal_action_server`` and ``minimal_action_client`` packages in the `ros2/examples <https://github.com/ros2/examples/tree/{REPOS_FILE_BRANCH}/rclcpp>`_ repo.
389389

390390
* For more detailed information about ROS actions, please refer to the `design article <http://design.ros2.org/articles/actions.html>`__.

source/Tutorials/Actions/Writing-a-Py-Action-Server-Client.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using the action we created in the :doc:`./Creating-an-Action` tutorial.
3838
Until now, you've created packages and used ``ros2 run`` to run your nodes.
3939
To keep things simple in this tutorial, however, we’ll scope the action server to a single file.
4040
If you'd like to see what a complete package for the actions tutorials looks like, check out
41-
`action_tutorials <https://github.com/ros2/demos/tree/master/action_tutorials>`__.
41+
`action_tutorials <https://github.com/ros2/demos/tree/{REPOS_FILE_BRANCH}/action_tutorials>`__.
4242

4343
Open a new file in your home directory, let's call it ``fibonacci_action_server.py``,
4444
and add the following code:
@@ -352,6 +352,6 @@ In this tutorial, you put together a Python action server and action client line
352352
Related content
353353
---------------
354354

355-
* There are several ways you could write an action server and client in Python; check out the ``minimal_action_server`` and ``minimal_action_client`` packages in the `ros2/examples <https://github.com/ros2/examples/tree/master/rclpy/actions>`_ repo.
355+
* There are several ways you could write an action server and client in Python; check out the ``minimal_action_server`` and ``minimal_action_client`` packages in the `ros2/examples <https://github.com/ros2/examples/tree/{REPOS_FILE_BRANCH}/rclpy/actions>`_ repo.
356356

357357
* For more detailed information about ROS actions, please refer to the `design article <http://design.ros2.org/articles/actions.html>`__.

source/Tutorials/Allocator-Template-Tutorial.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Implement a custom memory allocator
1010
:local:
1111

1212
This tutorial will teach you how to integrate a custom allocator for publishers and subscribers so that the default heap allocator is never called while your ROS nodes are executing.
13-
The code for this tutorial is available `here <https://github.com/ros2/demos/blob/master/demo_nodes_cpp/src/topics/allocator_tutorial.cpp>`__.
13+
The code for this tutorial is available `here <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/demo_nodes_cpp/src/topics/allocator_tutorial.cpp>`__.
1414

1515
Background
1616
----------
@@ -205,7 +205,7 @@ You can also override the global new and delete operators:
205205

206206
where the variables we are incrementing are just global static integers, and ``is_running`` is a global static boolean that gets toggled right before the call to ``spin``.
207207

208-
The `example executable <https://github.com/ros2/demos/blob/master/demo_nodes_cpp/src/topics/allocator_tutorial.cpp>`__ prints the value of the variables. To run the example executable, use:
208+
The `example executable <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/demo_nodes_cpp/src/topics/allocator_tutorial.cpp>`__ prints the value of the variables. To run the example executable, use:
209209

210210
.. code-block:: bash
211211
@@ -232,7 +232,7 @@ As a matter of fact, these allocations/deallocations originate in the underlying
232232

233233
Proving this is out of the scope of this tutorial, but you can check out the test for the allocation path that gets run as part of the ROS 2 continuous integration testing, which backtraces through the code and figures out whether certain function calls originate in the rmw implementation or in a DDS implementation:
234234

235-
https://github.com/ros2/realtime_support/blob/master/tlsf_cpp/test/test_tlsf.cpp#L41
235+
https://github.com/ros2/realtime_support/blob/{REPOS_FILE_BRANCH}/tlsf_cpp/test/test_tlsf.cpp#L41
236236

237237
Note that this test is not using the custom allocator we just created, but the TLSF allocator (see below).
238238

@@ -241,11 +241,11 @@ The TLSF allocator
241241

242242
ROS 2 offers support for the TLSF (Two Level Segregate Fit) allocator, which was designed to meet real-time requirements:
243243

244-
https://github.com/ros2/realtime_support/tree/master/tlsf_cpp
244+
https://github.com/ros2/realtime_support/tree/{REPOS_FILE_BRANCH}/tlsf_cpp
245245

246246
For more information about TLSF, see http://www.gii.upv.es/tlsf/
247247

248248
Note that the TLSF allocator is licensed under a dual-GPL/LGPL license.
249249

250250
A full working example using the TLSF allocator is here:
251-
https://github.com/ros2/realtime_support/blob/master/tlsf_cpp/example/allocator_example.cpp
251+
https://github.com/ros2/realtime_support/blob/{REPOS_FILE_BRANCH}/tlsf_cpp/example/allocator_example.cpp

source/Tutorials/Colcon-Tutorial.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ colcon supports multiple build types.
285285
The recommended build types are ``ament_cmake`` and ``ament_python``.
286286
Also supported are pure ``cmake`` packages.
287287

288-
An example of an ``ament_python`` build is the `ament_index_python package <https://github.com/ament/ament_index/tree/master/ament_index_python>`__ , where the setup.py is the primary entry point for building.
288+
An example of an ``ament_python`` build is the `ament_index_python package <https://github.com/ament/ament_index/tree/{REPOS_FILE_BRANCH}/ament_index_python>`__ , where the setup.py is the primary entry point for building.
289289

290-
A package such as `demo_nodes_cpp <https://github.com/ros2/demos/tree/master/demo_nodes_cpp>`__ uses the ``ament_cmake`` build type, and uses CMake as the build tool.
290+
A package such as `demo_nodes_cpp <https://github.com/ros2/demos/tree/{REPOS_FILE_BRANCH}/demo_nodes_cpp>`__ uses the ``ament_cmake`` build type, and uses CMake as the build tool.
291291

292292
For convenience, you can use the tool ``ros2 pkg create`` to create a new package based on a template.
293293

source/Tutorials/Composition.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ See the :doc:`conceptual article <../Concepts/About-Composition>`.
1717
Run the demos
1818
-------------
1919

20-
The demos use executables from `rclcpp_components <https://github.com/ros2/rclcpp/tree/master/rclcpp_components>`__, `ros2component <https://github.com/ros2/ros2cli/tree/master/ros2component>`__, and `composition <https://github.com/ros2/demos/tree/master/composition>`__ packages, and can be run with the following commands.
20+
The demos use executables from `rclcpp_components <https://github.com/ros2/rclcpp/tree/{REPOS_FILE_BRANCH}/rclcpp_components>`__, `ros2component <https://github.com/ros2/ros2cli/tree/{REPOS_FILE_BRANCH}/ros2component>`__, and `composition <https://github.com/ros2/demos/tree/{REPOS_FILE_BRANCH}/composition>`__ packages, and can be run with the following commands.
2121

2222

2323
Discover available components
@@ -53,7 +53,7 @@ Verify that the container is running via ``ros2`` command line tools:
5353
$ ros2 component list
5454
/ComponentManager
5555
56-
In the second shell load the talker component (see `talker <https://github.com/ros2/demos/blob/master/composition/src/talker_component.cpp>`__ source code):
56+
In the second shell load the talker component (see `talker <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/talker_component.cpp>`__ source code):
5757

5858
.. code-block:: bash
5959
@@ -64,7 +64,7 @@ The command will return the unique ID of the loaded component as well as the nod
6464

6565
Now the first shell should show a message that the component was loaded as well as repeated message for publishing a message.
6666

67-
Run another command in the second shell to load the listener component (see `listener <https://github.com/ros2/demos/blob/master/composition/src/listener_component.cpp>`__ source code):
67+
Run another command in the second shell to load the listener component (see `listener <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/listener_component.cpp>`__ source code):
6868

6969
.. code-block:: bash
7070
@@ -93,7 +93,7 @@ In the first shell:
9393
9494
$ ros2 run rclcpp_components component_container
9595
96-
In the second shell (see `server <https://github.com/ros2/demos/blob/master/composition/src/server_component.cpp>`__ and `client <https://github.com/ros2/demos/blob/master/composition/src/client_component.cpp>`__ source code):
96+
In the second shell (see `server <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/server_component.cpp>`__ and `client <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/client_component.cpp>`__ source code):
9797

9898
.. code-block:: bash
9999
@@ -108,7 +108,7 @@ Compile-time composition using ROS services
108108
This demos shows that the same shared libraries can be reused to compile a single executable running multiple components.
109109
The executable contains all four components from above: talker and listener as well as server and client.
110110

111-
In the shell call (see `source code <https://github.com/ros2/demos/blob/master/composition/src/manual_composition.cpp>`__):
111+
In the shell call (see `source code <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/manual_composition.cpp>`__):
112112

113113
.. code-block:: bash
114114
@@ -124,7 +124,7 @@ Run-time composition using dlopen
124124
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
125125

126126
This demo presents an alternative to run-time composition by creating a generic container process and explicitly passing the libraries to load without using ROS interfaces.
127-
The process will open each library and create one instance of each "rclcpp::Node" class in the library `source code <https://github.com/ros2/demos/blob/master/composition/src/dlopen_composition.cpp>`__).
127+
The process will open each library and create one instance of each "rclcpp::Node" class in the library `source code <https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/composition/src/dlopen_composition.cpp>`__).
128128

129129
.. tabs::
130130

source/Tutorials/Getting-Started-With-Ros2doctor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Keep in mind, ``ros2doctor`` is not a debug tool; it won’t help with errors in
191191
Related content
192192
---------------
193193

194-
`ros2doctor’s README <https://github.com/ros2/ros2cli/tree/master/ros2doctor>`__ will tell you more about different arguments.
194+
`ros2doctor’s README <https://github.com/ros2/ros2cli/tree/{REPOS_FILE_BRANCH}/ros2doctor>`__ will tell you more about different arguments.
195195
You might want to take a look around the ``ros2doctor`` repo as well, since it's fairly beginner friendly and a great place to get started with contributing.
196196

197197
Next steps

source/Tutorials/Intra-Process-Communication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This demo is designed to show that the intra process publish/subscribe connectio
3939

4040
First let's take a look at the source:
4141

42-
https://github.com/ros2/demos/blob/master/intra_process_demo/src/two_node_pipeline/two_node_pipeline.cpp
42+
https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/intra_process_demo/src/two_node_pipeline/two_node_pipeline.cpp
4343

4444
.. code-block:: c++
4545

@@ -170,7 +170,7 @@ The cyclic pipeline demo
170170
This demo is similar to the previous one, but instead of the producer creating a new message for each iteration, this demo only ever uses one message instance.
171171
This is achieved by creating a cycle in the graph and "kicking off" communication by externally making one of the nodes publish before spinning the executor:
172172

173-
https://github.com/ros2/demos/blob/master/intra_process_demo/src/cyclic_pipeline/cyclic_pipeline.cpp
173+
https://github.com/ros2/demos/blob/{REPOS_FILE_BRANCH}/intra_process_demo/src/cyclic_pipeline/cyclic_pipeline.cpp
174174

175175
.. code-block:: c++
176176

source/Tutorials/Launch/Launch-system.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Or for a standalone launch file:
125125
Example of ROS 2 launch concepts
126126
--------------------------------
127127

128-
The launch file in `this example <https://github.com/ros2/launch_ros/blob/master/launch_ros/examples/lifecycle_pub_sub_launch.py>`__
128+
The launch file in `this example <https://github.com/ros2/launch_ros/blob/{REPOS_FILE_BRANCH}/launch_ros/examples/lifecycle_pub_sub_launch.py>`__
129129
launches two nodes, one of which is a node with a `managed lifecycle <../Managed-Nodes>` (a "lifecycle node").
130130
Lifecycle nodes launched through ``launch_ros`` automatically emit *events* when they transition between states.
131131
The events can then be acted on through the launch framework.
@@ -136,7 +136,7 @@ In the aforementioned example, various transition requests are requested of the
136136
Documentation
137137
-------------
138138

139-
`The launch documentation <https://github.com/ros2/launch/blob/master/launch/doc/source/architecture.rst>`__ provides more details on concepts that are also used in ``launch_ros``.
139+
`The launch documentation <https://github.com/ros2/launch/blob/{REPOS_FILE_BRANCH}/launch/doc/source/architecture.rst>`__ provides more details on concepts that are also used in ``launch_ros``.
140140

141141
Additional documentation/examples of launch capabilities are forthcoming.
142142
See `the source code <https://github.com/ros2/launch>`__ in the meantime.

source/Tutorials/Launch/Using-Event-Handlers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Additionally, it will log messages to the console when:
292292
Documentation
293293
-------------
294294

295-
`The launch documentation <https://github.com/ros2/launch/blob/master/launch/doc/source/architecture.rst>`_ provides detailed information about available event handlers.
295+
`The launch documentation <https://github.com/ros2/launch/blob/{REPOS_FILE_BRANCH}/launch/doc/source/architecture.rst>`_ provides detailed information about available event handlers.
296296

297297
Summary
298298
-------

source/Tutorials/Launch/Using-Substitutions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Now you can pass the desired arguments to the launch file as follows:
325325
Documentation
326326
-------------
327327

328-
`The launch documentation <https://github.com/ros2/launch/blob/master/launch/doc/source/architecture.rst>`_ provides detailed information about available substitutions.
328+
`The launch documentation <https://github.com/ros2/launch/blob/{REPOS_FILE_BRANCH}/launch/doc/source/architecture.rst>`_ provides detailed information about available substitutions.
329329

330330
Summary
331331
-------

0 commit comments

Comments
 (0)