2022-11-26 23:57:50 +00:00
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-04-22 04:49:57 +00:00
|
|
|
//
|
|
|
|
// 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 crate::common::TestEnvironment;
|
|
|
|
|
|
|
|
/// Test adding a second workspace
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_add_second_workspace() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "initial"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
default: rlvkpnrz e0e6d567 (empty) (no description set)
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
2022-04-22 04:49:57 +00:00
|
|
|
&main_path,
|
|
|
|
&["workspace", "add", "--name", "second", "../secondary"],
|
|
|
|
);
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout.replace('\\', "/"), @"");
|
|
|
|
insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
|
2022-04-22 04:49:57 +00:00
|
|
|
Created workspace in "../secondary"
|
2023-07-11 01:46:38 +00:00
|
|
|
Working copy now at: rzvqmyuk 397eac93 (empty) (no description set)
|
|
|
|
Parent commit : qpvuntsm 7d308bc9 initial
|
2022-04-22 04:49:57 +00:00
|
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
|
2023-01-25 16:29:15 +00:00
|
|
|
// Can see the working-copy commit in each workspace in the log output. The "@"
|
|
|
|
// node in the graph indicates the current workspace's working-copy commit.
|
2022-04-22 04:49:57 +00:00
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 397eac932ad3 second@
|
|
|
|
│ @ e0e6d5672858 default@
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 7d308bc9d934
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &secondary_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ 397eac932ad3 second@
|
|
|
|
│ ◉ e0e6d5672858 default@
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 7d308bc9d934
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
// Both workspaces show up when we list them
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
default: rlvkpnrz e0e6d567 (empty) (no description set)
|
|
|
|
second: rzvqmyuk 397eac93 (empty) (no description set)
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2024-02-17 16:48:29 +00:00
|
|
|
/// Test how sparse patterns are inherited
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_sparse_patterns() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "ws1"]);
|
|
|
|
let ws1_path = test_env.env_root().join("ws1");
|
|
|
|
let ws2_path = test_env.env_root().join("ws2");
|
|
|
|
let ws3_path = test_env.env_root().join("ws3");
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&ws1_path, &["sparse", "set", "--clear", "--add=foo"]);
|
|
|
|
test_env.jj_cmd_ok(&ws1_path, &["workspace", "add", "../ws2"]);
|
|
|
|
let stdout = test_env.jj_cmd_success(&ws2_path, &["sparse", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-02-17 17:04:21 +00:00
|
|
|
foo
|
2024-02-17 16:48:29 +00:00
|
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&ws2_path, &["sparse", "set", "--add=bar"]);
|
|
|
|
test_env.jj_cmd_ok(&ws2_path, &["workspace", "add", "../ws3"]);
|
|
|
|
let stdout = test_env.jj_cmd_success(&ws3_path, &["sparse", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-02-17 17:04:21 +00:00
|
|
|
bar
|
|
|
|
foo
|
2024-02-17 16:48:29 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-10-29 19:43:17 +00:00
|
|
|
/// Test adding a second workspace while the current workspace is editing a
|
|
|
|
/// merge
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_add_second_workspace_on_merge() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["describe", "-m=left"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new", "@-", "-m=right"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new", "all:@-+", "-m=merge"]);
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
default: zsuskuln 21a0ea6d (empty) merge
|
|
|
|
"###);
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(
|
|
|
|
&main_path,
|
|
|
|
&["workspace", "add", "--name", "second", "../secondary"],
|
|
|
|
);
|
|
|
|
|
|
|
|
// The new workspace's working-copy commit shares all parents with the old one.
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 6d4c2b8ab610 second@
|
2023-10-29 19:43:17 +00:00
|
|
|
├─╮
|
2024-03-16 05:37:11 +00:00
|
|
|
│ │ @ 21a0ea6d1c86 default@
|
2023-10-29 19:43:17 +00:00
|
|
|
╭─┬─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ ◉ 09ba8d9dfa21
|
|
|
|
◉ │ 1694f2ddf8ec
|
2023-10-29 19:43:17 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 000000000000
|
2023-10-29 19:43:17 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-10-11 19:01:57 +00:00
|
|
|
/// Test adding a workspace, but at a specific revision using '-r'
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_add_workspace_at_revision() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file-1"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "first"]);
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file-2"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "second"]);
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
default: kkmpptxz 2801c219 (empty) (no description set)
|
|
|
|
"###);
|
|
|
|
|
|
|
|
let (_, stderr) = test_env.jj_cmd_ok(
|
|
|
|
&main_path,
|
|
|
|
&[
|
|
|
|
"workspace",
|
|
|
|
"add",
|
|
|
|
"--name",
|
|
|
|
"second",
|
|
|
|
"../secondary",
|
|
|
|
"-r",
|
|
|
|
"@--",
|
|
|
|
],
|
|
|
|
);
|
|
|
|
insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
|
|
|
|
Created workspace in "../secondary"
|
|
|
|
Working copy now at: zxsnswpr e6baf9d9 (empty) (no description set)
|
|
|
|
Parent commit : qpvuntsm e7d7dbb9 first
|
|
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Can see the working-copy commit in each workspace in the log output. The "@"
|
|
|
|
// node in the graph indicates the current workspace's working-copy commit.
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ e6baf9d9cfd0 second@
|
|
|
|
│ @ 2801c219094d default@
|
|
|
|
│ ◉ 4ec5df5a189c
|
2023-10-11 19:01:57 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ e7d7dbb91c5a
|
|
|
|
◉ 000000000000
|
2023-10-11 19:01:57 +00:00
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &secondary_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ e6baf9d9cfd0 second@
|
|
|
|
│ ◉ 2801c219094d default@
|
|
|
|
│ ◉ 4ec5df5a189c
|
2023-10-11 19:01:57 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ e7d7dbb91c5a
|
|
|
|
◉ 000000000000
|
2023-10-11 19:01:57 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-11-03 01:36:18 +00:00
|
|
|
/// Test multiple `-r` flags to `workspace add` to create a workspace
|
|
|
|
/// working-copy commit with multiple parents.
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_add_workspace_multiple_revisions() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file-1"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "first"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new", "-r", "root()"]);
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file-2"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "second"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new", "-r", "root()"]);
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file-3"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "third"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new", "-r", "root()"]);
|
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ 5b36783cd11c
|
|
|
|
│ ◉ 23881f07b53c
|
2023-11-03 01:36:18 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ ◉ 1f6a15f0af2a
|
2023-11-03 01:36:18 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ ◉ e7d7dbb91c5a
|
2023-11-03 01:36:18 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 000000000000
|
2023-11-03 01:36:18 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
let (_, stderr) = test_env.jj_cmd_ok(
|
|
|
|
&main_path,
|
|
|
|
&[
|
|
|
|
"workspace",
|
|
|
|
"add",
|
|
|
|
"--name=merge",
|
|
|
|
"../merged",
|
|
|
|
"-r=238",
|
|
|
|
"-r=1f6",
|
|
|
|
"-r=e7d",
|
|
|
|
],
|
|
|
|
);
|
|
|
|
insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
|
|
|
|
Created workspace in "../merged"
|
|
|
|
Working copy now at: wmwvqwsz fa8fdc28 (empty) (no description set)
|
|
|
|
Parent commit : mzvwutvl 23881f07 third
|
|
|
|
Parent commit : kkmpptxz 1f6a15f0 second
|
|
|
|
Parent commit : qpvuntsm e7d7dbb9 first
|
|
|
|
Added 3 files, modified 0 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ fa8fdc28af12 merge@
|
2023-11-03 01:36:18 +00:00
|
|
|
├─┬─╮
|
2024-03-16 05:37:11 +00:00
|
|
|
│ │ ◉ e7d7dbb91c5a
|
|
|
|
│ ◉ │ 1f6a15f0af2a
|
2023-11-03 01:36:18 +00:00
|
|
|
│ ├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ │ 23881f07b53c
|
2023-11-03 01:36:18 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ @ 5b36783cd11c default@
|
2023-11-03 01:36:18 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 000000000000
|
2023-11-03 01:36:18 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2022-04-22 04:49:57 +00:00
|
|
|
/// Test making changes to the working copy in a workspace as it gets rewritten
|
|
|
|
/// from another workspace
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_conflicting_edits() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../secondary"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 265af0cdbcc7 secondary@
|
|
|
|
│ @ 351099fa72cf default@
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ cf911c223d3e
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
// Make changes in both working copies
|
|
|
|
std::fs::write(main_path.join("file"), "changed in main\n").unwrap();
|
|
|
|
std::fs::write(secondary_path.join("file"), "changed in second\n").unwrap();
|
2022-10-02 17:09:46 +00:00
|
|
|
// Squash the changes from the main workspace into the initial commit (before
|
2022-04-22 04:49:57 +00:00
|
|
|
// running any command in the secondary workspace
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&main_path, &["squash"]);
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2022-04-22 04:49:57 +00:00
|
|
|
Rebased 1 descendant commits
|
2023-07-11 01:46:38 +00:00
|
|
|
Working copy now at: mzvwutvl fe8f41ed (empty) (no description set)
|
|
|
|
Parent commit : qpvuntsm c0d4a99e (no description set)
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
|
2022-10-02 17:09:46 +00:00
|
|
|
// The secondary workspace's working-copy commit was updated
|
2022-04-22 04:49:57 +00:00
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ fe8f41ed01d6 default@
|
|
|
|
│ ◉ a1896a17282f secondary@
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ c0d4a99ef98a
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
2022-10-02 17:09:46 +00:00
|
|
|
let stderr = test_env.jj_cmd_failure(&secondary_path, &["st"]);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
Error: The working copy is stale (not updated since operation 58b580b12eee).
|
2022-10-02 17:09:46 +00:00
|
|
|
Hint: Run `jj workspace update-stale` to update it.
|
2023-05-25 14:59:16 +00:00
|
|
|
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
2022-10-02 17:09:46 +00:00
|
|
|
"###);
|
|
|
|
// Same error on second run, and from another command
|
|
|
|
let stderr = test_env.jj_cmd_failure(&secondary_path, &["log"]);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
Error: The working copy is stale (not updated since operation 58b580b12eee).
|
2022-10-02 17:09:46 +00:00
|
|
|
Hint: Run `jj workspace update-stale` to update it.
|
2023-05-25 14:59:16 +00:00
|
|
|
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
2022-10-02 17:09:46 +00:00
|
|
|
"###);
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
2023-02-26 11:52:06 +00:00
|
|
|
// It was detected that the working copy is now stale.
|
|
|
|
// Since there was an uncommitted change in the working copy, it should
|
2022-04-22 04:49:57 +00:00
|
|
|
// have been committed first (causing divergence)
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-02-26 11:52:06 +00:00
|
|
|
Concurrent modification detected, resolving automatically.
|
|
|
|
Rebased 1 descendant commits onto commits rewritten by other operation
|
2023-08-07 21:45:01 +00:00
|
|
|
Working copy now at: pmmvwywv?? a1896a17 (empty) (no description set)
|
2022-10-02 17:09:46 +00:00
|
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &secondary_path),
|
|
|
|
@r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ b0b43f24d501 (divergent)
|
|
|
|
│ ◉ fe8f41ed01d6 default@
|
2023-02-26 11:52:06 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ @ a1896a17282f secondary@ (divergent)
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ c0d4a99ef98a
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
2022-08-18 07:49:32 +00:00
|
|
|
// The stale working copy should have been resolved by the previous command
|
|
|
|
let stdout = get_log_output(&test_env, &secondary_path);
|
|
|
|
assert!(!stdout.starts_with("The working copy is stale"));
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ b0b43f24d501 (divergent)
|
|
|
|
│ ◉ fe8f41ed01d6 default@
|
2023-02-26 11:52:06 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
│ @ a1896a17282f secondary@ (divergent)
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ c0d4a99ef98a
|
|
|
|
◉ 000000000000
|
2022-08-18 07:49:32 +00:00
|
|
|
"###);
|
2022-04-22 04:49:57 +00:00
|
|
|
}
|
|
|
|
|
2023-02-27 02:07:46 +00:00
|
|
|
/// Test a clean working copy that gets rewritten from another workspace
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_updated_by_other() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2023-02-27 02:07:46 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
2023-02-27 02:07:46 +00:00
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../secondary"]);
|
2023-02-27 02:07:46 +00:00
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 265af0cdbcc7 secondary@
|
|
|
|
│ @ 351099fa72cf default@
|
2023-02-27 02:07:46 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ cf911c223d3e
|
|
|
|
◉ 000000000000
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
// Rewrite the check-out commit in one workspace.
|
|
|
|
std::fs::write(main_path.join("file"), "changed in main\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&main_path, &["squash"]);
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-02-27 02:07:46 +00:00
|
|
|
Rebased 1 descendant commits
|
2023-07-11 01:46:38 +00:00
|
|
|
Working copy now at: mzvwutvl fe8f41ed (empty) (no description set)
|
|
|
|
Parent commit : qpvuntsm c0d4a99e (no description set)
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
// The secondary workspace's working-copy commit was updated.
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ fe8f41ed01d6 default@
|
|
|
|
│ ◉ a1896a17282f secondary@
|
2023-02-27 02:07:46 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ c0d4a99ef98a
|
|
|
|
◉ 000000000000
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&secondary_path, &["st"]);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
Error: The working copy is stale (not updated since operation 58b580b12eee).
|
2023-02-27 02:07:46 +00:00
|
|
|
Hint: Run `jj workspace update-stale` to update it.
|
2023-05-25 14:59:16 +00:00
|
|
|
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
2023-02-27 02:07:46 +00:00
|
|
|
// It was detected that the working copy is now stale, but clean. So no
|
|
|
|
// divergent commit should be created.
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
Working copy now at: pmmvwywv a1896a17 (empty) (no description set)
|
2023-02-27 02:07:46 +00:00
|
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &secondary_path),
|
|
|
|
@r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ fe8f41ed01d6 default@
|
|
|
|
│ @ a1896a17282f secondary@
|
2023-02-27 02:07:46 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ c0d4a99ef98a
|
|
|
|
◉ 000000000000
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
#[test]
|
|
|
|
fn test_workspaces_current_op_discarded_by_other() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
// Use the local backend because GitBackend::gc() depends on the git CLI.
|
|
|
|
test_env.jj_cmd_ok(
|
|
|
|
test_env.env_root(),
|
|
|
|
&["init", "main", "--config-toml=ui.allow-init-native=true"],
|
|
|
|
);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
2024-03-16 13:16:37 +00:00
|
|
|
std::fs::write(main_path.join("modified"), "base\n").unwrap();
|
|
|
|
std::fs::write(main_path.join("deleted"), "base\n").unwrap();
|
2024-03-16 03:51:59 +00:00
|
|
|
std::fs::write(main_path.join("sparse"), "base\n").unwrap();
|
2024-03-16 13:16:37 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
|
|
|
std::fs::write(main_path.join("modified"), "main\n").unwrap();
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../secondary"]);
|
2024-03-16 13:16:37 +00:00
|
|
|
// Make unsnapshotted writes in the secondary working copy
|
2024-03-16 03:51:59 +00:00
|
|
|
test_env.jj_cmd_ok(
|
|
|
|
&secondary_path,
|
|
|
|
&[
|
|
|
|
"sparse",
|
|
|
|
"set",
|
|
|
|
"--clear",
|
|
|
|
"--add=modified",
|
|
|
|
"--add=deleted",
|
|
|
|
"--add=added",
|
|
|
|
],
|
|
|
|
);
|
2024-03-16 13:16:37 +00:00
|
|
|
std::fs::write(secondary_path.join("modified"), "secondary\n").unwrap();
|
|
|
|
std::fs::remove_file(secondary_path.join("deleted")).unwrap();
|
|
|
|
std::fs::write(secondary_path.join("added"), "secondary\n").unwrap();
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
|
|
|
|
// Create an op by abandoning the parent commit. Importantly, that commit also
|
|
|
|
// changes the target tree in the secondary workspace.
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["abandon", "@-"]);
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
&main_path,
|
|
|
|
&[
|
|
|
|
"operation",
|
|
|
|
"log",
|
|
|
|
"--template",
|
|
|
|
r#"id.short(10) ++ " " ++ description"#,
|
|
|
|
],
|
|
|
|
);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-03-16 03:51:59 +00:00
|
|
|
@ 716b8d737e abandon commit 8ac26d0060e2be7f3fce2b5ebd2eb0c75053666f6cbc41bee50bb6da463868704a0bcf1ed9848761206d77694a71e3c657e5e250245e342779df1b00f0da9009
|
|
|
|
◉ bb8aec2a1c Create initial working-copy commit in workspace secondary
|
|
|
|
◉ af6f39b411 add workspace 'secondary'
|
|
|
|
◉ 05c14c7e78 new empty commit
|
|
|
|
◉ 92bb962606 snapshot working copy
|
|
|
|
◉ 553e0ea3a4 new empty commit
|
|
|
|
◉ b3755a9026 snapshot working copy
|
2024-02-18 22:57:09 +00:00
|
|
|
◉ 17dbb2fe40 add workspace 'default'
|
|
|
|
◉ cecfee9647 initialize repo
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
◉ 0000000000
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Abandon ops, including the one the secondary workspace is currently on.
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["operation", "abandon", "..@-"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["util", "gc", "--expire=now"]);
|
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 03:51:59 +00:00
|
|
|
◉ ec4904a30161 secondary@
|
|
|
|
│ @ 74769415363f default@
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
├─╯
|
2024-03-16 03:51:59 +00:00
|
|
|
◉ bd711986720f
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 000000000000
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&secondary_path, &["st"]);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
Error: Could not read working copy's operation.
|
|
|
|
Hint: Run `jj workspace update-stale` to recover.
|
|
|
|
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
|
|
|
"###);
|
|
|
|
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-03-16 03:51:59 +00:00
|
|
|
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object bb8aec2a1ca33ebafdfe8866bc4ad3464dffd25634fde19d1025625880791b141d35753e10737c41b2bc133ab84047312f3021d905bb711960253e7f430100fc of type operation not found
|
|
|
|
Created and checked out recovery commit 30ee0d1fbd7a
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:11:21 +00:00
|
|
|
◉ b93a924213f3 secondary@
|
2024-03-16 03:51:59 +00:00
|
|
|
◉ ec4904a30161
|
|
|
|
│ @ 74769415363f default@
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
├─╯
|
2024-03-16 03:51:59 +00:00
|
|
|
◉ bd711986720f
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 000000000000
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
"###);
|
|
|
|
|
2024-03-16 03:51:59 +00:00
|
|
|
// The sparse patterns should remain
|
|
|
|
let stdout = test_env.jj_cmd_success(&secondary_path, &["sparse", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
added
|
|
|
|
deleted
|
|
|
|
modified
|
|
|
|
"###);
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["st"]);
|
|
|
|
insta::assert_snapshot!(stderr, @"");
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Working copy changes:
|
2024-03-16 13:16:37 +00:00
|
|
|
A added
|
|
|
|
D deleted
|
|
|
|
M modified
|
2024-03-16 05:11:21 +00:00
|
|
|
Working copy : kmkuslsw b93a9242 (no description set)
|
2024-03-16 03:51:59 +00:00
|
|
|
Parent commit: rzvqmyuk ec4904a3 (empty) (no description set)
|
2024-03-16 13:16:37 +00:00
|
|
|
"###);
|
|
|
|
// The modified file should have the same contents it had before (not reset to
|
|
|
|
// the base contents)
|
|
|
|
insta::assert_snapshot!(std::fs::read_to_string(secondary_path.join("modified")).unwrap(), @r###"
|
|
|
|
secondary
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["obslog"]);
|
|
|
|
insta::assert_snapshot!(stderr, @"");
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-02-12 07:26:19 +00:00
|
|
|
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 secondary@ b93a9242
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
│ (no description set)
|
2024-02-12 07:26:19 +00:00
|
|
|
◉ kmkuslsw hidden test.user@example.com 2001-02-03 08:05:18 30ee0d1f
|
workspace: recover from missing operation
If the operation corresponding to a workspace is missing for some reason
(the specific situation in the test in this commit is that an operation
was abandoned and garbage-collected from another workspace), currently,
jj fails with a 255 error code. Teach jj a way to recover from this
situation.
When jj detects such a situation, it prints a message and stops
operation, similar to when a workspace is stale. The message tells the
user what command to run.
When that command is run, jj loads the repo at the @ operation (instead
of the operation of the workspace), creates a new commit on the @
commit with an empty tree, and then proceeds as usual - in particular,
including the auto-snapshotting of the working tree, which creates
another commit that obsoletes the newly created commit.
There are several design points I considered.
1) Whether the recovery should be automatic, or (as in this commit)
manual in that the user should be prompted to run a command. The user
might prefer to recover in another way (e.g. by simply deleting the
workspace) and this situation is (hopefully) rare enough that I think
it's better to prompt the user.
2) Which command the user should be prompted to run (and thus, which
command should be taught to perform the recovery). I chose "workspace
update-stale" because the circumstances are very similar to it: it's
symptom is that the regular jj operation is blocked somewhere at the
beginning, and "workspace update-stale" already does some special work
before the blockage (this commit adds more of such special work). But it
might be better for something more explicitly named, or even a sequence
of commands (e.g. "create a new operation that becomes @ that no
workspace points to", "low-level command that makes a workspace point to
the operation @") but I can see how this can be unnecessarily confusing
for the user.
3) How we recover. I can think of several ways:
a) Always create a commit, and allow the automatic snapshotting to
create another commit that obsoletes this commit.
b) Create a commit but somehow teach the automatic snapshotting to
replace the created commit in-place (so it has no predecessor, as viewed
in "obslog").
c) Do either a) or b), with the added improvement that if there is no
diff between the newly created commit and the former @, to behave as if
no new commit was created (@ remains as the former @).
I chose a) since it was the simplest and most easily reasoned about,
which I think is the best way to go when recovering from a rare
situation.
2024-02-03 05:26:23 +00:00
|
|
|
(empty) (no description set)
|
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-02-27 02:07:46 +00:00
|
|
|
#[test]
|
|
|
|
fn test_workspaces_update_stale_noop() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2023-02-27 02:07:46 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&main_path, &["workspace", "update-stale"]);
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-02-27 02:07:46 +00:00
|
|
|
Nothing to do (the working copy is not stale).
|
|
|
|
"###);
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(
|
|
|
|
&main_path,
|
|
|
|
&["workspace", "update-stale", "--ignore-working-copy"],
|
|
|
|
);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
Error: This command must be able to update the working copy.
|
|
|
|
Hint: Don't use --ignore-working-copy.
|
|
|
|
"###);
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["op", "log", "-Tdescription"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
@ add workspace 'default'
|
2023-03-15 03:37:56 +00:00
|
|
|
◉ initialize repo
|
2024-01-07 18:32:31 +00:00
|
|
|
◉
|
2023-02-27 02:07:46 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-02-26 11:52:06 +00:00
|
|
|
/// Test "update-stale" in a dirty, but not stale working copy.
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_update_stale_snapshot() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2023-02-26 11:52:06 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "changed in main\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../secondary"]);
|
2023-02-26 11:52:06 +00:00
|
|
|
|
|
|
|
// Record new operation in one workspace.
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
2023-02-26 11:52:06 +00:00
|
|
|
|
|
|
|
// Snapshot the other working copy, which unfortunately results in concurrent
|
|
|
|
// operations, but should be resolved cleanly.
|
|
|
|
std::fs::write(secondary_path.join("file"), "changed in second\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
2023-10-10 11:07:06 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-02-26 11:52:06 +00:00
|
|
|
Concurrent modification detected, resolving automatically.
|
|
|
|
Nothing to do (the working copy is not stale).
|
|
|
|
"###);
|
|
|
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &secondary_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
@ 4976dfa88529 secondary@
|
|
|
|
│ ◉ 8357b22214ba default@
|
|
|
|
│ ◉ 1a769966ed69
|
2023-02-26 11:52:06 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ b4a6c25e7778
|
|
|
|
◉ 000000000000
|
2023-02-26 11:52:06 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2022-04-22 04:49:57 +00:00
|
|
|
/// Test forgetting workspaces
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_forget() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../secondary"]);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&main_path, &["workspace", "forget"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
2023-10-10 11:59:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @"");
|
2022-04-22 04:49:57 +00:00
|
|
|
|
|
|
|
// When listing workspaces, only the secondary workspace shows up
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
secondary: pmmvwywv feda1c4e (empty) (no description set)
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
|
|
|
// `jj status` tells us that there's no working copy here
|
2023-10-10 11:59:18 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&main_path, &["st"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
No working copy
|
|
|
|
"###);
|
2023-10-10 11:59:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @"");
|
2022-04-22 04:49:57 +00:00
|
|
|
|
2022-09-18 21:46:12 +00:00
|
|
|
// The old working copy doesn't get an "@" in the log output
|
2022-04-22 04:49:57 +00:00
|
|
|
// TODO: We should abandon the empty working copy commit
|
|
|
|
// TODO: It seems useful to still have the "secondary@" marker here even though
|
|
|
|
// there's only one workspace. We should show it when the command is not run
|
|
|
|
// from that workspace.
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &main_path), @r###"
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ feda1c4e5ffe
|
|
|
|
│ ◉ e949be04e93e
|
2023-02-09 02:53:47 +00:00
|
|
|
├─╯
|
2024-03-16 05:37:11 +00:00
|
|
|
◉ 123ed18e4c4c
|
|
|
|
◉ 000000000000
|
2022-04-22 04:49:57 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
// Revision "@" cannot be used
|
|
|
|
let stderr = test_env.jj_cmd_failure(&main_path, &["log", "-r", "@"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-04-09 23:18:32 +00:00
|
|
|
Error: Workspace "default" doesn't have a working copy
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
|
|
|
// Try to add back the workspace
|
|
|
|
// TODO: We should make this just add it back instead of failing
|
|
|
|
let stderr = test_env.jj_cmd_failure(&main_path, &["workspace", "add", "."]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
Error: Workspace already exists
|
|
|
|
"###);
|
2022-04-22 04:49:57 +00:00
|
|
|
|
2023-10-13 14:37:15 +00:00
|
|
|
// Add a third workspace...
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../third"]);
|
|
|
|
// ... and then forget it, and the secondary workspace too
|
|
|
|
let (stdout, stderr) =
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "forget", "secondary", "third"]);
|
2022-04-22 04:49:57 +00:00
|
|
|
insta::assert_snapshot!(stdout, @"");
|
2023-10-10 11:59:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @"");
|
2022-04-22 04:49:57 +00:00
|
|
|
// No workspaces left
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
}
|
|
|
|
|
2023-10-13 14:37:15 +00:00
|
|
|
#[test]
|
|
|
|
fn test_workspaces_forget_multi_transaction() {
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["new"]);
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../second"]);
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "add", "../third"]);
|
|
|
|
|
|
|
|
// there should be three workspaces
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
default: rlvkpnrz e949be04 (empty) (no description set)
|
|
|
|
second: pmmvwywv feda1c4e (empty) (no description set)
|
|
|
|
third: rzvqmyuk 485853ed (empty) (no description set)
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// delete two at once, in a single tx
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["workspace", "forget", "second", "third"]);
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
default: rlvkpnrz e949be04 (empty) (no description set)
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// the op log should have multiple workspaces forgotten in a single tx
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["op", "log", "--limit", "1"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
@ c28e1481737d test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
|
2023-10-13 14:37:15 +00:00
|
|
|
│ forget workspaces second, third
|
|
|
|
│ args: jj workspace forget second third
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// now, undo, and that should restore both workspaces
|
|
|
|
test_env.jj_cmd_ok(&main_path, &["op", "undo"]);
|
|
|
|
|
|
|
|
// finally, there should be three workspaces at the end
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
default: rlvkpnrz e949be04 (empty) (no description set)
|
|
|
|
second: pmmvwywv feda1c4e (empty) (no description set)
|
|
|
|
third: rzvqmyuk 485853ed (empty) (no description set)
|
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-01-16 02:01:37 +00:00
|
|
|
/// Test context of commit summary template
|
|
|
|
#[test]
|
|
|
|
fn test_list_workspaces_template() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2023-01-16 02:01:37 +00:00
|
|
|
test_env.add_config(
|
2023-01-26 19:26:18 +00:00
|
|
|
r#"
|
2023-02-28 11:30:57 +00:00
|
|
|
templates.commit_summary = """commit_id.short() ++ " " ++ description.first_line() ++
|
2023-02-14 14:55:30 +00:00
|
|
|
if(current_working_copy, " (current)")"""
|
2023-01-26 19:26:18 +00:00
|
|
|
"#,
|
2023-01-16 02:01:37 +00:00
|
|
|
);
|
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
std::fs::write(main_path.join("file"), "contents").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&main_path, &["commit", "-m", "initial"]);
|
|
|
|
test_env.jj_cmd_ok(
|
2023-01-16 02:01:37 +00:00
|
|
|
&main_path,
|
|
|
|
&["workspace", "add", "--name", "second", "../secondary"],
|
|
|
|
);
|
|
|
|
|
|
|
|
// "current_working_copy" should point to the workspace we operate on
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-01-31 09:17:46 +00:00
|
|
|
default: e0e6d5672858 (current)
|
|
|
|
second: f68da2d114f1
|
2023-01-16 02:01:37 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&secondary_path, &["workspace", "list"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-01-31 09:17:46 +00:00
|
|
|
default: e0e6d5672858
|
|
|
|
second: f68da2d114f1 (current)
|
2023-01-16 02:01:37 +00:00
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2023-01-24 11:46:59 +00:00
|
|
|
/// Test getting the workspace root from primary and secondary workspaces
|
|
|
|
#[test]
|
|
|
|
fn test_workspaces_root() {
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "main"]);
|
2023-01-24 11:46:59 +00:00
|
|
|
let main_path = test_env.env_root().join("main");
|
|
|
|
let secondary_path = test_env.env_root().join("secondary");
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_path, &["workspace", "root"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
$TEST_ENV/main
|
|
|
|
"###);
|
|
|
|
let main_subdir_path = main_path.join("subdir");
|
|
|
|
std::fs::create_dir(&main_subdir_path).unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&main_subdir_path, &["workspace", "root"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
$TEST_ENV/main
|
|
|
|
"###);
|
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(
|
2023-01-24 11:46:59 +00:00
|
|
|
&main_path,
|
|
|
|
&["workspace", "add", "--name", "secondary", "../secondary"],
|
|
|
|
);
|
|
|
|
let stdout = test_env.jj_cmd_success(&secondary_path, &["workspace", "root"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
$TEST_ENV/secondary
|
|
|
|
"###);
|
|
|
|
let secondary_subdir_path = secondary_path.join("subdir");
|
|
|
|
std::fs::create_dir(&secondary_subdir_path).unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&secondary_subdir_path, &["workspace", "root"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
$TEST_ENV/secondary
|
|
|
|
"###);
|
|
|
|
}
|
|
|
|
|
2022-04-22 04:49:57 +00:00
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
2023-08-15 03:18:52 +00:00
|
|
|
let template = r#"
|
2023-02-28 10:43:14 +00:00
|
|
|
separate(" ",
|
2024-03-16 05:37:11 +00:00
|
|
|
commit_id.short(),
|
2023-02-28 10:43:14 +00:00
|
|
|
working_copies,
|
|
|
|
if(divergent, "(divergent)"),
|
2022-10-19 05:21:25 +00:00
|
|
|
)
|
2023-08-15 03:18:52 +00:00
|
|
|
"#;
|
2023-02-28 10:43:14 +00:00
|
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", template, "-r", "all()"])
|
2022-04-22 04:49:57 +00:00
|
|
|
}
|