admincommand: factorise cwd repo root creation with a function that is called everywhere

Author: rjbou

src/client/opamAdminCommand.ml

@@ -16,8 +16,11 @@ open Cmdliner
 
 type command = unit Cmdliner.Term.t * Cmdliner.Cmd.info
 
+(* TODO ORR  maybe better name ? *)
+let cwd_repo_root () = OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ())
+
 let checked_repo_root () =
-  let repo_root = OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ()) in
+  let repo_root =  cwd_repo_root () in
   if not (OpamFilename.exists_dir (OpamRepositoryPath.packages_dir repo_root))
   then
     OpamConsole.error_and_exit `Bad_arguments
@@ -776,8 +779,7 @@ let upgrade_command cli =
     if clear_cache then OpamAdminRepoUpgrade.clear_cache ()
     else match create_mirror with
       | None ->
-        OpamAdminRepoUpgrade.do_upgrade
-          (OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ()));
+        OpamAdminRepoUpgrade.do_upgrade (cwd_repo_root ());
         if OpamFilename.exists (OpamFilename.of_string "index.tar.gz") ||
            OpamFilename.exists (OpamFilename.of_string "urls.txt")
         then
@@ -786,8 +788,7 @@ let upgrade_command cli =
              \n\
             \  opam admin index"
       | Some m ->
-        OpamAdminRepoUpgrade.do_upgrade_mirror
-          (OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ())) m
+        OpamAdminRepoUpgrade.do_upgrade_mirror (cwd_repo_root ()) m
   in
   OpamArg.mk_command  ~cli OpamArg.cli_original command ~doc ~man
     Term.(const cmd $ global_options cli $
@@ -832,7 +833,7 @@ let lint_command cli =
   in
   let cmd global_options short list incl excl ign warn_error () =
     OpamArg.apply_global_options cli global_options;
-    let repo_root = OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ()) in
+    let repo_root = cwd_repo_root () in
     if not (OpamFilename.exists_dir
               OpamFilename.Op.(OpamRepositoryRoot.Dir.to_dir repo_root /
                                "packages"))
@@ -1175,10 +1176,7 @@ let list_command cli =
               List.map (fun x -> Atom x) package_selection);
       ]
     in
-    let st =
-      get_virtual_switch_state
-        (OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ())) env
-    in
+    let st = get_virtual_switch_state (cwd_repo_root ()) env in
     if not format.OpamListCommand.short && filter <> OpamFormula.Empty then
       OpamConsole.msg "# Packages matching: %s\n"
         (OpamListCommand.string_of_formula filter);
@@ -1219,7 +1217,7 @@ let filter_command cli =
       global_options package_selection disjunction state_selection env
       remove dryrun packages () =
     OpamArg.apply_global_options cli global_options;
-    let repo_root = OpamRepositoryRoot.Dir.of_dir (OpamFilename.cwd ()) in
+    let repo_root = cwd_repo_root () in
     let pattern_selector = OpamListCommand.pattern_selector packages in
     let join =
       if disjunction then OpamFormula.ors else OpamFormula.ands