( )⚙ D11403 rhg: fall back if subrepos are detected

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11403

rhg: fall back if subrepos are detected
ClosedPublic

Authored by Alphare on Sep 13 2021, 11:39 AM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHGba773bd99203: rhg: fall back if subrepos are detected
Summary

We do not handle subrepos yet, the addition of the support for -r . will
break if we don't fall back.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Sep 13 2021, 11:39 AM
SimonSapin accepted this revision.Sep 14 2021, 11:15 AM
Alphare added a commit: rHGba773bd99203: rhg: fall back if subrepos are detected.Oct 1 2021, 9:22 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGba773bd99203: rhg: fall back if subrepos are detected (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (9 lines)
Mtests/test-rhg.t (9 lines)

Diff 30217

rust/rhg/src/main.rs

.expect("no subcommand arguments from clap despite AppSettings::SubcommandRequired"); .expect("no subcommand arguments from clap despite AppSettings::SubcommandRequired");
let invocation = CliInvocation { let invocation = CliInvocation {
ui, ui,
subcommand_args, subcommand_args,
config, config,
repo, repo,
}; };
if let Ok(repo) = repo {
// We don't support subrepos, fallback if the subrepos file is present
if repo.working_directory_vfs().join(".hgsub").exists() {
let msg = "subrepos (.hgsub is present)";
return Err(CommandError::unsupported(msg));
}
}
let blackbox = blackbox::Blackbox::new(&invocation, process_start_time)?; let blackbox = blackbox::Blackbox::new(&invocation, process_start_time)?;
blackbox.log_command_start(); blackbox.log_command_start();
let result = run(&invocation); let result = run(&invocation);
blackbox.log_command_end(exit_code( blackbox.log_command_end(exit_code(
&result, &result,
// TODO: show a warning or combine with original error if `get_bool` // TODO: show a warning or combine with original error if `get_bool`
// returns an error // returns an error
config config

tests/test-rhg.t

$ echo "[blackbox]" >> $HGRCPATH $ echo "[blackbox]" >> $HGRCPATH
$ echo "maxsize = 1" >> $HGRCPATH $ echo "maxsize = 1" >> $HGRCPATH
$ $NO_FALLBACK rhg files > /dev/null $ $NO_FALLBACK rhg files > /dev/null
$ cat .hg/blackbox.log $ cat .hg/blackbox.log
????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files exited 0 after 0.??? seconds (glob) ????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files exited 0 after 0.??? seconds (glob)
$ cat .hg/blackbox.log.1 $ cat .hg/blackbox.log.1
????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files (glob) ????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files (glob)
Subrepos are not supported
$ touch .hgsub
$ $NO_FALLBACK rhg files
unsupported feature: subrepos (.hgsub is present)
[252]
$ rhg files
a
$ rm .hgsub