Skip to content

Commit

Permalink
try
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Dec 11, 2024
1 parent 3e7db71 commit fd3bf68
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CI/osx.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ def prepare_params(self, params):
params["command"] = bash_command(*command)
env = params.setdefault("env", {})
dev = env.setdefault(
"DEVELOPER_DIR", "/Applications/Xcode_15.0.1.app/Contents/Developer"
"DEVELOPER_DIR", "/Applications/Xcode_14.1.app/Contents/Developer"
)
env.setdefault(
"SDKROOT",
"{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk".format(dev),
"{}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.0.sdk".format(dev),
)
return params

Expand Down
28 changes: 28 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ tee = "0.1"
tempfile = "3"
typenum = "1"
url = "2"
which = "7"

[dependencies.bstr]
version = "1"
Expand Down
17 changes: 17 additions & 0 deletions src/hg_connect_stdio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,23 @@ pub fn get_stdio_connection(url: &Url, flags: c_int) -> Option<Box<dyn HgRepo>>
path.as_os_str().as_bytes().to_owned()
};
let path = CString::new(path).unwrap();
warn!(target: "root", "{:?}", which::which("hg"));
if let Ok(hg) = which::which("hg") {
use bstr::ByteSlice;
let output = std::process::Command::new(hg)
.arg("--version")
.output()
.unwrap();
warn!(target: "root", "{}", output.stdout.as_bstr());
warn!(target: "root", "{}", output.stderr.as_bstr());

let output = std::process::Command::new("/bin/sh")
.args(["-x", "-c", "hg --version"])
.output()
.unwrap();
warn!(target: "root", "{}", output.stdout.as_bstr());
warn!(target: "root", "{}", output.stderr.as_bstr());
}
let proc = unsafe {
hg_connect_stdio(
userhost.as_ref().map_or(ptr::null(), |s| s.as_ptr()),
Expand Down

0 comments on commit fd3bf68

Please sign in to comment.