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
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
// 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 crate::common::create_commit_with_files;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test]
fn test_backout() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("a", "a\n")]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @r"
A a
[EOF]
");
// Backout the commit
let output = work_dir.run_jj(["backout", "-r", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: `jj backout` is deprecated; use `jj revert` instead
Warning: `jj backout` will be removed in a future version, and this will be a hard error
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ b8c8e82a19bc Back out "a"
│
│ This backs out commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
let output = work_dir.run_jj(["diff", "-s", "-r", "@+"]);
insta::assert_snapshot!(output, @r"
D a
[EOF]
");
// Backout the new backed-out commit
work_dir.run_jj(["edit", "@+"]).success();
let output = work_dir.run_jj(["backout", "-r", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: `jj backout` is deprecated; use `jj revert` instead
Warning: `jj backout` will be removed in a future version, and this will be a hard error
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 812d823be175 Back out "Back out "a""
│
│ This backs out commit b8c8e82a19bcf6217e065d1aff9a5f0ba807b565.
@ b8c8e82a19bc Back out "a"
│
│ This backs out commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
let output = work_dir.run_jj(["diff", "-s", "-r", "@+"]);
insta::assert_snapshot!(output, @r"
A a
[EOF]
");
}
#[test]
fn test_backout_multiple() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("a", "a\n")]);
create_commit_with_files(&work_dir, "b", &["a"], &[("a", "a\nb\n")]);
create_commit_with_files(&work_dir, "c", &["b"], &[("a", "a\nb\n"), ("b", "b\n")]);
create_commit_with_files(&work_dir, "d", &["c"], &[]);
create_commit_with_files(&work_dir, "e", &["d"], &[("a", "a\nb\nc\n")]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
// Backout multiple commits
let output = work_dir.run_jj(["backout", "-r", "b", "-r", "c", "-r", "e"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: `jj backout` is deprecated; use `jj revert` instead
Warning: `jj backout` will be removed in a future version, and this will be a hard error
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 036128aa5f6e Back out "b"
│
│ This backs out commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
○ 156974608bed Back out "c"
│
│ This backs out commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
○ 3f72017241e0 Back out "e"
│
│ This backs out commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
// View the output of each backed out commit
let output = work_dir.run_jj(["show", "@+"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 3f72017241e0a32ab837ae929061cdc05ff04f5b
Change ID: wqnwkozpkustnxypnnntnykwrqrkrpvv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "e"
This backs out commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
Modified regular file a:
1 1: a
2 2: b
3 : c
[EOF]
"#);
let output = work_dir.run_jj(["show", "@++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 156974608bed539fb98d89c1f6995d962123cdbd
Change ID: mouksmquosnpvwqrpsvvxtxpywpnxlss
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "c"
This backs out commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
Removed regular file b:
1 : b
[EOF]
"#);
let output = work_dir.run_jj(["show", "@+++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 036128aa5f6eb3770cc8284c0dbe198b2c9a5f62
Change ID: tqvpomtpwrqsylrpsxknultrymmqxmxv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "b"
This backs out commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
Modified regular file a:
1 1: a
2 : b
[EOF]
"#);
}
#[test]
fn test_backout_description_template() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(
r#"
[templates]
backout_description = '''
separate(" ",
"Revert commit",
commit_id.short(),
'"' ++ description.first_line() ++ '"',
)
'''
"#,
);
let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("a", "a\n")]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @r"
A a
[EOF]
");
// Verify that message of backed out commit follows the template
let output = work_dir.run_jj(["backout", "-r", "a"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: `jj backout` is deprecated; use `jj revert` instead
Warning: `jj backout` will be removed in a future version, and this will be a hard error
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 6bfb98a33f58 Revert commit 7d980be7a1d4 "a"
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
}
#[must_use]
fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"commit_id.short() ++ " " ++ description"#;
work_dir.run_jj(["log", "-T", template])
}
|
