revset: propagate error from is_empty(), replace .try_next().is_some()

Yuya Nishihara committed 3 months ago

Commit 4e55a6c1 parent fd3fdb04 files · +8 −11Browse files

Showing the changes to cli/src (2 of 4 files). Show all

Unified · Split

2 files

cli/src/cli_util.rs +3 −6
cli/src/commands/log.rs +1 −1

cli/src/cli_util.rs+3−6

@@ -2072,15 +2072,12 @@ to the current parents may contain changes from multiple commits. · 2071 unmodified lines
2072	2072	.env
2073	2073	.resolve_immutable_expression(tx.repo())
2074	2074	.map_err(snapshot_command_error)?;
2075		− let wc_immutable = immutable_expr
	2075	+ let wc_immutable = !immutable_expr
2076	2076	.intersection(&RevsetExpression::commit(wc_commit.id().clone()))
2077	2077	.evaluate(tx.repo())
2078	2078	.map_err(snapshot_command_error)?
2079		− .stream()
2080		− .try_next()
2081		− .await
2082		− .map_err(snapshot_command_error)?
2083		− .is_some();
	2079	+ .is_empty()
	2080	+ .map_err(snapshot_command_error)?;
2084	2081	let mut_repo = tx.repo_mut();
2085	2082	let new_wc_commit;
2086	2083	if wc_immutable {

cli/src/commands/log.rs+1−1

@@ -382,7 +382,7 @@ pub(crate) async fn cmd_log( · 381 unmodified lines
382	382	this is often not useful because all non-empty commits touch '.'. If you meant \
383	383	to show the working copy commit, pass -r '@' instead."
384	384	)?;
385		− } else if revset.is_empty()
	385	+ } else if revset.is_empty()?
386	386	&& workspace_command
387	387	.parse_revset(ui, &RevisionArg::from(only_path.to_owned()))
388	388	.is_ok()