This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11758

rhg: $HG_PENDING is not supported
ClosedPublic

Authored by SimonSapin on Nov 15 2021, 12:41 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5b9865032533: rhg: $HG_PENDING is not supported
Summary

Trigger fallback in that case, if configured to do so.

Diff Detail

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

Event Timeline

SimonSapin created this revision.Nov 15 2021, 12:41 PM
Alphare requested changes to this revision.Nov 24 2021, 6:22 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
rust/rhg/src/main.rs
616

That seems unrelated? How did this format change occur?

This revision now requires changes to proceed.Nov 24 2021, 6:22 AM
SimonSapin marked an inline comment as done.Nov 25 2021, 10:30 AM
SimonSapin added inline comments.
rust/rhg/src/main.rs
616

Uh, good question. I don’t remember doing this manually, and it doesn’t reappear when I undo it and run cargo +nightly-2021-11-02 fmt --all again.

Alphare accepted this revision.Nov 26 2021, 9:44 AM
This revision is now accepted and ready to land.Nov 26 2021, 9:44 AM
SimonSapin marked an inline comment as done.Nov 26 2021, 10:02 AM
SimonSapin added a commit: rHG5b9865032533: rhg: $HG_PENDING is not supported.
Closed by commit rHG5b9865032533: rhg: $HG_PENDING is not supported (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 31156.Nov 26 2021, 10:32 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (16 lines)
Mtests/test-import.t (4 lines)

Diff 31156

rust/rhg/src/main.rs

extern crate log; extern crate log;
use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::Ui;
use clap::App; use clap::App;
use clap::AppSettings; use clap::AppSettings;
use clap::Arg; use clap::Arg;
use clap::ArgMatches; use clap::ArgMatches;
use format_bytes::{format_bytes, join}; use format_bytes::{format_bytes, join};
use hg::config::{Config, ConfigSource}; use hg::config::{Config, ConfigSource};
use hg::exit_codes; use hg::exit_codes;
use hg::repo::{Repo, RepoError}; use hg::repo::{Repo, RepoError};
use hg::utils::files::{get_bytes_from_os_str, get_path_from_bytes}; use hg::utils::files::{get_bytes_from_os_str, get_path_from_bytes};
use hg::utils::SliceExt; use hg::utils::SliceExt;
use std::ffi::OsString; use std::ffi::OsString;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
mod blackbox; mod blackbox;
mod error; mod error;
mod ui; mod ui;
pub mod utils { pub mod utils {
pub mod path_utils; pub mod path_utils;
} }
use error::CommandError;
fn main_with_result( fn main_with_result(
process_start_time: &blackbox::ProcessStartTime, process_start_time: &blackbox::ProcessStartTime,
ui: &ui::Ui, ui: &ui::Ui,
repo: Result<&Repo, &NoRepoInCwdError>, repo: Result<&Repo, &NoRepoInCwdError>,
config: &Config, config: &Config,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
check_extensions(config)?; check_unsupported(config)?;
let app = App::new("rhg") let app = App::new("rhg")
.global_setting(AppSettings::AllowInvalidUtf8) .global_setting(AppSettings::AllowInvalidUtf8)
.global_setting(AppSettings::DisableVersion) .global_setting(AppSettings::DisableVersion)
.setting(AppSettings::SubcommandRequired) .setting(AppSettings::SubcommandRequired)
.setting(AppSettings::VersionlessSubcommands) .setting(AppSettings::VersionlessSubcommands)
.arg( .arg(
Arg::with_name("repository") Arg::with_name("repository")
if unsupported.is_empty() { if unsupported.is_empty() {
Ok(()) Ok(())
} else { } else {
Err(CommandError::UnsupportedFeature { Err(CommandError::UnsupportedFeature {
message: format_bytes!( message: format_bytes!(
b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)", b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)",
join(unsupported, b", ") join(unsupported, b", ")
), ),
}) })
AlphareUnsubmitted
Done

That seems unrelated? How did this format change occur?

Alphare: That seems unrelated? How did this format change occur?
SimonSapinAuthorUnsubmitted
Done

Uh, good question. I don’t remember doing this manually, and it doesn’t reappear when I undo it and run cargo +nightly-2021-11-02 fmt --all again.

SimonSapin: Uh, good question. I don’t remember doing this manually, and it doesn’t reappear when I undo it…
} }
} }
fn check_unsupported(config: &Config) -> Result<(), CommandError> {
check_extensions(config)?;
if std::env::var_os("HG_PENDING").is_some() {
// TODO: only if the value is `== repo.working_directory`?
// What about relative v.s. absolute paths?
Err(CommandError::unsupported("$HG_PENDING"))?
}
Ok(())
}

tests/test-import.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init a $ hg init a
$ mkdir a/d1 $ mkdir a/d1
$ mkdir a/d1/d2 $ mkdir a/d1/d2
$ echo line 1 > a/a $ echo line 1 > a/a
$ echo line 1 > a/d1/d2/a $ echo line 1 > a/d1/d2/a
$ hg --cwd a ci -Ama $ hg --cwd a ci -Ama
adding a adding a
adding d1/d2/a adding d1/d2/a