1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
// Copyright 2022 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 crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test]
fn test_edit() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "0");
work_dir.run_jj(["commit", "-m", "first"]).success();
work_dir.run_jj(["describe", "-m", "second"]).success();
work_dir.write_file("file1", "1");
// Errors out without argument
let output = work_dir.run_jj(["edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
error: the following required arguments were not provided:
<REVSET>
Usage: jj edit <REVSET>
For more information, try '--help'.
[EOF]
[exit status: 2]
");
// Makes the specified commit the working-copy commit
let output = work_dir.run_jj(["edit", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 1f6994f8 first
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
○ b38b8e65163a second
@ 1f6994f8b95b first
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(work_dir.read_file("file1"), @"0");
// Changes in the working copy are amended into the commit
work_dir.write_file("file2", "0");
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
○ d5aea29cb4cb second
@ 2636584c21c0 first
◆ 000000000000
[EOF]
------- stderr -------
Rebased 1 descendant commits onto updated working copy
[EOF]
");
}
#[test]
// Windows says "Access is denied" when trying to delete the object file.
#[cfg(unix)]
fn test_edit_current_wc_commit_missing() {
use std::path::PathBuf;
// Test that we get a reasonable error message when the current working-copy
// commit is missing
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.run_jj(["commit", "-m", "first"]).success();
work_dir.run_jj(["describe", "-m", "second"]).success();
work_dir.run_jj(["edit", "@-"]).success();
let wc_id = work_dir
.run_jj(["log", "--no-graph", "-T=commit_id", "-r=@"])
.success()
.stdout
.into_raw();
let wc_child_id = work_dir
.run_jj(["log", "--no-graph", "-T=commit_id", "-r=@+"])
.success()
.stdout
.into_raw();
// Make the Git backend fail to read the current working copy commit
let commit_object_path = PathBuf::from_iter([
".jj",
"repo",
"store",
"git",
"objects",
&wc_id[..2],
&wc_id[2..],
]);
work_dir.remove_file(commit_object_path);
// Pass --ignore-working-copy to avoid triggering the error at snapshot time
let output = work_dir.run_jj(["edit", "--ignore-working-copy", &wc_child_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Internal error: Failed to edit a commit
Caused by:
1: Current working-copy commit not found
2: Object 68a505386f936fff6d718f55005e77ea72589bc1 of type commit not found
3: An object with id 68a505386f936fff6d718f55005e77ea72589bc1 could not be found
[EOF]
[exit status: 255]
");
}
#[must_use]
fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"commit_id.short() ++ " " ++ description"#;
work_dir.run_jj(["log", "-T", template])
}
|
