CHANGELOG.md

+# [1.0.0-beta.13](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2024-07-30)
+
+### Bug Fixes
+
+- add support for `--incompatible_use_plus_in_repo_names` ([fc7d485](https://git.gitlab.arm.com/bazel/toolchain_utils/commit/fc7d485887292676b5a87eb51c40f92aa6343b6b))
+
 # [1.0.0-beta.12](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.11...v1.0.0-beta.12) (2024-07-09)
 
 ### Features

MODULE.bazel

 module(
     name = "toolchain_utils",
-    version = "1.0.0-beta.12",
+    version = "1.0.0-beta.13",
     bazel_compatibility = [
         ">=7.0.0",
     ],

e2e/MODULE.bazel.lock

@@ -8,7 +8,8 @@
     "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
     "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
     "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
+    "https://bcr.bazel.build/modules/bazel_features/1.13.0/MODULE.bazel": "c14c33c7c3c730612bdbe14ebbb5e61936b6f11322ea95a6e91cd1ba962f94df",
+    "https://bcr.bazel.build/modules/bazel_features/1.13.0/source.json": "b01f6aaaf93527ff4267421ef416debbd89b3166b70af5c89400c6a95a89c133",
     "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
     "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
     "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
@@ -106,25 +107,6 @@
         },
         "recordedRepoMappingEntries": []
       }
-    },
-    "@@toolchain_utils~//toolchain/export:defs.bzl%toolchain_export": {
-      "general": {
-        "bzlTransitiveDigest": "n2fd+/jiAv/nvvi2WUR+VQxI3aTZGNuhuX/NuFhw5fM=",
-        "usagesDigest": "/fV+WKPqzEZHldreISOyLramUeis7gb+7T4GOZ7+SDo=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "export": {
-            "bzlFile": "@@toolchain_utils~//toolchain/export/symlink:repository.bzl",
-            "ruleClassName": "symlink",
-            "attributes": {
-              "target": "@@_main~_repo_rules~fixture//:fixture"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
     }
   }
 }

toolchain/local/select/repository.bzl

+load("//toolchain:separator.bzl", "SEPARATOR")
 load(":resolve.bzl", resolve = "key")
 
 visibility("//toolchain/...")
@@ -32,10 +33,8 @@ toolchian_local_select(
 }
 
 def canonical(rctx, label):
-    # This is _flaky_, it depends on `MODULE.bazel` repository naming[1]
-    # [1]: https://bazel.build/external/extension#repository_names_and_visibility
-    prefix = "~".join(rctx.name.split("~")[:-1])
-    return "@@{}~{}".format(prefix, label.removeprefix("@"))
+    prefix = SEPARATOR.join(rctx.name.split(SEPARATOR)[:-1])
+    return "@@{}{}{}".format(prefix, SEPARATOR, label.removeprefix("@"))
 
 def implementation(rctx):
     label = resolve(rctx.attr.map, no_match_error = rctx.attr.no_match_error)

toolchain/local/which/repository.bzl

+load("//toolchain:separator.bzl", "SEPARATOR")
 load("//toolchain/local/select:resolve.bzl", resolve = "value")
 
 visibility("//toolchain/...")
@@ -56,8 +57,9 @@ ATTRS = {
 }
 
 def implementation(rctx):
-    program = rctx.attr.program or rctx.attr.name.rsplit("~", 1)[1].removeprefix("which-")
-    target = rctx.attr.target or rctx.attr.name.rsplit("~", 1)[1]
+    name = rctx.attr.name.rsplit(SEPARATOR, 1)[1]
+    program = rctx.attr.program or name.removeprefix("which-")
+    target = rctx.attr.target or name
     basename = rctx.attr.basename or program
     variable = rctx.attr.variable or basename.upper()
     entrypoint = resolve(rctx.attr.entrypoint)

toolchain/resolved/repository.bzl

+load("//toolchain:separator.bzl", "SEPARATOR")
 load("//toolchain:resolved.bzl", _ATTRS = "ATTRS")
 
 visibility("//toolchain/...")
@@ -33,7 +34,7 @@ ATTRS = _ATTRS | {
 }
 
 def implementation(rctx):
-    target = rctx.attr.target or rctx.attr.name.rsplit("~", 1)[1]
+    target = rctx.attr.target or rctx.attr.name.rsplit(SEPARATOR, 1)[1]
     basename = rctx.attr.basename or target.removeprefix("resolved-")
     substitutions = {
         "{{toolchain_type}}": str(rctx.attr.toolchain_type),

toolchain/separator.bzl

+visibility("//...")
+
+SEPARATOR = Label("@local").workspace_name.removesuffix("local")[-1]