Remove support for pip-style repository URLs

mathias-luedtke · Jan 29, 2021 · 42376ea · 42376ea
1 parent a7a51c9
commit 42376ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/doc/index.rst b/doc/index.rst
@@ -249,7 +249,6 @@ Each workspace can be composed as a sequence of the following items:
   * ``bitbucket`` for Bitbucket repositories
   * ``git``/``git+*``: for any other git repository
 
-  For convenience ``@`` (pip-style) can be used as a separator as well.
   Please note that a version is mandatory. If you really want to use the default branch, which is error-prone and therefore not recommended, you can set it to ``HEAD``.
 
 * URL (=starts with http or https) of a ``*.repos`` or ``*.rosinstall`` file

diff --git a/industrial_ci/_wrap_test.sh b/industrial_ci/_wrap_test.sh
@@ -22,7 +22,7 @@ set -e # exit script on errors
 if [ -n "$_EXTERNAL_REPO" ]; then
     export TRAVIS_BUILD_DIR; TRAVIS_BUILD_DIR=$(mktemp -d)
     source ./industrial_ci/src/workspace.sh
-    IFS=" " read -r -a parts <<< "$(ici_resolve_scheme "$_EXTERNAL_REPO")" # name, type, url, version
+    IFS=" " read -r -a parts <<< "$(ici_parse_repository_url "$_EXTERNAL_REPO")" # name, type, url, version
     echo "Cloning '${parts[2]}'...'"
     git clone -q "${parts[2]}" "$TRAVIS_BUILD_DIR"
     git -C "$TRAVIS_BUILD_DIR" checkout "${parts[3]}"

diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh
@@ -18,9 +18,9 @@
 
 export _DEFAULT_DEBS=${_DEFAULT_DEBS:-}
 
-function ici_resolve_scheme {
+function ici_parse_repository_url {
     local url=$1; shift
-    if [[ $url =~ ([^:]+):([^#@]+)[#@](.+) ]]; then
+    if [[ $url =~ ([^:]+):([^#]+)#(.+) ]]; then
         local fragment="${BASH_REMATCH[3]}"
         local repo=${BASH_REMATCH[2]}
         local name=${repo##*/}
@@ -49,7 +49,6 @@ function ici_resolve_scheme {
     else
         ici_error "Could not parse URL '$url'. It does not match the expected pattern: <scheme>:<resource>#<version>."
     fi
-
 }
 
 function ici_apt_install {
@@ -128,8 +127,8 @@ function ici_import_repository {
 
     ici_install_pkgs_for_command vcs python3-vcstool
 
-    local resolved; resolved=$(ici_resolve_scheme "$url")
-    IFS=" " read -r -a parts <<< "$resolved" # name, type, url, version
+    local parsed; parsed=$(ici_parse_repository_url "$url")
+    IFS=" " read -r -a parts <<< "$parsed" # name, type, url, version
     echo "${parts[*]}"
 
     case "${parts[1]}" in