Mercurial > hg
annotate rust/rhg/src/main.rs @ 50809:53d77f96e049
rhg: tweak rhg fallback code structure
The goal here is to share the code that accesses the config setting,
but also move it to the top-level, so that we can more easily change
this code later.
(in fact in Jane Street we want to make it choose chg in some cases)
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Fri, 28 Jul 2023 17:08:37 +0100 |
parents | 8ff187fbbfea |
children | 12476986d89c |
rev | line source |
---|---|
45530
b1cea0dc9db0
rhg: Add debug timing
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45529
diff
changeset
|
1 extern crate log; |
48336
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
2 use crate::error::CommandError; |
48770
f19be290756a
rhg: signal when falling back in logs
Raphaël Gomès <rgomes@octobus.net>
parents:
48734
diff
changeset
|
3 use crate::ui::{local_to_utf8, Ui}; |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
4 use clap::{command, Arg, ArgMatches}; |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
5 use format_bytes::{format_bytes, join}; |
49512
6939d5ed20e0
rhg: central treatment of PLAIN and PLAINEXCEPT
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49506
diff
changeset
|
6 use hg::config::{Config, ConfigSource, PlainInfo}; |
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
7 use hg::repo::{Repo, RepoError}; |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
8 use hg::utils::files::{get_bytes_from_os_str, get_path_from_bytes}; |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
9 use hg::utils::SliceExt; |
49192
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
10 use hg::{exit_codes, requirements}; |
49512
6939d5ed20e0
rhg: central treatment of PLAIN and PLAINEXCEPT
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49506
diff
changeset
|
11 use std::borrow::Cow; |
48439
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
12 use std::collections::HashSet; |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
13 use std::ffi::OsString; |
49149
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
14 use std::os::unix::prelude::CommandExt; |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
15 use std::path::PathBuf; |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
16 use std::process::Command; |
45050
18f8d3b31baa
rhg: add a limited `rhg root` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45049
diff
changeset
|
17 |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
18 mod blackbox; |
48733
39c447e03dbc
rhg: Add support for colored output
Simon Sapin <simon.sapin@octobus.net>
parents:
48732
diff
changeset
|
19 mod color; |
44982
bacf6c7ef01b
rhg: add Command trait for subcommands implemented by rhg
Antoine Cezar <antoine.cezar@octobus.net>
parents:
44981
diff
changeset
|
20 mod error; |
45049
513b3ef277a3
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`
Antoine Cezar <antoine.cezar@octobus.net>
parents:
44982
diff
changeset
|
21 mod ui; |
48174
9ecf802b06e0
rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents:
48077
diff
changeset
|
22 pub mod utils { |
9ecf802b06e0
rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents:
48077
diff
changeset
|
23 pub mod path_utils; |
9ecf802b06e0
rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents:
48077
diff
changeset
|
24 } |
44981 | 25 |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
26 fn main_with_result( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
27 argv: Vec<OsString>, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
28 process_start_time: &blackbox::ProcessStartTime, |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
29 ui: &ui::Ui, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
30 repo: Result<&Repo, &NoRepoInCwdError>, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
31 config: &Config, |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
32 ) -> Result<(), CommandError> { |
48734
3e2b4bb286e7
rhg: Colorize `rhg status` output when appropriate
Simon Sapin <simon.sapin@octobus.net>
parents:
48733
diff
changeset
|
33 check_unsupported(config, repo)?; |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
34 |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
35 let app = command!() |
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
36 .subcommand_required(true) |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
37 .arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
38 Arg::new("repository") |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
39 .help("repository root directory") |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
40 .short('R') |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
41 .value_name("REPO") |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
42 // Both ok: `hg -R ./foo log` or `hg log -R ./foo` |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
43 .global(true), |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
44 ) |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
45 .arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
46 Arg::new("config") |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
47 .help("set/override config option (use 'section.name=value')") |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
48 .value_name("CONFIG") |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
49 .global(true) |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
50 .long("config") |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
51 // Ok: `--config section.key1=val --config section.key2=val2` |
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
52 // Not ok: `--config section.key1=val section.key2=val2` |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
53 .action(clap::ArgAction::Append), |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
54 ) |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
55 .arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
56 Arg::new("cwd") |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
57 .help("change working directory") |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
58 .value_name("DIR") |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
59 .long("cwd") |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
60 .global(true), |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
61 ) |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
62 .arg( |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
63 Arg::new("color") |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
64 .help("when to colorize (boolean, always, auto, never, or debug)") |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
65 .value_name("TYPE") |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
66 .long("color") |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
67 .global(true), |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
68 ) |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
69 .version("0.0.1"); |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
70 let app = add_subcommand_args(app); |
45050
18f8d3b31baa
rhg: add a limited `rhg root` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45049
diff
changeset
|
71 |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
72 let matches = app.try_get_matches_from(argv.iter())?; |
46503
d8730ff51d5a
rhg: Add support for -R and --repository command-line arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46502
diff
changeset
|
73 |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
74 let (subcommand_name, subcommand_args) = |
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
75 matches.subcommand().expect("subcommand required"); |
48075
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
76 |
48076
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
77 // Mercurial allows users to define "defaults" for commands, fallback |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
78 // if a default is detected for the current command |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
79 let defaults = config.get_str(b"defaults", subcommand_name.as_bytes()); |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
80 if defaults?.is_some() { |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
81 let msg = "`defaults` config set"; |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
82 return Err(CommandError::unsupported(msg)); |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
83 } |
b44e1184b7e1
rhg: fallback if `defaults` config is set for the current command
Raphaël Gomès <rgomes@octobus.net>
parents:
48075
diff
changeset
|
84 |
48075
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
85 for prefix in ["pre", "post", "fail"].iter() { |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
86 // Mercurial allows users to define generic hooks for commands, |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
87 // fallback if any are detected |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
88 let item = format!("{}-{}", prefix, subcommand_name); |
50764
8ff187fbbfea
rust-config: add config getters that don't fall back to defaults
Raphaël Gomès <rgomes@octobus.net>
parents:
50321
diff
changeset
|
89 let hook_for_command = |
8ff187fbbfea
rust-config: add config getters that don't fall back to defaults
Raphaël Gomès <rgomes@octobus.net>
parents:
50321
diff
changeset
|
90 config.get_str_no_default(b"hooks", item.as_bytes())?; |
48075
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
91 if hook_for_command.is_some() { |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
92 let msg = format!("{}-{} hook defined", prefix, subcommand_name); |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
93 return Err(CommandError::unsupported(msg)); |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
94 } |
f11f233546ce
rhg: fallback if the current command has any generic hook defined
Raphaël Gomès <rgomes@octobus.net>
parents:
47951
diff
changeset
|
95 } |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
96 let run = subcommand_run_fn(subcommand_name) |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
97 .expect("unknown subcommand name from clap despite Command::subcommand_required"); |
45050
18f8d3b31baa
rhg: add a limited `rhg root` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45049
diff
changeset
|
98 |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
99 let invocation = CliInvocation { |
46592
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
100 ui, |
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
101 subcommand_args, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
102 config, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
103 repo, |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
104 }; |
48077
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
105 |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
106 if let Ok(repo) = repo { |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
107 // We don't support subrepos, fallback if the subrepos file is present |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
108 if repo.working_directory_vfs().join(".hgsub").exists() { |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
109 let msg = "subrepos (.hgsub is present)"; |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
110 return Err(CommandError::unsupported(msg)); |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
111 } |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
112 } |
ba773bd99203
rhg: fall back if subrepos are detected
Raphaël Gomès <rgomes@octobus.net>
parents:
48076
diff
changeset
|
113 |
48415
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
114 if config.is_extension_enabled(b"blackbox") { |
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
115 let blackbox = |
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
116 blackbox::Blackbox::new(&invocation, process_start_time)?; |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
117 blackbox.log_command_start(argv.iter()); |
48415
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
118 let result = run(&invocation); |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
119 blackbox.log_command_end( |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
120 argv.iter(), |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
121 exit_code( |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
122 &result, |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
123 // TODO: show a warning or combine with original error if |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
124 // `get_bool` returns an error |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
125 config |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
126 .get_bool(b"ui", b"detailed-exit-code") |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
127 .unwrap_or(false), |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
128 ), |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
129 ); |
48415
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
130 result |
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
131 } else { |
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
132 run(&invocation) |
9ff246cd6200
rhg: don't run `blackbox` if not activated
Raphaël Gomès <rgomes@octobus.net>
parents:
48409
diff
changeset
|
133 } |
46591
21d3b40b4c0e
rhg: Remove error message on unsupported CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46505
diff
changeset
|
134 } |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
135 |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
136 fn rhg_main(argv: Vec<OsString>) -> ! { |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
137 // Run this first, before we find out if the blackbox extension is even |
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
138 // enabled, in order to include everything in-between in the duration |
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
139 // measurements. Reading config files can be slow if they’re on NFS. |
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
140 let process_start_time = blackbox::ProcessStartTime::now(); |
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
141 |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
142 env_logger::init(); |
46591
21d3b40b4c0e
rhg: Remove error message on unsupported CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46505
diff
changeset
|
143 |
50321
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
144 // Make sure nothing in a future version of `rhg` sets the global |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
145 // threadpool before we can cap default threads. (This is also called |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
146 // in core because Python uses the same code path, we're adding a |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
147 // redundant check.) |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
148 hg::utils::cap_default_rayon_threads() |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
149 .expect("Rayon threadpool already initialized"); |
14b57943ae6d
rust: fix thread cap (for real this time)
Raphaël Gomès <rgomes@octobus.net>
parents:
49931
diff
changeset
|
150 |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
151 let early_args = EarlyArgs::parse(&argv); |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
152 |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
153 let initial_current_dir = early_args.cwd.map(|cwd| { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
154 let cwd = get_path_from_bytes(&cwd); |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
155 std::env::current_dir() |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
156 .and_then(|initial| { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
157 std::env::set_current_dir(cwd)?; |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
158 Ok(initial) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
159 }) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
160 .unwrap_or_else(|error| { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
161 exit( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
162 &argv, |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
163 &None, |
48731
f591b377375f
rhg: Make Ui::new falliable, add Ui::new_infallible
Simon Sapin <simon.sapin@octobus.net>
parents:
48730
diff
changeset
|
164 &Ui::new_infallible(&Config::empty()), |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
165 OnUnsupported::Abort, |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
166 Err(CommandError::abort(format!( |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
167 "abort: {}: '{}'", |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
168 error, |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
169 cwd.display() |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
170 ))), |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
171 false, |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
172 ) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
173 }) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
174 }); |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
175 |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
176 let mut non_repo_config = |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
177 Config::load_non_repo().unwrap_or_else(|error| { |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
178 // Normally this is decided based on config, but we don’t have that |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
179 // available. As of this writing config loading never returns an |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
180 // "unsupported" error but that is not enforced by the type system. |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
181 let on_unsupported = OnUnsupported::Abort; |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
182 |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
183 exit( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
184 &argv, |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
185 &initial_current_dir, |
48731
f591b377375f
rhg: Make Ui::new falliable, add Ui::new_infallible
Simon Sapin <simon.sapin@octobus.net>
parents:
48730
diff
changeset
|
186 &Ui::new_infallible(&Config::empty()), |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
187 on_unsupported, |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
188 Err(error.into()), |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
189 false, |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
190 ) |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
191 }); |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
192 |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
193 non_repo_config |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
194 .load_cli_args(early_args.config, early_args.color) |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
195 .unwrap_or_else(|error| { |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
196 exit( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
197 &argv, |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
198 &initial_current_dir, |
48731
f591b377375f
rhg: Make Ui::new falliable, add Ui::new_infallible
Simon Sapin <simon.sapin@octobus.net>
parents:
48730
diff
changeset
|
199 &Ui::new_infallible(&non_repo_config), |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
200 OnUnsupported::from_config(&non_repo_config), |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
201 Err(error.into()), |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
202 non_repo_config |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
203 .get_bool(b"ui", b"detailed-exit-code") |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
204 .unwrap_or(false), |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
205 ) |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
206 }); |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47405
diff
changeset
|
207 |
46729
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
208 if let Some(repo_path_bytes) = &early_args.repo { |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
209 lazy_static::lazy_static! { |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
210 static ref SCHEME_RE: regex::bytes::Regex = |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
211 // Same as `_matchscheme` in `mercurial/util.py` |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
212 regex::bytes::Regex::new("^[a-zA-Z0-9+.\\-]+:").unwrap(); |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
213 } |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
214 if SCHEME_RE.is_match(repo_path_bytes) { |
46729
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
215 exit( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
216 &argv, |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
217 &initial_current_dir, |
48731
f591b377375f
rhg: Make Ui::new falliable, add Ui::new_infallible
Simon Sapin <simon.sapin@octobus.net>
parents:
48730
diff
changeset
|
218 &Ui::new_infallible(&non_repo_config), |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
219 OnUnsupported::from_config(&non_repo_config), |
46729
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
220 Err(CommandError::UnsupportedFeature { |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
221 message: format_bytes!( |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
222 b"URL-like --repository {}", |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
223 repo_path_bytes |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
224 ), |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
225 }), |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
226 // TODO: show a warning or combine with original error if |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
227 // `get_bool` returns an error |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
228 non_repo_config |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
229 .get_bool(b"ui", b"detailed-exit-code") |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
230 .unwrap_or(false), |
46729
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
231 ) |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
232 } |
6cd9f53aaed8
rhg: Fall back to Python on --repository with an URL
Simon Sapin <simon.sapin@octobus.net>
parents:
46667
diff
changeset
|
233 } |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
234 let repo_arg = early_args.repo.unwrap_or_default(); |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
235 let repo_path: Option<PathBuf> = { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
236 if repo_arg.is_empty() { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
237 None |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
238 } else { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
239 let local_config = { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
240 if std::env::var_os("HGRCSKIPREPO").is_none() { |
47405
88119fffecc8
rhg: look for repository in ancestors also instead of cwd only
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47404
diff
changeset
|
241 // TODO: handle errors from find_repo_root |
88119fffecc8
rhg: look for repository in ancestors also instead of cwd only
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47404
diff
changeset
|
242 if let Ok(current_dir_path) = Repo::find_repo_root() { |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
243 let config_files = vec![ |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
244 ConfigSource::AbsPath( |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
245 current_dir_path.join(".hg/hgrc"), |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
246 ), |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
247 ConfigSource::AbsPath( |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
248 current_dir_path.join(".hg/hgrc-not-shared"), |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
249 ), |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
250 ]; |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
251 // TODO: handle errors from |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
252 // `load_from_explicit_sources` |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
253 Config::load_from_explicit_sources(config_files).ok() |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
254 } else { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
255 None |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
256 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
257 } else { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
258 None |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
259 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
260 }; |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
261 |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
262 let non_repo_config_val = { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
263 let non_repo_val = non_repo_config.get(b"paths", &repo_arg); |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
264 match &non_repo_val { |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
265 Some(val) if !val.is_empty() => home::home_dir() |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
266 .unwrap_or_else(|| PathBuf::from("~")) |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
267 .join(get_path_from_bytes(val)) |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
268 .canonicalize() |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
269 // TODO: handle error and make it similar to python |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
270 // implementation maybe? |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
271 .ok(), |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
272 _ => None, |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
273 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
274 }; |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
275 |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
276 let config_val = match &local_config { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
277 None => non_repo_config_val, |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
278 Some(val) => { |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
279 let local_config_val = val.get(b"paths", &repo_arg); |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
280 match &local_config_val { |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
281 Some(val) if !val.is_empty() => { |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
282 // presence of a local_config assures that |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
283 // current_dir |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
284 // wont result in an Error |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
285 let canpath = hg::utils::current_dir() |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
286 .unwrap() |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
287 .join(get_path_from_bytes(val)) |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
288 .canonicalize(); |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
289 canpath.ok().or(non_repo_config_val) |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
290 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
291 _ => non_repo_config_val, |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
292 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
293 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
294 }; |
49931
fba29deebfe7
rust-clippy: fix remaining warnings in `rhg`
Raphaël Gomès <rgomes@octobus.net>
parents:
49914
diff
changeset
|
295 config_val |
fba29deebfe7
rust-clippy: fix remaining warnings in `rhg`
Raphaël Gomès <rgomes@octobus.net>
parents:
49914
diff
changeset
|
296 .or_else(|| Some(get_path_from_bytes(&repo_arg).to_path_buf())) |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
297 } |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
298 }; |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
299 |
49566
05ef5f097df4
rhg: stop shadowing `exit` function
Raphaël Gomès <rgomes@octobus.net>
parents:
49515
diff
changeset
|
300 let simple_exit = |
49515
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
301 |ui: &Ui, config: &Config, result: Result<(), CommandError>| -> ! { |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
302 exit( |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
303 &argv, |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
304 &initial_current_dir, |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
305 ui, |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
306 OnUnsupported::from_config(config), |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
307 result, |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
308 // TODO: show a warning or combine with original error if |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
309 // `get_bool` returns an error |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
310 non_repo_config |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
311 .get_bool(b"ui", b"detailed-exit-code") |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
312 .unwrap_or(false), |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
313 ) |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
314 }; |
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
315 let early_exit = |config: &Config, error: CommandError| -> ! { |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
316 simple_exit(&Ui::new_infallible(config), config, Err(error)) |
49515
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
317 }; |
47404
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
318 let repo_result = match Repo::find(&non_repo_config, repo_path.to_owned()) |
ebdef6283798
rhg: read [paths] for `--repository` value
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46822
diff
changeset
|
319 { |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
320 Ok(repo) => Ok(repo), |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
321 Err(RepoError::NotFound { at }) if repo_path.is_none() => { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
322 // Not finding a repo is not fatal yet, if `-R` was not given |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
323 Err(NoRepoInCwdError { cwd: at }) |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
324 } |
49515
e84064e88e5d
rhg: share some code
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49514
diff
changeset
|
325 Err(error) => early_exit(&non_repo_config, error.into()), |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
326 }; |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
327 |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
328 let config = if let Ok(repo) = &repo_result { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
329 repo.config() |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
330 } else { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
331 &non_repo_config |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
332 }; |
49512
6939d5ed20e0
rhg: central treatment of PLAIN and PLAINEXCEPT
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49506
diff
changeset
|
333 |
6939d5ed20e0
rhg: central treatment of PLAIN and PLAINEXCEPT
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49506
diff
changeset
|
334 let mut config_cow = Cow::Borrowed(config); |
49513
467d9df98c68
rhg: centralize PlainInfo
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49512
diff
changeset
|
335 config_cow.to_mut().apply_plain(PlainInfo::from_env()); |
49514
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
336 if !ui::plain(Some("tweakdefaults")) |
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
337 && config_cow |
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
338 .as_ref() |
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
339 .get_bool(b"ui", b"tweakdefaults") |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
340 .unwrap_or_else(|error| early_exit(config, error.into())) |
49514
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
341 { |
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
342 config_cow.to_mut().tweakdefaults() |
e37416d432e9
rhg: support tweakdefaults
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49513
diff
changeset
|
343 }; |
49512
6939d5ed20e0
rhg: central treatment of PLAIN and PLAINEXCEPT
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49506
diff
changeset
|
344 let config = config_cow.as_ref(); |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
345 let ui = Ui::new(config) |
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
346 .unwrap_or_else(|error| early_exit(config, error.into())); |
49569
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
347 |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
348 if let Ok(true) = config.get_bool(b"rhg", b"fallback-immediately") { |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
349 exit( |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
350 &argv, |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
351 &initial_current_dir, |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
352 &ui, |
50809
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
353 OnUnsupported::fallback(config), |
49569
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
354 Err(CommandError::unsupported( |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
355 "`rhg.fallback-immediately is true`", |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
356 )), |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
357 false, |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
358 ) |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
359 } |
5318ac25dfdc
rhg: add a config option to fall back immediately
Raphaël Gomès <rgomes@octobus.net>
parents:
49566
diff
changeset
|
360 |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
361 let result = main_with_result( |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
362 argv.iter().map(|s| s.to_owned()).collect(), |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
363 &process_start_time, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
364 &ui, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
365 repo_result.as_ref(), |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
366 config, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
367 ); |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
368 simple_exit(&ui, config, result) |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
369 } |
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
370 |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
371 fn main() -> ! { |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
372 rhg_main(std::env::args_os().collect()) |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
373 } |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
374 |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
375 fn exit_code( |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
376 result: &Result<(), CommandError>, |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
377 use_detailed_exit_code: bool, |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
378 ) -> i32 { |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
379 match result { |
47407
6e49769b7f97
rhg: add exit code to HgError::Abort()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47406
diff
changeset
|
380 Ok(()) => exit_codes::OK, |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
381 Err(CommandError::Abort { |
49488
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
382 detailed_exit_code, .. |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
383 }) => { |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
384 if use_detailed_exit_code { |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
385 *detailed_exit_code |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
386 } else { |
47407
6e49769b7f97
rhg: add exit code to HgError::Abort()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47406
diff
changeset
|
387 exit_codes::ABORT |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
388 } |
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
389 } |
47407
6e49769b7f97
rhg: add exit code to HgError::Abort()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47406
diff
changeset
|
390 Err(CommandError::Unsuccessful) => exit_codes::UNSUCCESSFUL, |
46445
ca3f73cc3cf4
rhg: Simplify CommandError based on its use
Simon Sapin <simon.sapin@octobus.net>
parents:
45923
diff
changeset
|
391 // Exit with a specific code and no error message to let a potential |
ca3f73cc3cf4
rhg: Simplify CommandError based on its use
Simon Sapin <simon.sapin@octobus.net>
parents:
45923
diff
changeset
|
392 // wrapper script fallback to Python-based Mercurial. |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
393 Err(CommandError::UnsupportedFeature { .. }) => { |
47407
6e49769b7f97
rhg: add exit code to HgError::Abort()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47406
diff
changeset
|
394 exit_codes::UNIMPLEMENTED |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
395 } |
49149
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
396 Err(CommandError::InvalidFallback { .. }) => { |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
397 exit_codes::INVALID_FALLBACK |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
398 } |
46601
755c31a1caf9
rhg: Add support for the blackbox extension
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
399 } |
44981 | 400 } |
45529
f17caf8f3fef
rhg: add a limited `rhg debugdata` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45440
diff
changeset
|
401 |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
402 fn exit<'a>( |
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
403 original_args: &'a [OsString], |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
404 initial_current_dir: &Option<PathBuf>, |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
405 ui: &Ui, |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
406 mut on_unsupported: OnUnsupported, |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
407 result: Result<(), CommandError>, |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
408 use_detailed_exit_code: bool, |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
409 ) -> ! { |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
410 if let ( |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
411 OnUnsupported::Fallback { executable }, |
48770
f19be290756a
rhg: signal when falling back in logs
Raphaël Gomès <rgomes@octobus.net>
parents:
48734
diff
changeset
|
412 Err(CommandError::UnsupportedFeature { message }), |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
413 ) = (&on_unsupported, &result) |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
414 { |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
415 let mut args = original_args.iter(); |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
416 let executable = match executable { |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
417 None => { |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
418 exit_no_fallback( |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
419 ui, |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
420 OnUnsupported::Abort, |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
421 Err(CommandError::abort( |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
422 "abort: 'rhg.on-unsupported=fallback' without \ |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
423 'rhg.fallback-executable' set.", |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
424 )), |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
425 false, |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
426 ); |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
427 } |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
428 Some(executable) => executable, |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
429 }; |
49914
58074252db3c
rust: run `cargo clippy`
Raphaël Gomès <rgomes@octobus.net>
parents:
49640
diff
changeset
|
430 let executable_path = get_path_from_bytes(executable); |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
431 let this_executable = args.next().expect("exepcted argv[0] to exist"); |
49931
fba29deebfe7
rust-clippy: fix remaining warnings in `rhg`
Raphaël Gomès <rgomes@octobus.net>
parents:
49914
diff
changeset
|
432 if executable_path == *this_executable { |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
433 // Avoid spawning infinitely many processes until resource |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
434 // exhaustion. |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
435 let _ = ui.write_stderr(&format_bytes!( |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
436 b"Blocking recursive fallback. The 'rhg.fallback-executable = {}' config \ |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
437 points to `rhg` itself.\n", |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
438 executable |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
439 )); |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
440 on_unsupported = OnUnsupported::Abort |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
441 } else { |
48770
f19be290756a
rhg: signal when falling back in logs
Raphaël Gomès <rgomes@octobus.net>
parents:
48734
diff
changeset
|
442 log::debug!("falling back (see trace-level log)"); |
f19be290756a
rhg: signal when falling back in logs
Raphaël Gomès <rgomes@octobus.net>
parents:
48734
diff
changeset
|
443 log::trace!("{}", local_to_utf8(message)); |
49149
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
444 if let Err(err) = which::which(executable_path) { |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
445 exit_no_fallback( |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
446 ui, |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
447 OnUnsupported::Abort, |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
448 Err(CommandError::InvalidFallback { |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
449 path: executable.to_owned(), |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
450 err: err.to_string(), |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
451 }), |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
452 use_detailed_exit_code, |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
453 ) |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
454 } |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
455 // `args` is now `argv[1..]` since we’ve already consumed |
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
456 // `argv[0]` |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
457 let mut command = Command::new(executable_path); |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
458 command.args(args); |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
459 if let Some(initial) = initial_current_dir { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
460 command.current_dir(initial); |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
461 } |
49149
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
462 // We don't use subprocess because proper signal handling is harder |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
463 // and we don't want to keep `rhg` around after a fallback anyway. |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
464 // For example, if `rhg` is run in the background and falls back to |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
465 // `hg` which, in turn, waits for a signal, we'll get stuck if |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
466 // we're doing plain subprocess. |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
467 // |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
468 // If `exec` returns, we can only assume our process is very broken |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
469 // (see its documentation), so only try to forward the error code |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
470 // when exiting. |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
471 let err = command.exec(); |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
472 std::process::exit( |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
473 err.raw_os_error().unwrap_or(exit_codes::ABORT), |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
474 ); |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
475 } |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
476 } |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
477 exit_no_fallback(ui, on_unsupported, result, use_detailed_exit_code) |
46748
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
478 } |
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
479 |
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
480 fn exit_no_fallback( |
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
481 ui: &Ui, |
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
482 on_unsupported: OnUnsupported, |
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
483 result: Result<(), CommandError>, |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
484 use_detailed_exit_code: bool, |
46748
bde90e9b4507
rhg: Remove `rhg.fallback-executable=hg` default configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46746
diff
changeset
|
485 ) -> ! { |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
486 match &result { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
487 Ok(_) => {} |
46744
b1f2c2b336ec
rhg: `cat` command: print error messages for missing files
Simon Sapin <simon.sapin@octobus.net>
parents:
46736
diff
changeset
|
488 Err(CommandError::Unsuccessful) => {} |
49488
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
489 Err(CommandError::Abort { message, hint, .. }) => { |
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
490 // Ignore errors when writing to stderr, we’re already exiting |
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
491 // with failure code so there’s not much more we can do. |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
492 if !message.is_empty() { |
46731
3d692e724d06
rhg: Align config file parse error formatting with Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46729
diff
changeset
|
493 let _ = ui.write_stderr(&format_bytes!(b"{}\n", message)); |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
494 } |
49488
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
495 if let Some(hint) = hint { |
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
496 let _ = ui.write_stderr(&format_bytes!(b"({})\n", hint)); |
9f14126cfc4c
rust: add support for hints in error messages
Raphaël Gomès <rgomes@octobus.net>
parents:
49484
diff
changeset
|
497 } |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
498 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
499 Err(CommandError::UnsupportedFeature { message }) => { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
500 match on_unsupported { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
501 OnUnsupported::Abort => { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
502 let _ = ui.write_stderr(&format_bytes!( |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
503 b"unsupported feature: {}\n", |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
504 message |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
505 )); |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
506 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
507 OnUnsupported::AbortSilent => {} |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
508 OnUnsupported::Fallback { .. } => unreachable!(), |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
509 } |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
510 } |
49149
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
511 Err(CommandError::InvalidFallback { path, err }) => { |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
512 let _ = ui.write_stderr(&format_bytes!( |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
513 b"abort: invalid fallback '{}': {}\n", |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
514 path, |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
515 err.as_bytes(), |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
516 )); |
006688e36e12
rhg: use `Command::exec` instead of `Command::status`
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
517 } |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
518 } |
46820
821929d59e01
rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46748
diff
changeset
|
519 std::process::exit(exit_code(&result, use_detailed_exit_code)) |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
520 } |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
521 |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
522 macro_rules! subcommands { |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
523 ($( $command: ident )+) => { |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
524 mod commands { |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
525 $( |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
526 pub mod $command; |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
527 )+ |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
528 } |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
529 |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
530 fn add_subcommand_args(app: clap::Command) -> clap::Command { |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
531 app |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
532 $( |
46608
4e4c70401028
rhg: Use clap’s support for global CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46601
diff
changeset
|
533 .subcommand(commands::$command::args()) |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
534 )+ |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
535 } |
46484
a6e4e4650bac
rhg: Parse system and user configuration at program start
Simon Sapin <simon.sapin@octobus.net>
parents:
46445
diff
changeset
|
536 |
46592
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
537 pub type RunFn = fn(&CliInvocation) -> Result<(), CommandError>; |
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
538 |
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
539 fn subcommand_run_fn(name: &str) -> Option<RunFn> { |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
540 match name { |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
541 $( |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
542 stringify!($command) => Some(commands::$command::run), |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
543 )+ |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
544 _ => None, |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
545 } |
45542
33ded2d3f4fc
rhg: add a limited `rhg cat -r` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45537
diff
changeset
|
546 } |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
547 }; |
45529
f17caf8f3fef
rhg: add a limited `rhg debugdata` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
45440
diff
changeset
|
548 } |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
549 |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
550 subcommands! { |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
551 cat |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
552 debugdata |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
553 debugrequirements |
48355
6d4daf51283c
rhg: implement the debugignorerhg subcommand
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48353
diff
changeset
|
554 debugignorerhg |
49484
85f5d11c77dd
rhg: add debugrhgsparse command to help figure out bugs in rhg
Raphaël Gomès <rgomes@octobus.net>
parents:
49481
diff
changeset
|
555 debugrhgsparse |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
556 files |
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
557 root |
46505
a25033eb43b5
rhg: add limited support for the `config` sub-command
Simon Sapin <simon.sapin@octobus.net>
parents:
46504
diff
changeset
|
558 config |
46822
c71e8d9e7f2a
rhg: Initial support for the 'status' command
Georges Racinet <georges.racinet@octobus.net>
parents:
46820
diff
changeset
|
559 status |
46502
95d37db31479
rhg: Replace subcommand boilerplate with a macro
Simon Sapin <simon.sapin@octobus.net>
parents:
46501
diff
changeset
|
560 } |
46822
c71e8d9e7f2a
rhg: Initial support for the 'status' command
Georges Racinet <georges.racinet@octobus.net>
parents:
46820
diff
changeset
|
561 |
46592
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
562 pub struct CliInvocation<'a> { |
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
563 ui: &'a Ui, |
49640
37bc3edef76f
rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents:
49569
diff
changeset
|
564 subcommand_args: &'a ArgMatches, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
565 config: &'a Config, |
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
566 /// References inside `Result` is a bit peculiar but allow |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
567 /// `invocation.repo?` to work out with `&CliInvocation` since this |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
568 /// `Result` type is `Copy`. |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
569 repo: Result<&'a Repo, &'a NoRepoInCwdError>, |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
570 } |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
571 |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
572 struct NoRepoInCwdError { |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
573 cwd: PathBuf, |
46592
80840b651721
rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents:
46591
diff
changeset
|
574 } |
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
575 |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
576 /// CLI arguments to be parsed "early" in order to be able to read |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
577 /// configuration before using Clap. Ideally we would also use Clap for this, |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
578 /// see <https://github.com/clap-rs/clap/discussions/2366>. |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
579 /// |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
580 /// These arguments are still declared when we do use Clap later, so that Clap |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
581 /// does not return an error for their presence. |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
582 struct EarlyArgs { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
583 /// Values of all `--config` arguments. (Possibly none) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
584 config: Vec<Vec<u8>>, |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
585 /// Value of all the `--color` argument, if any. |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
586 color: Option<Vec<u8>>, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
587 /// Value of the `-R` or `--repository` argument, if any. |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
588 repo: Option<Vec<u8>>, |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
589 /// Value of the `--cwd` argument, if any. |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
590 cwd: Option<Vec<u8>>, |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
591 } |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
592 |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
593 impl EarlyArgs { |
49070
137a93125902
rhg: refactor to pass argv down, instead of caling args_os()
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48985
diff
changeset
|
594 fn parse<'a>(args: impl IntoIterator<Item = &'a OsString>) -> Self { |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
595 let mut args = args.into_iter().map(get_bytes_from_os_str); |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
596 let mut config = Vec::new(); |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
597 let mut color = None; |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
598 let mut repo = None; |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
599 let mut cwd = None; |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
600 // Use `while let` instead of `for` so that we can also call |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
601 // `args.next()` inside the loop. |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
602 while let Some(arg) = args.next() { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
603 if arg == b"--config" { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
604 if let Some(value) = args.next() { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
605 config.push(value) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
606 } |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
607 } else if let Some(value) = arg.drop_prefix(b"--config=") { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
608 config.push(value.to_owned()) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
609 } |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
610 |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
611 if arg == b"--color" { |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
612 if let Some(value) = args.next() { |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
613 color = Some(value) |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
614 } |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
615 } else if let Some(value) = arg.drop_prefix(b"--color=") { |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
616 color = Some(value.to_owned()) |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
617 } |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
618 |
46736
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
619 if arg == b"--cwd" { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
620 if let Some(value) = args.next() { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
621 cwd = Some(value) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
622 } |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
623 } else if let Some(value) = arg.drop_prefix(b"--cwd=") { |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
624 cwd = Some(value.to_owned()) |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
625 } |
2255e7eb39e5
rhg: Add support for --cwd
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
626 |
46665
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
627 if arg == b"--repository" || arg == b"-R" { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
628 if let Some(value) = args.next() { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
629 repo = Some(value) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
630 } |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
631 } else if let Some(value) = arg.drop_prefix(b"--repository=") { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
632 repo = Some(value.to_owned()) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
633 } else if let Some(value) = arg.drop_prefix(b"-R") { |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
634 repo = Some(value.to_owned()) |
7284b524b441
rhg: Make configuration available as early as possible in main()
Simon Sapin <simon.sapin@octobus.net>
parents:
46608
diff
changeset
|
635 } |
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
636 } |
48732
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
637 Self { |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
638 config, |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
639 color, |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
640 repo, |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
641 cwd, |
d4a5c2197208
rhg: Add parsing for the --color global CLI argument
Simon Sapin <simon.sapin@octobus.net>
parents:
48731
diff
changeset
|
642 } |
46593
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
643 } |
5ce2aa7c2ad5
rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents:
46592
diff
changeset
|
644 } |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
645 |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
646 /// What to do when encountering some unsupported feature. |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
647 /// |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
648 /// See `HgError::UnsupportedFeature` and `CommandError::UnsupportedFeature`. |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
649 enum OnUnsupported { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
650 /// Print an error message describing what feature is not supported, |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
651 /// and exit with code 252. |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
652 Abort, |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
653 /// Silently exit with code 252. |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
654 AbortSilent, |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
655 /// Try running a Python implementation |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
656 Fallback { executable: Option<Vec<u8>> }, |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
657 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
658 |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
659 impl OnUnsupported { |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
660 const DEFAULT: Self = OnUnsupported::Abort; |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
661 |
50809
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
662 fn fallback_executable(config: &Config) -> Option<Vec<u8>> { |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
663 config |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
664 .get(b"rhg", b"fallback-executable") |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
665 .map(|x| x.to_owned()) |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
666 } |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
667 |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
668 fn fallback(config: &Config) -> Self { |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
669 OnUnsupported::Fallback { |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
670 executable: Self::fallback_executable(config), |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
671 } |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
672 } |
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
673 |
48353
8960295b9246
rhg: only complain about poorly configured fallback when falling back
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48340
diff
changeset
|
674 fn from_config(config: &Config) -> Self { |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
675 match config |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
676 .get(b"rhg", b"on-unsupported") |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
677 .map(|value| value.to_ascii_lowercase()) |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
678 .as_deref() |
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
679 { |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
680 Some(b"abort") => OnUnsupported::Abort, |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
681 Some(b"abort-silent") => OnUnsupported::AbortSilent, |
50809
53d77f96e049
rhg: tweak rhg fallback code structure
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50764
diff
changeset
|
682 Some(b"fallback") => Self::fallback(config), |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
683 None => Self::DEFAULT, |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
684 Some(_) => { |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
685 // TODO: warn about unknown config value |
46667
93e9f448273c
rhg: Add support for automatic fallback to Python
Simon Sapin <simon.sapin@octobus.net>
parents:
46666
diff
changeset
|
686 Self::DEFAULT |
46666
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
687 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
688 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
689 } |
33f2d56acc73
rhg: Add a `rhg.on-unsupported` configuration key
Simon Sapin <simon.sapin@octobus.net>
parents:
46665
diff
changeset
|
690 } |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
691 |
48439
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
692 /// The `*` extension is an edge-case for config sub-options that apply to all |
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
693 /// extensions. For now, only `:required` exists, but that may change in the |
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
694 /// future. |
49481
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
695 const SUPPORTED_EXTENSIONS: &[&[u8]] = &[ |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
696 b"blackbox", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
697 b"share", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
698 b"sparse", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
699 b"narrow", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
700 b"*", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
701 b"strip", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
702 b"rebase", |
a0d189b2e871
rhg: don't fallback if `strip` or `rebase` are activated
Raphaël Gomès <rgomes@octobus.net>
parents:
49477
diff
changeset
|
703 ]; |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
704 |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
705 fn check_extensions(config: &Config) -> Result<(), CommandError> { |
48972
6b31c0676147
rhg: add support for ignoring all extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
706 if let Some(b"*") = config.get(b"rhg", b"ignored-extensions") { |
6b31c0676147
rhg: add support for ignoring all extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
707 // All extensions are to be ignored, nothing to do here |
6b31c0676147
rhg: add support for ignoring all extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
708 return Ok(()); |
6b31c0676147
rhg: add support for ignoring all extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
709 } |
6b31c0676147
rhg: add support for ignoring all extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
48770
diff
changeset
|
710 |
48439
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
711 let enabled: HashSet<&[u8]> = config |
49477
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
712 .iter_section(b"extensions") |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
713 .filter_map(|(extension, value)| { |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
714 if value == b"!" { |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
715 // Filter out disabled extensions |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
716 return None; |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
717 } |
48439
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
718 // Ignore extension suboptions. Only `required` exists for now. |
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
719 // `rhg` either supports an extension or doesn't, so it doesn't |
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
720 // make sense to consider the loading of an extension. |
49477
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
721 let actual_extension = |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
722 extension.split_2(b':').unwrap_or((extension, b"")).0; |
f3cd2d6eeef9
rhg: support "!" syntax for disabling extensions
Raphaël Gomès <rgomes@octobus.net>
parents:
49195
diff
changeset
|
723 Some(actual_extension) |
48439
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
724 }) |
9cf5ac8c7109
rhg: support the new extension suboptions syntax
Raphaël Gomès <rgomes@octobus.net>
parents:
48415
diff
changeset
|
725 .collect(); |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
726 |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
727 let mut unsupported = enabled; |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
728 for supported in SUPPORTED_EXTENSIONS { |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
729 unsupported.remove(supported); |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
730 } |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
731 |
47951
cff41e168c25
rhg: Switch rhg.ignored-extensions config to Python-compatible list syntax
Simon Sapin <simon.sapin@octobus.net>
parents:
47407
diff
changeset
|
732 if let Some(ignored_list) = config.get_list(b"rhg", b"ignored-extensions") |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
733 { |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
734 for ignored in ignored_list { |
47951
cff41e168c25
rhg: Switch rhg.ignored-extensions config to Python-compatible list syntax
Simon Sapin <simon.sapin@octobus.net>
parents:
47407
diff
changeset
|
735 unsupported.remove(ignored.as_slice()); |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
736 } |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
737 } |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
738 |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
739 if unsupported.is_empty() { |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
740 Ok(()) |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
741 } else { |
48985
c75dae6e4ca7
rhg: sort unsupported extensions in error message
Raphaël Gomès <rgomes@octobus.net>
parents:
48972
diff
changeset
|
742 let mut unsupported: Vec<_> = unsupported.into_iter().collect(); |
c75dae6e4ca7
rhg: sort unsupported extensions in error message
Raphaël Gomès <rgomes@octobus.net>
parents:
48972
diff
changeset
|
743 // Sort the extensions to get a stable output |
c75dae6e4ca7
rhg: sort unsupported extensions in error message
Raphaël Gomès <rgomes@octobus.net>
parents:
48972
diff
changeset
|
744 unsupported.sort(); |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
745 Err(CommandError::UnsupportedFeature { |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
746 message: format_bytes!( |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
747 b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)", |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
748 join(unsupported, b", ") |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
749 ), |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
750 }) |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
751 } |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46731
diff
changeset
|
752 } |
48336
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
753 |
49192
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
754 /// Array of tuples of (auto upgrade conf, feature conf, local requirement) |
49931
fba29deebfe7
rust-clippy: fix remaining warnings in `rhg`
Raphaël Gomès <rgomes@octobus.net>
parents:
49914
diff
changeset
|
755 #[allow(clippy::type_complexity)] |
49192
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
756 const AUTO_UPGRADES: &[((&str, &str), (&str, &str), &str)] = &[ |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
757 ( |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
758 ("format", "use-share-safe.automatic-upgrade-of-mismatching-repositories"), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
759 ("format", "use-share-safe"), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
760 requirements::SHARESAFE_REQUIREMENT, |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
761 ), |
49194
e4b31016e194
auto-upgrade: introduce a way to auto-upgrade to/from tracked-hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49192
diff
changeset
|
762 ( |
e4b31016e194
auto-upgrade: introduce a way to auto-upgrade to/from tracked-hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49192
diff
changeset
|
763 ("format", "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories"), |
e4b31016e194
auto-upgrade: introduce a way to auto-upgrade to/from tracked-hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49192
diff
changeset
|
764 ("format", "use-dirstate-tracked-hint"), |
e4b31016e194
auto-upgrade: introduce a way to auto-upgrade to/from tracked-hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49192
diff
changeset
|
765 requirements::DIRSTATE_TRACKED_HINT_V1, |
e4b31016e194
auto-upgrade: introduce a way to auto-upgrade to/from tracked-hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49192
diff
changeset
|
766 ), |
49195
411d591e0a27
auto-upgrade: introduce a way to auto-upgrade to/from dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49194
diff
changeset
|
767 ( |
49500
3a53871048dc
rhg: fix bugs around [use-dirstate-tracked-hint] and repo auto-upgrade
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49195
diff
changeset
|
768 ("format", "use-dirstate-v2.automatic-upgrade-of-mismatching-repositories"), |
49195
411d591e0a27
auto-upgrade: introduce a way to auto-upgrade to/from dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49194
diff
changeset
|
769 ("format", "use-dirstate-v2"), |
411d591e0a27
auto-upgrade: introduce a way to auto-upgrade to/from dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49194
diff
changeset
|
770 requirements::DIRSTATE_V2_REQUIREMENT, |
411d591e0a27
auto-upgrade: introduce a way to auto-upgrade to/from dirstate-v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49194
diff
changeset
|
771 ), |
49192
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
772 ]; |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
773 |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
774 /// Mercurial allows users to automatically upgrade their repository. |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
775 /// `rhg` does not have the ability to upgrade yet, so fallback if an upgrade |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
776 /// is needed. |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
777 fn check_auto_upgrade( |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
778 config: &Config, |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
779 reqs: &HashSet<String>, |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
780 ) -> Result<(), CommandError> { |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
781 for (upgrade_conf, feature_conf, local_req) in AUTO_UPGRADES.iter() { |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
782 let auto_upgrade = config |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
783 .get_bool(upgrade_conf.0.as_bytes(), upgrade_conf.1.as_bytes())?; |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
784 |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
785 if auto_upgrade { |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
786 let want_it = config.get_bool( |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
787 feature_conf.0.as_bytes(), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
788 feature_conf.1.as_bytes(), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
789 )?; |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
790 let have_it = reqs.contains(*local_req); |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
791 |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
792 let action = match (want_it, have_it) { |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
793 (true, false) => Some("upgrade"), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
794 (false, true) => Some("downgrade"), |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
795 _ => None, |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
796 }; |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
797 if let Some(action) = action { |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
798 let message = format!( |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
799 "automatic {} {}.{}", |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
800 action, upgrade_conf.0, upgrade_conf.1 |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
801 ); |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
802 return Err(CommandError::unsupported(message)); |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
803 } |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
804 } |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
805 } |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
806 Ok(()) |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
807 } |
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
808 |
48340
d71b9902e2de
rhg: Colored output is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48339
diff
changeset
|
809 fn check_unsupported( |
d71b9902e2de
rhg: Colored output is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48339
diff
changeset
|
810 config: &Config, |
48510
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
811 repo: Result<&Repo, &NoRepoInCwdError>, |
48340
d71b9902e2de
rhg: Colored output is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48339
diff
changeset
|
812 ) -> Result<(), CommandError> { |
48336
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
813 check_extensions(config)?; |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
814 |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
815 if std::env::var_os("HG_PENDING").is_some() { |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
816 // TODO: only if the value is `== repo.working_directory`? |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
817 // What about relative v.s. absolute paths? |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
818 Err(CommandError::unsupported("$HG_PENDING"))? |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
819 } |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
820 |
48510
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
821 if let Ok(repo) = repo { |
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
822 if repo.has_subrepos()? { |
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
823 Err(CommandError::unsupported("sub-repositories"))? |
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
824 } |
49192
2ab79873786e
auto-upgrade: introduce a way to auto-upgrade to/from share-safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49164
diff
changeset
|
825 check_auto_upgrade(config, repo.requirements())?; |
48510
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
826 } |
7f633432ca92
rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
827 |
48339
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
828 if config.has_non_empty_section(b"encode") { |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
829 Err(CommandError::unsupported("[encode] config"))? |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
830 } |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
831 |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
832 if config.has_non_empty_section(b"decode") { |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
833 Err(CommandError::unsupported("[decode] config"))? |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
834 } |
a2e278b5e265
rhg: [encode] and [decode] config sections are not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48336
diff
changeset
|
835 |
48336
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
836 Ok(()) |
5b9865032533
rhg: $HG_PENDING is not supported
Simon Sapin <simon.sapin@octobus.net>
parents:
48174
diff
changeset
|
837 } |