Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Unreleased
----------

- Add `dune show` command group which is an alias of `dune describe`. (#7946,
@Alizter)

- Fix printing errors from excerpts whenever character offsets span multiple
lines (#7950, fixes #7905, @rgrinberg)

Expand Down
20 changes: 14 additions & 6 deletions bin/describe/describe.ml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ open Import

- duniverse people for "describe opam-files" *)

let subcommands =
[ Describe_workspace.command
; Describe_external_lib_deps.command
; Describe_opam_files.command
; Describe_pp.command
]

let group =
let doc = "Describe the workspace." in
let man =
Expand All @@ -27,9 +34,10 @@ let group =
in
let info = Cmd.info "describe" ~doc ~man in
let default = Describe_workspace.term in
Cmd.group ~default info
[ Describe_workspace.command
; Describe_external_lib_deps.command
; Describe_opam_files.command
; Describe_pp.command
]
Cmd.group ~default info subcommands

module Show = struct
let group =
let doc = "Command group for showing information about the workspace" in
Cmd.group (Cmd.info ~doc "show") subcommands
end
6 changes: 6 additions & 0 deletions bin/describe/describe.mli
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
open Import

(** Command group for dune describe *)
val group : unit Cmd.t

module Show : sig
(** Command group for dune show (alias of describe) *)
val group : unit Cmd.t
end
1 change: 1 addition & 0 deletions bin/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ let all : _ Cmdliner.Cmd.t list =
[ Ocaml_cmd.group
; Coq.group
; Describe.group
; Describe.Show.group
; Rpc.group
; Internal.group
; Init.group
Expand Down