-
Notifications
You must be signed in to change notification settings - Fork 365
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cli: split sparse sub commands into modules
- Loading branch information
Showing
6 changed files
with
324 additions
and
225 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// Copyright 2020 The Jujutsu Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
use std::fmt::Write as _; | ||
use std::path::Path; | ||
|
||
use itertools::Itertools; | ||
use jj_lib::repo_path::RepoPathBuf; | ||
use jj_lib::settings::UserSettings; | ||
use tracing::instrument; | ||
|
||
use super::update_sparse_patterns_with; | ||
use crate::cli_util::edit_temp_file; | ||
use crate::cli_util::CommandHelper; | ||
use crate::command_error::internal_error; | ||
use crate::command_error::user_error_with_message; | ||
use crate::command_error::CommandError; | ||
use crate::ui::Ui; | ||
|
||
/// Start an editor to update the patterns that are present in the working copy | ||
#[derive(clap::Args, Clone, Debug)] | ||
pub struct SparseEditArgs {} | ||
|
||
#[instrument(skip_all)] | ||
pub fn cmd_sparse_edit( | ||
ui: &mut Ui, | ||
command: &CommandHelper, | ||
_args: &SparseEditArgs, | ||
) -> Result<(), CommandError> { | ||
let mut workspace_command = command.workspace_helper(ui)?; | ||
let repo_path = workspace_command.repo_path().to_owned(); | ||
update_sparse_patterns_with(ui, &mut workspace_command, |_ui, old_patterns| { | ||
let mut new_patterns = edit_sparse(&repo_path, old_patterns, command.settings())?; | ||
new_patterns.sort_unstable(); | ||
new_patterns.dedup(); | ||
Ok(new_patterns) | ||
}) | ||
} | ||
|
||
fn edit_sparse( | ||
repo_path: &Path, | ||
sparse: &[RepoPathBuf], | ||
settings: &UserSettings, | ||
) -> Result<Vec<RepoPathBuf>, CommandError> { | ||
let mut content = String::new(); | ||
for sparse_path in sparse { | ||
// Invalid path shouldn't block editing. Edited paths will be validated. | ||
let workspace_relative_sparse_path = sparse_path.to_fs_path_unchecked(Path::new("")); | ||
let path_string = workspace_relative_sparse_path.to_str().ok_or_else(|| { | ||
internal_error(format!( | ||
"Stored sparse path is not valid utf-8: {}", | ||
workspace_relative_sparse_path.display() | ||
)) | ||
})?; | ||
writeln!(&mut content, "{path_string}").unwrap(); | ||
} | ||
|
||
let content = edit_temp_file( | ||
"sparse patterns", | ||
".jjsparse", | ||
repo_path, | ||
&content, | ||
settings, | ||
)?; | ||
|
||
content | ||
.lines() | ||
.filter(|line| !line.starts_with("JJ:")) | ||
.map(|line| line.trim()) | ||
.filter(|line| !line.is_empty()) | ||
.map(|line| { | ||
RepoPathBuf::from_relative_path(line).map_err(|err| { | ||
user_error_with_message(format!("Failed to parse sparse pattern: {line}"), err) | ||
}) | ||
}) | ||
.try_collect() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
// Copyright 2020 The Jujutsu Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
use std::io::Write as _; | ||
use std::path::Path; | ||
|
||
use tracing::instrument; | ||
|
||
use crate::cli_util::CommandHelper; | ||
use crate::command_error::CommandError; | ||
use crate::ui::Ui; | ||
|
||
/// List the patterns that are currently present in the working copy | ||
/// | ||
/// By default, a newly cloned or initialized repo will have have a pattern | ||
/// matching all files from the repo root. That pattern is rendered as `.` (a | ||
/// single period). | ||
#[derive(clap::Args, Clone, Debug)] | ||
pub struct SparseListArgs {} | ||
|
||
#[instrument(skip_all)] | ||
pub fn cmd_sparse_list( | ||
ui: &mut Ui, | ||
command: &CommandHelper, | ||
_args: &SparseListArgs, | ||
) -> Result<(), CommandError> { | ||
let workspace_command = command.workspace_helper(ui)?; | ||
for path in workspace_command.working_copy().sparse_patterns()? { | ||
writeln!( | ||
ui.stdout(), | ||
"{}", | ||
path.to_fs_path_unchecked(Path::new("")).display() | ||
)?; | ||
} | ||
Ok(()) | ||
} |
Oops, something went wrong.