Remame vcs-git => vcs-git-eio

mbarbin · Sep 20, 2024 · 5a24299 · 5a24299
1 parent 882c054
commit 5a24299
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 32 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ### Changed
 
+- Rename `vcs-git` to `vcs-git-eio` (breaking change).
 - Rename `tree` to `graph` to designate the commit graph of a repository (breaking change).
 - Upgrade to `cmdlang.0.0.5`.
 

diff --git a/dune-project b/dune-project
@@ -116,7 +116,7 @@
    (>= 0.33))
   (vcs
    (= :version))
-  (vcs-git
+  (vcs-git-eio
    (= :version))))
 
 (package
@@ -181,7 +181,7 @@
    (= :version))
   (vcs-arg
    (= :version))
-  (vcs-git
+  (vcs-git-eio
    (= :version))
   (vcs-private-libs-eio
    (= :version))))
@@ -234,7 +234,7 @@
    (= :version))))
 
 (package
- (name vcs-git)
+ (name vcs-git-eio)
  (synopsis "A Git provider for Vcs based on Vcs_git_cli for Eio programs")
  (depends
   (ocaml
@@ -453,7 +453,7 @@
    (= :version))
   (vcs-command
    (= :version))
-  (vcs-git
+  (vcs-git-eio
    (= :version))
   (vcs-git-blocking
    (= :version))

diff --git a/example/dune b/example/dune
@@ -24,7 +24,7 @@
   fpath
   fpath-base
   vcs
-  vcs_git
+  vcs_git_eio
   vcs_git_blocking
   vcs_test_helpers)
  (instrumentation

diff --git a/example/hello_error.ml b/example/hello_error.ml
@@ -26,7 +26,7 @@
 let%expect_test "hello error" =
   Eio_main.run
   @@ fun env ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let invalid_path = Absolute_path.v "/invalid/path" in
   let redact_sexp sexp =
     (* Because the actual error may become too brittle overtime, we actually

diff --git a/example/hello_git_cli.ml b/example/hello_git_cli.ml
@@ -28,7 +28,7 @@ let%expect_test "hello cli" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let hello_file = Vcs.Path_in_repo.v "hello.txt" in
   Vcs.save_file

diff --git a/example/hello_vcs.ml b/example/hello_vcs.ml
@@ -31,7 +31,7 @@ let%expect_test "hello commit" =
   (* To use the [Vcs] API, you need a [vcs] value, which you must obtain from a
      provider. We're using [Vcs_git] for this here. It is a provider based on
      [Eio] and running the [git] command line as an external process. *)
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   (* The next step takes care of creating a fresh repository. We make use of a
      helper library to encapsulate the required steps. *)
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in

diff --git a/lib/vcs/src/vcs.mli b/lib/vcs/src/vcs.mli
@@ -39,7 +39,7 @@ type -'a t = 'a Vcs0.t
 
 (** [create provider] returns a [vcs] that implements a given set of traits.
     Typical users do not use [create] directly, but rather will rely on an
-    actual provider. See for example [Vcs_git.create]. *)
+    actual provider. See for example [Vcs_git_eio.create]. *)
 val create : 'a Provider.t -> 'a t
 
 (** {1 Error handling}

diff --git a/lib/vcs_arg/src/dune b/lib/vcs_arg/src/dune
@@ -15,7 +15,7 @@
   Or_error.Let_syntax
   -open
   Cmdlang)
- (libraries base cmdlang eio fpath fpath-base unix vcs vcs-git)
+ (libraries base cmdlang eio fpath fpath-base unix vcs vcs-git-eio)
  (instrumentation
   (backend bisect_ppx))
  (lint

diff --git a/lib/vcs_arg/src/vcs_arg.ml b/lib/vcs_arg/src/vcs_arg.ml
@@ -68,7 +68,7 @@ module Create_vcs_backend = struct
     | Some ((`Git as vcs), dir) ->
       let vcs =
         match vcs with
-        | `Git -> Vcs_git.create ~env
+        | `Git -> Vcs_git_eio.create ~env
       in
       let repo_root = repo_root dir in
       Some (vcs, repo_root)
@@ -80,7 +80,7 @@ module Context = struct
     { config : Config.t
     ; fs : Eio.Fs.dir_ty Eio.Path.t
     ; cwd : Absolute_path.t
-    ; vcs : Vcs_git.t'
+    ; vcs : Vcs_git_eio.t'
     ; repo_root : Vcs.Repo_root.t
     }
 
@@ -121,7 +121,7 @@ end
 
 module Initialized = struct
   type t =
-    { vcs : Vcs_git.t'
+    { vcs : Vcs_git_eio.t'
     ; repo_root : Vcs.Repo_root.t
     ; context : Context.t
     }

diff --git a/lib/vcs_arg/src/vcs_arg.mli b/lib/vcs_arg/src/vcs_arg.mli
@@ -43,7 +43,7 @@ end
 
 module Initialized : sig
   type t =
-    { vcs : Vcs_git.t'
+    { vcs : Vcs_git_eio.t'
     ; repo_root : Vcs.Repo_root.t
     ; context : Context.t
     }

diff --git a/lib/vcs_command/src/dune b/lib/vcs_command/src/dune
@@ -24,7 +24,7 @@
   fpath-base
   vcs
   vcs-arg
-  vcs-git
+  vcs-git-eio
   vcs-private-libs-eio.eio-writer)
  (instrumentation
   (backend bisect_ppx))

diff --git a/lib/vcs_git/src/dune → lib/vcs_git_eio/src/dune b/lib/vcs_git/src/dune → lib/vcs_git_eio/src/dune
@@ -1,6 +1,6 @@
 (library
- (name vcs_git)
- (public_name vcs-git)
+ (name vcs_git_eio)
+ (public_name vcs-git-eio)
  (flags
   :standard
   -w

diff --git a/lib/vcs_git/src/runtime.ml → lib/vcs_git_eio/src/runtime.ml b/lib/vcs_git/src/runtime.ml → lib/vcs_git_eio/src/runtime.ml
diff --git a/lib/vcs_git/src/runtime.mli → lib/vcs_git_eio/src/runtime.mli b/lib/vcs_git/src/runtime.mli → lib/vcs_git_eio/src/runtime.mli
diff --git a/lib/vcs_git/src/vcs_git.ml → lib/vcs_git_eio/src/vcs_git_eio.ml b/lib/vcs_git/src/vcs_git.ml → lib/vcs_git_eio/src/vcs_git_eio.ml
diff --git a/lib/vcs_git/src/vcs_git.mli → lib/vcs_git_eio/src/vcs_git_eio.mli b/lib/vcs_git/src/vcs_git.mli → lib/vcs_git_eio/src/vcs_git_eio.mli
diff --git a/lib/vcs_git/test/dune → lib/vcs_git_eio/test/dune b/lib/vcs_git/test/dune → lib/vcs_git_eio/test/dune
@@ -1,6 +1,6 @@
 (library
- (name vcs_git_test)
- (public_name vcs-tests.vcs_git_test)
+ (name vcs_git_eio_test)
+ (public_name vcs-tests.vcs_git_eio_test)
  (inline_tests)
  (flags
   :standard
@@ -24,7 +24,7 @@
   fpath
   fpath-base
   vcs
-  vcs_git
+  vcs_git_eio
   vcs_test_helpers)
  (instrumentation
   (backend bisect_ppx))

diff --git a/lib/vcs_git/test/test__hello_commit.ml → lib/vcs_git_eio/test/test__hello_commit.ml b/lib/vcs_git/test/test__hello_commit.ml → lib/vcs_git_eio/test/test__hello_commit.ml
@@ -27,7 +27,7 @@ let%expect_test "hello commit" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let mock_revs = Vcs.Mock_revs.create () in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let hello_file = Vcs.Path_in_repo.v "hello.txt" in

diff --git a/lib/vcs_git/test/test__hello_commit.mli → lib/vcs_git_eio/test/test__hello_commit.mli b/lib/vcs_git/test/test__hello_commit.mli → lib/vcs_git_eio/test/test__hello_commit.mli
diff --git a/lib/vcs_git/test/test__init.ml → lib/vcs_git_eio/test/test__init.ml b/lib/vcs_git/test/test__init.ml → lib/vcs_git_eio/test/test__init.ml
@@ -24,7 +24,7 @@ let%expect_test "init" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let path = Stdlib.Filename.temp_dir ~temp_dir:(Unix.getcwd ()) "vcs" "test" in
   let repo_root =
     Eio.Switch.on_release sw (fun () ->

diff --git a/lib/vcs_git/test/test__init.mli → lib/vcs_git_eio/test/test__init.mli b/lib/vcs_git/test/test__init.mli → lib/vcs_git_eio/test/test__init.mli
diff --git a/lib/vcs_test_helpers/test/dune b/lib/vcs_test_helpers/test/dune
@@ -24,7 +24,7 @@
   fpath
   fpath-base
   vcs
-  vcs_git
+  vcs_git_eio
   vcs_test_helpers)
  (instrumentation
   (backend bisect_ppx))

diff --git a/lib/vcs_test_helpers/test/test__vcs_test_helpers.ml b/lib/vcs_test_helpers/test/test__vcs_test_helpers.ml
@@ -24,7 +24,7 @@ let%expect_test "init_temp_repo" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let hello_file = Vcs.Path_in_repo.v "hello.txt" in
   Vcs.save_file
@@ -64,7 +64,7 @@ let%expect_test "init_temp_repo" =
 let%expect_test "redact_sexp" =
   Eio_main.run
   @@ fun env ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let invalid_path = Absolute_path.v "/invalid/path" in
   let error =
     match Vcs.init vcs ~path:invalid_path with

diff --git a/test/expect/dune b/test/expect/dune
@@ -24,7 +24,7 @@
   fpath
   fpath-base
   vcs
-  vcs_git
+  vcs_git_eio
   vcs_git_blocking
   vcs_test_helpers)
  (instrumentation

diff --git a/test/expect/find_ref.ml b/test/expect/find_ref.ml
@@ -37,7 +37,7 @@ let%expect_test "find ref" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let mock_revs = Vcs.Mock_revs.create () in
   let hello_file = Vcs.Path_in_repo.v "hello.txt" in

diff --git a/test/expect/nonraising_unit_tests.ml b/test/expect/nonraising_unit_tests.ml
@@ -53,7 +53,7 @@ let%expect_test "num stat without lines" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let mock_revs = Vcs.Mock_revs.create () in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let () =

diff --git a/test/expect/num_status_without_lines.ml b/test/expect/num_status_without_lines.ml
@@ -27,7 +27,7 @@ let%expect_test "num stat without lines" =
   @@ fun env ->
   Eio.Switch.run
   @@ fun sw ->
-  let vcs = Vcs_git.create ~env in
+  let vcs = Vcs_git_eio.create ~env in
   let repo_root = Vcs_test_helpers.init_temp_repo ~env ~sw ~vcs in
   let commit_file ~path ~file_contents =
     Vcs.save_file

diff --git a/vcs-arg.opam b/vcs-arg.opam
@@ -24,7 +24,7 @@ depends: [
   "ppx_sexp_value" {>= "v0.17" & < "v0.18"}
   "ppxlib" {>= "0.33"}
   "vcs" {= version}
-  "vcs-git" {= version}
+  "vcs-git-eio" {= version}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/vcs-command.opam b/vcs-command.opam
@@ -30,7 +30,7 @@ depends: [
   "ppxlib" {>= "0.33"}
   "vcs" {= version}
   "vcs-arg" {= version}
-  "vcs-git" {= version}
+  "vcs-git-eio" {= version}
   "vcs-private-libs-eio" {= version}
   "odoc" {with-doc}
 ]

diff --git a/vcs-git.opam → vcs-git-eio.opam b/vcs-git.opam → vcs-git-eio.opam
diff --git a/vcs-tests.opam b/vcs-tests.opam
@@ -44,7 +44,7 @@ depends: [
   "vcs" {= version}
   "vcs-arg" {= version}
   "vcs-command" {= version}
-  "vcs-git" {= version}
+  "vcs-git-eio" {= version}
   "vcs-git-blocking" {= version}
   "vcs-git-cli" {= version}
   "vcs-private-libs-base" {= version}