##// END OF EJS Templates
py3: make stdout line-buffered if connected to a TTY...
py3: make stdout line-buffered if connected to a TTY Status messages that are to be shown on the terminal should be written to the file descriptor before anything further is done, to keep the user updated. One common way to achieve this is to make stdout line-buffered if it is connected to a TTY. This is done on Python 2 (except on Windows, where libc, which the CPython 2 streams depend on, does not properly support this). Python 3 rolls it own I/O streams. On Python 3, buffered binary streams can't be set line-buffered. The previous code (added in 227ba1afcb65) incorrectly assumed that on Python 3, pycompat.stdout (sys.stdout.buffer) is already line-buffered. However the interpreter initializes it with a block-buffered stream or an unbuffered stream (when the -u option or the PYTHONUNBUFFERED environment variable is set), never with a line-buffered stream. One example where the current behavior is unacceptable is when running `hg pull https://www.mercurial-scm.org/repo/hg` on Python 3, where the line "pulling from https://www.mercurial-scm.org/repo/hg" does not appear on the terminal before the hg process blocks while waiting for the server. Various approaches to fix this problem are possible, including: 1. Weaken the contract of procutil.stdout to not give any guarantees about buffering behavior. In this case, users of procutil.stdout need to be changed to do enough flushes. In particular, 1. either ui must insert enough flushes for ui.write() and friends, or 2. ui.write() and friends get split into flushing and fully buffered methods, or 3. users of ui.write() and friends must flush explicitly. 2. Make stdout unbuffered. 3. Make stdout line-buffered. Since Python 3 does not natively support that for binary streams, we must implement it ourselves. (2.) is problematic because using unbuffered I/O changes the performance characteristics significantly compared to line-buffered (which is used on Python 2) and this would be a regression. (1.2.) and (1.3) are a substantial amount of work. It’s unclear whether the added complexity would be justified, given that raw performance doesn’t matter that much when writing to a terminal much faster than the user could read it. (1.1.) pushes complexity into the ui class instead of separating the concern of how stdout is buffered. Other users of procutil.stdout would still need to take care of the flushes. This patch implements (3.). The general performance considerations are very similar to (1.1.). The extra method invocation and method forwarding add a little more overhead if the class is used. In exchange, it doesn’t add overhead if not used. For the benchmarks, I compared the previous implementation (incorrect on Python 3), (1.1.), (3.) and (2.). The command was chosen so that the streams were configured as if they were writing to a TTY, but actually write to a pager, which is also the default: HGRCPATH=/dev/null python3 ./hg --cwd ~/vcs/mozilla-central --time --pager yes --config pager.pager='cat > /dev/null' status --all previous: time: real 7.880 secs (user 7.290+0.050 sys 0.580+0.170) time: real 7.830 secs (user 7.220+0.070 sys 0.590+0.140) time: real 7.800 secs (user 7.210+0.050 sys 0.570+0.170) (1.1.) using Yuya Nishihara’s patch: time: real 9.860 secs (user 8.670+0.350 sys 1.160+0.830) time: real 9.540 secs (user 8.430+0.370 sys 1.100+0.770) time: real 9.830 secs (user 8.630+0.370 sys 1.180+0.840) (3.) using this patch: time: real 9.580 secs (user 8.480+0.350 sys 1.090+0.770) time: real 9.670 secs (user 8.480+0.330 sys 1.170+0.860) time: real 9.640 secs (user 8.500+0.350 sys 1.130+0.810) (2.) using a previous patch by me: time: real 10.480 secs (user 8.850+0.720 sys 1.590+1.500) time: real 10.490 secs (user 8.750+0.750 sys 1.710+1.470) time: real 10.240 secs (user 8.600+0.700 sys 1.590+1.510) As expected, there’s no difference on Python 2, as exactly the same code paths are used: previous: time: real 6.950 secs (user 5.870+0.330 sys 1.070+0.770) time: real 7.040 secs (user 6.040+0.360 sys 0.980+0.750) time: real 7.070 secs (user 5.950+0.360 sys 1.100+0.760) this patch: time: real 7.010 secs (user 5.900+0.390 sys 1.070+0.730) time: real 7.000 secs (user 5.850+0.350 sys 1.120+0.760) time: real 7.000 secs (user 5.790+0.380 sys 1.170+0.710)

File last commit:

r44525:4b953cb1 default
r45477:f9734b2d default
Show More
path.rs
314 lines | 9.6 KiB | application/rls-services+xml | RustLexer
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This software may be used and distributed according to the terms of the
* GNU General Public License version 2.
*/
//! Path-related utilities.
use std::env;
#[cfg(not(unix))]
use std::fs::rename;
use std::fs::{self, remove_file as fs_remove_file};
use std::io::{self, ErrorKind};
use std::path::{Component, Path, PathBuf};
use anyhow::Result;
#[cfg(not(unix))]
use tempfile::Builder;
/// Normalize a canonicalized Path for display.
///
/// This removes the UNC prefix `\\?\` on Windows.
pub fn normalize_for_display(path: &str) -> &str {
if cfg!(windows) && path.starts_with(r"\\?\") {
&path[4..]
} else {
path
}
}
/// Similar to [`normalize_for_display`]. But work on bytes.
pub fn normalize_for_display_bytes(path: &[u8]) -> &[u8] {
if cfg!(windows) && path.starts_with(br"\\?\") {
&path[4..]
} else {
path
}
}
/// Return the absolute and normalized path without accessing the filesystem.
///
/// Unlike [`fs::canonicalize`], do not follow symlinks.
///
/// This function does not access the filesystem. Therefore it can behave
/// differently from the kernel or other library functions in corner cases.
/// For example:
///
/// - On some systems with symlink support, `foo/bar/..` and `foo` can be
/// different as seen by the kernel, if `foo/bar` is a symlink. This function
/// always returns `foo` in this case.
/// - On Windows, the official normalization rules are much more complicated.
/// See https://github.com/rust-lang/rust/pull/47363#issuecomment-357069527.
/// For example, this function cannot translate "drive relative" path like
/// "X:foo" to an absolute path.
///
/// Return an error if `std::env::current_dir()` fails or if this function
/// fails to produce an absolute path.
pub fn absolute(path: impl AsRef<Path>) -> io::Result<PathBuf> {
let path = path.as_ref();
let path = if path.is_absolute() {
path.to_path_buf()
} else {
std::env::current_dir()?.join(path)
};
if !path.is_absolute() {
return Err(io::Error::new(
io::ErrorKind::Other,
format!("cannot get absoltue path from {:?}", path),
));
}
let mut result = PathBuf::new();
for component in path.components() {
match component {
Component::Normal(_)
| Component::RootDir
| Component::Prefix(_) => {
result.push(component);
}
Component::ParentDir => {
result.pop();
}
Component::CurDir => (),
}
}
Ok(result)
}
/// Remove the file pointed by `path`.
#[cfg(unix)]
pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<()> {
fs_remove_file(path)?;
Ok(())
}
/// Remove the file pointed by `path`.
///
/// On Windows, removing a file can fail for various reasons, including if the
/// file is memory mapped. This can happen when the repository is accessed
/// concurrently while a background task is trying to remove a packfile. To
/// solve this, we can rename the file before trying to remove it.
/// If the remove operation fails, a future repack will clean it up.
#[cfg(not(unix))]
pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<()> {
let path = path.as_ref();
let extension = path
.extension()
.and_then(|ext| ext.to_str())
.map_or(".to-delete".to_owned(), |ext| ".".to_owned() + ext + "-tmp");
let dest_path = Builder::new()
.prefix("")
.suffix(&extension)
.rand_bytes(8)
.tempfile_in(path.parent().unwrap())?
.into_temp_path();
rename(path, &dest_path)?;
// Ignore errors when removing the file, it will be cleaned up at a later
// time.
let _ = fs_remove_file(dest_path);
Ok(())
}
/// Create the directory and ignore failures when a directory of the same name
/// already exists.
pub fn create_dir(path: impl AsRef<Path>) -> io::Result<()> {
match fs::create_dir(path.as_ref()) {
Ok(()) => Ok(()),
Err(e) => {
if e.kind() == ErrorKind::AlreadyExists && path.as_ref().is_dir() {
Ok(())
} else {
Err(e)
}
}
}
}
/// Expand the user's home directory and any environment variables references
/// in the given path.
///
/// This function is designed to emulate the behavior of Mercurial's
/// `util.expandpath` function, which in turn uses Python's
/// `os.path.expand{user,vars}` functions. This results in behavior that is
/// notably different from the default expansion behavior of the `shellexpand`
/// crate. In particular:
///
/// - If a reference to an environment variable is missing or invalid, the
/// reference is left unchanged in the resulting path rather than emitting an
/// error.
///
/// - Home directory expansion explicitly happens after environment variable
/// expansion, meaning that if an environment variable is expanded into a
/// string starting with a tilde (`~`), the tilde will be expanded into the
/// user's home directory.
pub fn expand_path(path: impl AsRef<str>) -> PathBuf {
expand_path_impl(path.as_ref(), |k| env::var(k).ok(), dirs::home_dir)
}
/// Same as `expand_path` but explicitly takes closures for environment
/// variable and home directory lookup for the sake of testability.
fn expand_path_impl<E, H>(path: &str, getenv: E, homedir: H) -> PathBuf
where
E: FnMut(&str) -> Option<String>,
H: FnOnce() -> Option<PathBuf>,
{
// The shellexpand crate does not expand Windows environment variables
// like `%PROGRAMDATA%`. We'd like to expand them too. So let's do some
// pre-processing.
//
// XXX: Doing this preprocessing has the unfortunate side-effect that
// if an environment variable fails to expand on Windows, the resulting
// string will contain a UNIX-style environment variable reference.
//
// e.g., "/foo/%MISSING%/bar" will expand to "/foo/${MISSING}/bar"
//
// The current approach is good enough for now, but likely needs to
// be improved later for correctness.
let path = {
let mut new_path = String::new();
let mut is_starting = true;
for ch in path.chars() {
if ch == '%' {
if is_starting {
new_path.push_str("${");
} else {
new_path.push('}');
}
is_starting = !is_starting;
} else if cfg!(windows) && ch == '/' {
// Only on Windows, change "/" to "\" automatically.
// This makes sure "%include /foo" works as expected.
new_path.push('\\')
} else {
new_path.push(ch);
}
}
new_path
};
let path = shellexpand::env_with_context_no_errors(&path, getenv);
shellexpand::tilde_with_context(&path, homedir)
.as_ref()
.into()
}
#[cfg(test)]
mod tests {
use super::*;
use std::fs::File;
use tempfile::TempDir;
#[cfg(windows)]
mod windows {
use super::*;
#[test]
fn test_absolute_fullpath() {
assert_eq!(absolute("C:/foo").unwrap(), Path::new("C:\\foo"));
assert_eq!(
absolute("x:\\a/b\\./.\\c").unwrap(),
Path::new("x:\\a\\b\\c")
);
assert_eq!(
absolute("y:/a/b\\../..\\c\\../d\\./.").unwrap(),
Path::new("y:\\d")
);
assert_eq!(
absolute("z:/a/b\\../..\\../..\\..").unwrap(),
Path::new("z:\\")
);
}
}
#[cfg(unix)]
mod unix {
use super::*;
#[test]
fn test_absolute_fullpath() {
assert_eq!(
absolute("/a/./b\\c/../d/.").unwrap(),
Path::new("/a/d")
);
assert_eq!(absolute("/a/../../../../b").unwrap(), Path::new("/b"));
assert_eq!(absolute("/../../..").unwrap(), Path::new("/"));
assert_eq!(absolute("/../../../").unwrap(), Path::new("/"));
assert_eq!(
absolute("//foo///bar//baz").unwrap(),
Path::new("/foo/bar/baz")
);
assert_eq!(absolute("//").unwrap(), Path::new("/"));
}
}
#[test]
fn test_create_dir_non_exist() -> Result<()> {
let tempdir = TempDir::new()?;
let mut path = tempdir.path().to_path_buf();
path.push("dir");
create_dir(&path)?;
assert!(path.is_dir());
Ok(())
}
#[test]
fn test_create_dir_exist() -> Result<()> {
let tempdir = TempDir::new()?;
let mut path = tempdir.path().to_path_buf();
path.push("dir");
create_dir(&path)?;
assert!(&path.is_dir());
create_dir(&path)?;
assert!(&path.is_dir());
Ok(())
}
#[test]
fn test_create_dir_file_exist() -> Result<()> {
let tempdir = TempDir::new()?;
let mut path = tempdir.path().to_path_buf();
path.push("dir");
File::create(&path)?;
let err = create_dir(&path).unwrap_err();
assert_eq!(err.kind(), ErrorKind::AlreadyExists);
Ok(())
}
#[test]
fn test_path_expansion() {
fn getenv(key: &str) -> Option<String> {
match key {
"foo" => Some("~/a".into()),
"bar" => Some("b".into()),
_ => None,
}
}
fn homedir() -> Option<PathBuf> {
Some(PathBuf::from("/home/user"))
}
let path = "$foo/${bar}/$baz";
let expected = PathBuf::from("/home/user/a/b/$baz");
assert_eq!(expand_path_impl(&path, getenv, homedir), expected);
}
}