author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Tue, 11 Mar 2025 02:29:42 +0100 | |
branch | stable |
changeset 53042 | cdd7bf612c7b |
parent 52541 | f33f37accb43 |
permissions | -rw-r--r-- |
46434
3e2d539d0d1a
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field
Simon Sapin <simon.sapin@octobus.net>
parents:
46167
diff
changeset
|
1 |
use crate::error::CommandError; |
52541
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
2 |
use crate::utils::path_utils::resolve_file_args; |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
3 |
use clap::Arg; |
46744
b1f2c2b336ec
rhg: `cat` command: print error messages for missing files
Simon Sapin <simon.sapin@octobus.net>
parents:
46740
diff
changeset
|
4 |
use format_bytes::format_bytes; |
46436
252d1bdba33d
rhg: replace `map_*_error` functions with `From` impls
Simon Sapin <simon.sapin@octobus.net>
parents:
46434
diff
changeset
|
5 |
use hg::operations::cat; |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
6 |
use std::ffi::OsString; |
45542
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
7 |
|
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
8 |
pub const HELP_TEXT: &str = " |
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
9 |
Output the current or given revision of files |
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
10 |
"; |
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
11 |
|
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
12 |
pub fn args() -> clap::Command { |
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
13 |
clap::command!("cat") |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
14 |
.arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
15 |
Arg::new("rev") |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
16 |
.help("search the repository as it is in REV") |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
17 |
.short('r') |
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
18 |
.long("rev") |
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
19 |
.value_name("REV"), |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
20 |
) |
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
21 |
.arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
22 |
clap::Arg::new("files") |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
23 |
.required(true) |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
24 |
.num_args(1..) |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
25 |
.value_name("FILE") |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49631
diff
changeset
|
26 |
.value_parser(clap::value_parser!(std::ffi::OsString)) |
48172
08c8cd2527bc
rhg: in rhg cat cli, fix the long name of the --rev flag
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48074
diff
changeset
|
27 |
.help("Files to output"), |
46501
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
28 |
) |
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
29 |
.about(HELP_TEXT) |
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
30 |
} |
1ecaf09d9964
rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents:
46500
diff
changeset
|
31 |
|
49913
c15b415d1bff
rust: use `logging_timer` instead of `micro_timer`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49640
diff
changeset
|
32 |
#[logging_timer::time("trace")] |
46592
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46503
diff
changeset
|
33 |
pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { |
50765
067edf5083a1
rhg: use default configitem in `cat`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49914
diff
changeset
|
34 |
let cat_enabled = invocation.config.get_bool(b"rhg", b"cat")?; |
067edf5083a1
rhg: use default configitem in `cat`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49914
diff
changeset
|
35 |
if !cat_enabled { |
48308
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
36 |
return Err(CommandError::unsupported( |
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
37 |
"cat is disabled in rhg (enable it with 'rhg.cat = true' \ |
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
38 |
or enable fallback with 'rhg.on-unsupported = fallback')", |
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
39 |
)); |
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
40 |
} |
698b70b9e8ea
rhg: make it possible to opt out of `rhg cat`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48237
diff
changeset
|
41 |
|
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
42 |
let repo = invocation.repo?; |
48074
4a6fa6b6f079
rhg-cat: fallback in presence of a fileset
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48073
diff
changeset
|
43 |
|
52541
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
44 |
let rev = invocation.subcommand_args.get_one::<String>("rev"); |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
45 |
let files = match invocation.subcommand_args.get_many::<OsString>("files") |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
46 |
{ |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
47 |
None => vec![], |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
48 |
Some(files) => resolve_file_args(repo, files)?, |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
49 |
}; |
f33f37accb43
rhg: add resolve_file_args to path_utils.rs
Mitchell Kember <mkember@janestreet.com>
parents:
52343
diff
changeset
|
50 |
|
48237
027ebad952ac
rhg: internally, return a structured representation from hg cat
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48224
diff
changeset
|
51 |
let files = files.iter().map(|file| file.as_ref()).collect(); |
48072
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
52 |
// TODO probably move this to a util function like `repo.default_rev` or |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
53 |
// something when it's used somewhere else |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
54 |
let rev = match rev { |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
55 |
Some(r) => r.to_string(), |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
56 |
None => format!("{:x}", repo.dirstate_parents()?.p1), |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
57 |
}; |
45542
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
58 |
|
52343
393ad2685fb4
rust: make RevlogError AmbiguousPrefix case contain the actual prefix
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51117
diff
changeset
|
59 |
let output = cat(repo, &rev, files)?; |
48237
027ebad952ac
rhg: internally, return a structured representation from hg cat
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48224
diff
changeset
|
60 |
for (_file, contents) in output.results { |
027ebad952ac
rhg: internally, return a structured representation from hg cat
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48224
diff
changeset
|
61 |
invocation.ui.write_stdout(&contents)?; |
027ebad952ac
rhg: internally, return a structured representation from hg cat
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48224
diff
changeset
|
62 |
} |
48072
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
63 |
if !output.missing.is_empty() { |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
64 |
let short = format!("{:x}", output.node.short()).into_bytes(); |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
65 |
for path in &output.missing { |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
66 |
invocation.ui.write_stderr(&format_bytes!( |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
67 |
b"{}: no such file in rev {}\n", |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
68 |
path.as_bytes(), |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
69 |
short |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
70 |
))?; |
46500
184e46550dc8
rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents:
46484
diff
changeset
|
71 |
} |
48072
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
72 |
} |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
73 |
if output.found_any { |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
74 |
Ok(()) |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
75 |
} else { |
d919b0ca8449
rhg: add support for calling `rhg cat` without a revision
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46744
diff
changeset
|
76 |
Err(CommandError::Unsuccessful) |
45542
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
77 |
} |
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff
changeset
|
78 |
} |