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 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582
|
// 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 std::path::PathBuf;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test]
fn test_commit_with_description_from_cli() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Description applies to the current working-copy (not the new one)
work_dir.run_jj(["commit", "-m=first"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ eb9fd2ab82e7
○ 68a505386f93 first
◆ 000000000000
[EOF]
");
}
#[test]
fn test_commit_with_editor() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Check that the text file gets initialized with the current description and
// set a new one
work_dir.run_jj(["describe", "-m=initial"]).success();
std::fs::write(&edit_script, ["dump editor0", "write\nmodified"].join("\0")).unwrap();
work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2094c8f2e360
○ a7ba1eb73836 modified
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r#"
initial
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
// Check that the editor content includes diff summary
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "foo\n");
work_dir.run_jj(["describe", "-m=add files"]).success();
std::fs::write(&edit_script, "dump editor1").unwrap();
work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
add files
JJ: This commit contains the following changes:
JJ: A file1
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
}
#[test]
fn test_commit_with_editor_avoids_unc() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
std::fs::write(edit_script, "dump-path path").unwrap();
work_dir.run_jj(["commit"]).success();
let edited_path =
PathBuf::from(std::fs::read_to_string(test_env.env_root().join("path")).unwrap());
// While `assert!(!edited_path.starts_with("//?/"))` could work here in most
// cases, it fails when it is not safe to strip the prefix, such as paths
// over 260 chars.
assert_eq!(edited_path, dunce::simplified(&edited_path));
}
#[test]
fn test_commit_with_empty_description_from_cli() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["commit", "-m="]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 51b556e22ca0
○ cc8ff2284a8c
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 51b556e2 (empty) (no description set)
Parent commit (@-) : qpvuntsm cc8ff228 (empty) (no description set)
[EOF]
");
}
#[test]
fn test_commit_with_empty_description_from_editor() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Check that the text file gets initialized and leave it untouched.
std::fs::write(&edit_script, ["dump editor0"].join("\0")).unwrap();
let output = work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 51b556e22ca0
○ cc8ff2284a8c
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(),
@r#"JJ: Lines starting with "JJ:" (like this one) will be removed."#
);
insta::assert_snapshot!(output, @r"
------- stderr -------
Hint: The commit message was left empty.
If this was not intentional, run `jj undo` to restore the previous state.
Or run `jj desc @-` to add a description to the parent commit.
Working copy (@) now at: rlvkpnrz 51b556e2 (empty) (no description set)
Parent commit (@-) : qpvuntsm cc8ff228 (empty) (no description set)
[EOF]
");
}
#[test]
fn test_commit_interactive() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["describe", "-m=add files"]).success();
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
let diff_script = ["rm file2", "dump JJ-INSTRUCTIONS instrs"].join("\0");
std::fs::write(diff_editor, diff_script).unwrap();
// Create a commit interactively and select only file1
work_dir.run_jj(["commit", "-i"]).success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are splitting the working-copy commit: qpvuntsm d849dc34 add files
The diff initially shows all changes. Adjust the right side until it shows the
contents you want for the first commit. The remainder will be included in the
new working-copy commit.
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
add files
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
// Try again with --tool=<name>, which implies --interactive
work_dir.run_jj(["undo"]).success();
work_dir
.run_jj([
"commit",
"--config=ui.diff-editor='false'",
"--tool=fake-diff-editor",
])
.success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
add files
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 9b0176ab
│ (no description set)
│ A file2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 6e6fa925
│ add files
│ A file1
◆ zzzzzzzz root() 00000000
[EOF]
");
}
#[test]
fn test_commit_interactive_with_paths() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file2", "");
work_dir.write_file("file3", "");
work_dir.run_jj(["new", "-medit"]).success();
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.write_file("file3", "baz\n");
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
let diff_script = [
"files-before file2",
"files-after JJ-INSTRUCTIONS file1 file2",
"reset file2",
]
.join("\0");
std::fs::write(diff_editor, diff_script).unwrap();
// Select file1 and file2 by args, then select file1 interactively
let output = work_dir.run_jj(["commit", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 50f426df (no description set)
Parent commit (@-) : rlvkpnrz eb640375 edit
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
edit
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 50f426df
│ (no description set)
│ M file2
│ M file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 eb640375
│ edit
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff687a2f
│ (no description set)
│ A file2
│ A file3
◆ zzzzzzzz root() 00000000
[EOF]
");
}
#[test]
fn test_commit_with_default_description() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ cba559ac1a48
○ 7276dfff8027 TESTED=TODO
◆ 000000000000
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
TESTED=TODO
JJ: This commit contains the following changes:
JJ: A file1
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
}
#[test]
fn test_commit_with_description_template() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(
r#"
[templates]
draft_commit_description = '''
concat(
description,
"\n",
indent(
"JJ: ",
concat(
"Author: " ++ format_detailed_signature(author) ++ "\n",
"Committer: " ++ format_detailed_signature(committer) ++ "\n",
"\n",
diff.stat(76),
),
),
)
'''
"#,
);
let work_dir = test_env.work_dir("repo");
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.write_file("file3", "foobar\n");
// Only file1 should be included in the diff
work_dir.run_jj(["commit", "file1"]).success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
JJ: Author: Test User <test.user@example.com> (2001-02-03 08:05:08)
JJ: Committer: Test User <test.user@example.com> (2001-02-03 08:05:08)
JJ: file1 | 1 +
JJ: 1 file changed, 1 insertion(+), 0 deletions(-)
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
// Only file2 with modified author should be included in the diff
work_dir
.run_jj([
"commit",
"--author",
"Another User <another.user@example.com>",
"file2",
])
.success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
JJ: Author: Another User <another.user@example.com> (2001-02-03 08:05:08)
JJ: Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
JJ: file2 | 1 +
JJ: 1 file changed, 1 insertion(+), 0 deletions(-)
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
// Timestamp after the reset should be available to the template
work_dir.run_jj(["commit", "--reset-author"]).success();
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
JJ: Author: Test User <test.user@example.com> (2001-02-03 08:05:10)
JJ: Committer: Test User <test.user@example.com> (2001-02-03 08:05:10)
JJ: file3 | 1 +
JJ: 1 file changed, 1 insertion(+), 0 deletions(-)
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
}
#[test]
fn test_commit_without_working_copy() {
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(["workspace", "forget"]).success();
let output = work_dir.run_jj(["commit", "-m=first"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: This command requires a working copy
[EOF]
[exit status: 1]
");
}
#[test]
fn test_commit_paths() {
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", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["commit", "-m=first", "file1"]).success();
let output = work_dir.run_jj(["diff", "-r", "@-"]);
insta::assert_snapshot!(output, @r"
Added regular file file1:
1: foo
[EOF]
");
let output = work_dir.run_jj(["diff"]);
insta::assert_snapshot!(output, @r"
Added regular file file2:
1: bar
[EOF]
");
}
#[test]
fn test_commit_paths_warning() {
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", "foo\n");
work_dir.write_file("file2", "bar\n");
let output = work_dir.run_jj(["commit", "-m=first", "file3"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: The given paths do not match any file: file3
Working copy (@) now at: rlvkpnrz 4c6f0146 (no description set)
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
let output = work_dir.run_jj(["diff"]);
insta::assert_snapshot!(output, @r"
Added regular file file1:
1: foo
Added regular file file2:
1: bar
[EOF]
");
}
#[test]
fn test_commit_reset_author() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
test_env.add_config(
r#"[template-aliases]
'format_signature(signature)' = 'signature.name() ++ " " ++ signature.email() ++ " " ++ signature.timestamp()'"#,
);
let get_signatures = || {
let template = r#"format_signature(author) ++ "\n" ++ format_signature(committer)"#;
work_dir.run_jj(["log", "-r@", "-T", template])
};
insta::assert_snapshot!(get_signatures(), @r"
@ Test User test.user@example.com 2001-02-03 04:05:07.000 +07:00
│ Test User test.user@example.com 2001-02-03 04:05:07.000 +07:00
~
[EOF]
");
// Reset the author (the committer is always reset)
work_dir
.run_jj([
"commit",
"--config=user.name=Ove Ridder",
"--config=user.email=ove.ridder@example.com",
"--reset-author",
"-m1",
])
.success();
insta::assert_snapshot!(get_signatures(), @r"
@ Ove Ridder ove.ridder@example.com 2001-02-03 04:05:09.000 +07:00
│ Ove Ridder ove.ridder@example.com 2001-02-03 04:05:09.000 +07:00
~
[EOF]
");
}
#[test]
fn test_commit_trailers() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
test_env.add_config(
r#"[templates]
commit_trailers = '''"Reviewed-by: " ++ self.committer().email()'''"#,
);
work_dir.write_file("file1", "foo\n");
let output = work_dir.run_jj(["commit", "-m=first"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 0c0495f3 (empty) (no description set)
Parent commit (@-) : qpvuntsm ae86ffd4 first
[EOF]
");
let output = work_dir.run_jj(["log", "--no-graph", "-r@-", "-Tdescription"]);
insta::assert_snapshot!(output, @r"
first
Reviewed-by: test.user@example.com
[EOF]
");
// the new committer should appear in the trailer
let output = work_dir.run_jj(["commit", "--config=user.email=foo@bar.org", "-m=second"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: zsuskuln fd73eac2 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 6e69e833 (empty) second
[EOF]
");
let output = work_dir.run_jj(["log", "--no-graph", "-r@-", "-Tdescription"]);
insta::assert_snapshot!(output, @r"
second
Reviewed-by: foo@bar.org
[EOF]
");
// the trailer is added in the editor
std::fs::write(&edit_script, "dump editor0").unwrap();
let output = work_dir.run_jj(["commit", "--config=user.email=foo@bar.org"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx dac9709c (empty) (no description set)
Parent commit (@-) : zsuskuln d9ced309 (empty) Reviewed-by: foo@bar.org
[EOF]
");
let editor0 = std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap();
insta::assert_snapshot!(
format!("-----\n{editor0}-----\n"), @r#"
-----
Reviewed-by: foo@bar.org
JJ: Lines starting with "JJ:" (like this one) will be removed.
-----
"#);
let output = work_dir.run_jj(["log", "--no-graph", "-r@-", "-Tdescription"]);
insta::assert_snapshot!(output, @r"
Reviewed-by: foo@bar.org
[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])
}
|