[Commented On] D11758: rhg: $HG_PENDING is not supported
baymax (Baymax, Your Personal Patch-care Companion)
phabricator at mercurial-scm.org
Fri Nov 26 15:33:13 UTC 2021
baymax added a comment.
baymax updated this revision to Diff 31156.
✅ refresh by Heptapod after a successful CI run (🐙 💚)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11758?vs=31143&id=31156
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11758/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11758
AFFECTED FILES
rust/rhg/src/main.rs
tests/test-import.t
CHANGE DETAILS
diff --git a/tests/test-import.t b/tests/test-import.t
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -1,7 +1,3 @@
-TODO: fix rhg bugs that make this test fail when status is enabled
- $ unset RHG_STATUS
-
-
$ hg init a
$ mkdir a/d1
$ mkdir a/d1/d2
diff --git a/rust/rhg/src/main.rs b/rust/rhg/src/main.rs
--- a/rust/rhg/src/main.rs
+++ b/rust/rhg/src/main.rs
@@ -1,4 +1,5 @@
extern crate log;
+use crate::error::CommandError;
use crate::ui::Ui;
use clap::App;
use clap::AppSettings;
@@ -20,7 +21,6 @@
pub mod utils {
pub mod path_utils;
}
-use error::CommandError;
fn main_with_result(
process_start_time: &blackbox::ProcessStartTime,
@@ -28,7 +28,7 @@
repo: Result<&Repo, &NoRepoInCwdError>,
config: &Config,
) -> Result<(), CommandError> {
- check_extensions(config)?;
+ check_unsupported(config)?;
let app = App::new("rhg")
.global_setting(AppSettings::AllowInvalidUtf8)
@@ -616,3 +616,15 @@
})
}
}
+
+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(())
+}
To: SimonSapin, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211126/2b828fbb/attachment-0002.html>
More information about the Mercurial-patches
mailing list