-
Notifications
You must be signed in to change notification settings - Fork 343
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cli: move
jj workspace root
to `jj root, for discoverability
This is a convenient command, for scripting things like `cd $(jj root) && do something`, and it seems better to allow people to find it before they learn about workspaces.
- Loading branch information
Showing
4 changed files
with
85 additions
and
0 deletions.
There are no files selected for viewing
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
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
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,36 @@ | ||
// Copyright 2024 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 tracing::instrument; | ||
|
||
use crate::cli_util::{CommandError, CommandHelper}; | ||
use crate::commands::workspace; | ||
use crate::ui::Ui; | ||
|
||
/// Show the current workspace root directory | ||
#[derive(clap::Args, Clone, Debug)] | ||
pub(crate) struct RootArgs {} | ||
|
||
#[instrument(skip_all)] | ||
pub(crate) fn cmd_root( | ||
ui: &mut Ui, | ||
command: &CommandHelper, | ||
RootArgs {}: &RootArgs, | ||
) -> Result<(), CommandError> { | ||
workspace::cmd_workspace( | ||
ui, | ||
command, | ||
&workspace::WorkspaceCommand::Root(workspace::WorkspaceRootArgs {}), | ||
) | ||
} |
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,44 @@ | ||
// Copyright 2024 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::path::Path; | ||
|
||
use test_case::test_case; | ||
use testutils::{TestRepoBackend, TestWorkspace}; | ||
|
||
use crate::common::TestEnvironment; | ||
|
||
pub mod common; | ||
|
||
#[test_case(TestRepoBackend::Local ; "local backend")] | ||
#[test_case(TestRepoBackend::Git ; "git backend")] | ||
fn test_root(backend: TestRepoBackend) { | ||
let test_env = TestEnvironment::default(); | ||
let settings = testutils::user_settings(); | ||
let test_workspace = TestWorkspace::init_with_backend(&settings, backend); | ||
let root = test_workspace.workspace.workspace_root(); | ||
let subdir = root.join("subdir"); | ||
std::fs::create_dir(&subdir).unwrap(); | ||
let stdout = test_env.jj_cmd_success(&subdir, &["root"]); | ||
assert_eq!(&stdout, &[root.to_str().unwrap(), "\n"].concat()); | ||
} | ||
|
||
#[test] | ||
fn test_root_outside_a_repo() { | ||
let test_env = TestEnvironment::default(); | ||
let stdout = test_env.jj_cmd_failure(Path::new("/"), &["root"]); | ||
insta::assert_snapshot!(stdout, @r###" | ||
Error: There is no jj repo in "." | ||
"###); | ||
} |