switch: make opam switch repo links parsing consistent

new behaviour in 2.3, old behaviour is stil available with cli < 2.3

master_changes.md

@@ -42,6 +42,7 @@ users)
 
 ## Switch
   * ◈ Add `opam switch import --deps-only` option to install only dependencies of root package at import [#5388 @rjbou - fix #5200]
+  * [BUG] Make accepted `--repos` URLs on creation consistent with `opam repository` [#6091 @Keryan-dev - fix #4673]
 
 ## Config
 

src/client/opamCommands.ml

@@ -2557,7 +2557,7 @@ let repository cli =
 (* From a list of strings (either "repo_name" or "repo_name=URL"), configure the
    repos with URLs if possible, and return the updated repos_state and selection of
    repositories *)
-let with_repos_rt gt repos f =
+let with_repos_rt gt cli repos f =
   OpamRepositoryState.with_ `Lock_none gt @@ fun rt ->
   let repos, rt =
   match repos with
@@ -2574,9 +2574,10 @@ let with_repos_rt gt repos f =
       OpamStd.List.filter_map (function
           | (_, None) -> None
           | (n, Some url) ->
+            let handle_suffix = OpamCLIVersion.Op.(cli @>= cli2_3) in
             let repo =
               OpamStd.Option.Op.(
-                OpamUrl.parse_opt ~handle_suffix:false ~from_file:false url
+                OpamUrl.parse_opt ~handle_suffix ~from_file:false url
                 >>| fun u -> n, u)
             in
             if repo = None then
@@ -2720,9 +2721,11 @@ let switch cli =
           This scans the current directory for package definitions, chooses a \
           compatible compiler, creates a local switch and installs the local \
           package dependencies.";
-      `Pre "    opam switch create trunk --repos \
-            default,beta=git+https://github.com/ocaml/ocaml-beta-repository.git \
-            ocaml-variants.4.10.0+trunk";
+      `Pre (Printf.sprintf
+              "    opam switch create trunk --repos \
+               default,beta=%shttps://github.com/ocaml/ocaml-beta-repository.git \
+               ocaml-variants.4.10.0+trunk"
+              (if OpamCLIVersion.Op.(cli @>= cli2_3) then "" else "git+"));
       `P "Create a new switch called \"trunk\", with \
           $(b,ocaml-variants.4.10.0+trunk) as compiler, with a new $(i,beta) \
           repository bound to the given URL selected besides the default one."
@@ -2869,7 +2872,7 @@ let switch cli =
       `Ok ()
     | Some `list_available, pattlist ->
       OpamGlobalState.with_ `Lock_none @@ fun gt ->
-      with_repos_rt gt repos @@ fun (repos, rt) ->
+      with_repos_rt gt cli repos @@ fun (repos, rt) ->
       let compilers = OpamSwitchCommand.get_compiler_packages ?repos rt in
       let st = OpamSwitchState.load_virtual ?repos_list:repos gt rt in
       OpamConsole.msg "# Listing available compilers from repositories: %s\n"
@@ -2909,7 +2912,7 @@ let switch cli =
       `Ok ()
     | Some `install, switch_arg::params ->
       OpamGlobalState.with_ `Lock_write @@ fun gt ->
-      with_repos_rt gt repos @@ fun (repos, rt) ->
+      with_repos_rt gt cli repos @@ fun (repos, rt) ->
       let switch = OpamSwitch.of_string switch_arg in
       let use_local =
         not no_install && not empty && OpamSwitch.is_external switch
@@ -2999,7 +3002,7 @@ let switch cli =
         else Some (OpamFile.make (OpamFilename.of_string filename))
       in
       if is_new_switch then
-        with_repos_rt gt repos @@ fun (repos, rt) ->
+        with_repos_rt gt cli repos @@ fun (repos, rt) ->
         let synopsis = "Import from " ^ Filename.basename filename in
         let (), gt =
           OpamGlobalState.with_write_lock gt @@ fun gt ->

tests/reftests/switch-creation.test

@@ -51,6 +51,9 @@ ${BASEDIR}/OPAM/undef-switch
 ### # expects a warning, useful to check chosen backend
 ### opam switch create w-repo --repositories=from-link=https://github.com/ocaml/opam-repository.git --dry-run --empty
 Creating repository from-link...
-[ERROR] Could not update repository "from-link": OpamDownload.Download_fail(_, "curl: empty response while downloading https://github.com/ocaml/opam-repository.git/index.tar.gz")
-[ERROR] Initial fetch of these repositories failed: from-link
-# Return code 40 #
+[from-link] Initialised
+[WARNING] The repository 'from-link' at git+https://github.com/ocaml/opam-repository.git doesn't have a 'repo' file, and might not be compatible with this version of opam.
+[NOTE] Repository at git+https://github.com/ocaml/opam-repository.git doesn't define its version, assuming it's 1.2.
+
+<><> Upgrading repositories from older opam format ><><><><><><><><><><><><><><>
+Upgrading repository "from-link"...