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
|
// 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::create_commit_with_files;
use crate::common::TestEnvironment;
#[test]
fn test_status_copies() {
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("copy-source", "copy1\ncopy2\ncopy3\n");
work_dir.write_file("rename-source", "rename");
work_dir.run_jj(["new"]).success();
work_dir.write_file("copy-source", "copy1\ncopy2\ncopy3\nsource\n");
work_dir.write_file("copy-target", "copy1\ncopy2\ncopy3\ntarget\n");
work_dir.remove_file("rename-source");
work_dir.write_file("rename-target", "rename");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
M copy-source
C {copy-source => copy-target}
R {rename-source => rename-target}
Working copy (@) : rlvkpnrz c2fce842 (no description set)
Parent commit (@-): qpvuntsm ebf799bc (no description set)
[EOF]
");
}
#[test]
fn test_status_merge() {
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("file", "base");
work_dir.run_jj(["new", "-m=left"]).success();
work_dir
.run_jj(["bookmark", "create", "-r@", "left"])
.success();
work_dir.run_jj(["new", "@-", "-m=right"]).success();
work_dir.write_file("file", "right");
work_dir.run_jj(["new", "left", "@"]).success();
// The output should mention each parent, and the diff should be empty (compared
// to the auto-merged parents)
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : mzvwutvl f62dad77 (empty) (no description set)
Parent commit (@-): rlvkpnrz a007d87b left | (empty) left
Parent commit (@-): zsuskuln e6ad1952 right
[EOF]
");
}
// See https://github.com/jj-vcs/jj/issues/2051.
#[test]
fn test_status_ignored_gitignore() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let untracked_dir = work_dir.create_dir("untracked");
untracked_dir.write_file("inside_untracked", "test");
untracked_dir.write_file(".gitignore", "!inside_untracked\n");
work_dir.write_file(".gitignore", "untracked/\n!dummy\n");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
A .gitignore
Working copy (@) : qpvuntsm 32bad97e (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
}
#[test]
fn test_status_filtered() {
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("file_1", "file_1");
work_dir.write_file("file_2", "file_2");
// The output filtered to file_1 should not list the addition of file_2.
let output = work_dir.run_jj(["status", "file_1"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
A file_1
Working copy (@) : qpvuntsm 2f169edb (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
}
// See <https://github.com/jj-vcs/jj/issues/3108>
// See <https://github.com/jj-vcs/jj/issues/4147>
#[test]
fn test_status_display_relevant_working_commit_conflict_hints() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// PARENT: Write the initial file
work_dir.write_file("conflicted.txt", "initial contents");
work_dir
.run_jj(["describe", "--message", "Initial contents"])
.success();
// CHILD1: New commit on top of <PARENT>
work_dir
.run_jj(["new", "--message", "First part of conflicting change"])
.success();
work_dir.write_file("conflicted.txt", "Child 1");
// CHILD2: New commit also on top of <PARENT>
work_dir
.run_jj([
"new",
"--message",
"Second part of conflicting change",
"@-",
])
.success();
work_dir.write_file("conflicted.txt", "Child 2");
// CONFLICT: New commit that is conflicted by merging <CHILD1> and <CHILD2>
work_dir
.run_jj(["new", "--message", "boom", "all:(@-)+"])
.success();
// Adding more descendants to ensure we correctly find the root ancestors with
// conflicts, not just the parents.
work_dir.run_jj(["new", "--message", "boom-cont"]).success();
work_dir
.run_jj(["new", "--message", "boom-cont-2"])
.success();
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r###"
The working copy has no changes.
Working copy (@) : yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 681c71af (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict
Hint: To resolve the conflicts, start by creating a commit on top of
the first conflicted commit:
jj new mzvwutvl
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you can inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.
[EOF]
"###);
let output = work_dir.run_jj(["status", "--color=always"]);
insta::assert_snapshot!(output, @r###"
The working copy has no changes.
Working copy (@) : [1m[38;5;13my[38;5;8mqosqzyt[39m [38;5;12m7[38;5;8me0bc4cf[39m [38;5;9m(conflict)[39m [38;5;10m(empty)[39m boom-cont-2[0m
Parent commit (@-): [1m[38;5;5mr[0m[38;5;8moyxmykx[39m [1m[38;5;4m6[0m[38;5;8m81c71af[39m [38;5;1m(conflict)[39m [38;5;2m(empty)[39m boom-cont
[1m[38;5;3mWarning: [39mThere are unresolved conflicts at these paths:[0m
conflicted.txt [38;5;3m2-sided conflict[39m
[1m[38;5;6mHint: [0m[39mTo resolve the conflicts, start by creating a commit on top of[39m
[39mthe first conflicted commit:[39m
[39m jj new [1m[38;5;5mm[0m[38;5;8mzvwutvl[39m[39m
[39mThen use `jj resolve`, or edit the conflict markers in the file directly.[39m
[39mOnce the conflicts are resolved, you can inspect the result with `jj diff`.[39m
[39mThen run `jj squash` to move the resolution into the conflicted commit.[39m
[EOF]
"###);
let output = work_dir.run_jj(["status", "--config=hints.resolving-conflicts=false"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 681c71af (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict
[EOF]
");
// Resolve conflict
work_dir.run_jj(["new", "--message", "fixed 1"]).success();
work_dir.write_file("conflicted.txt", "first commit to fix conflict");
// Add one more commit atop the commit that resolves the conflict.
work_dir.run_jj(["new", "--message", "fixed 2"]).success();
work_dir.write_file("conflicted.txt", "edit not conflict");
// wc is now conflict free, parent is also conflict free
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
@ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
M conflicted.txt
Working copy (@) : wqnwkozp cc7d68f7 fixed 2
Parent commit (@-): kmkuslsw 812e2163 fixed 1
[EOF]
");
// Step back one.
// wc is still conflict free, parent has a conflict.
work_dir.run_jj(["edit", "@-"]).success();
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
@ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
M conflicted.txt
Working copy (@) : kmkuslsw 812e2163 fixed 1
Parent commit (@-): yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Hint: Conflict in parent commit has been resolved in working copy
[EOF]
");
// Step back to all the way to `root()+` so that wc has no conflict, even though
// there is a conflict later in the tree. So that we can confirm
// our hinting logic doesn't get confused.
work_dir.run_jj(["edit", "root()+"]).success();
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
A conflicted.txt
Working copy (@) : qpvuntsm fe876a9c Initial contents
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
}
#[test]
fn test_status_simplify_conflict_sides() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Creates a 4-sided conflict, with fileA and fileB having different conflicts:
// fileA: A - B + C - B + B - B + B
// fileB: A - A + A - A + B - C + D
create_commit_with_files(
&work_dir,
"base",
&[],
&[("fileA", "base\n"), ("fileB", "base\n")],
);
create_commit_with_files(&work_dir, "a1", &["base"], &[("fileA", "1\n")]);
create_commit_with_files(&work_dir, "a2", &["base"], &[("fileA", "2\n")]);
create_commit_with_files(&work_dir, "b1", &["base"], &[("fileB", "1\n")]);
create_commit_with_files(&work_dir, "b2", &["base"], &[("fileB", "2\n")]);
create_commit_with_files(&work_dir, "conflictA", &["a1", "a2"], &[]);
create_commit_with_files(&work_dir, "conflictB", &["b1", "b2"], &[]);
create_commit_with_files(&work_dir, "conflict", &["conflictA", "conflictB"], &[]);
insta::assert_snapshot!(work_dir.run_jj(["status"]),
@r###"
The working copy has no changes.
Working copy (@) : nkmrtpmo a5a545ce conflict | (conflict) (empty) conflict
Parent commit (@-): kmkuslsw ccb05364 conflictA | (conflict) (empty) conflictA
Parent commit (@-): lylxulpl d9bc60cb conflictB | (conflict) (empty) conflictB
Warning: There are unresolved conflicts at these paths:
fileA 2-sided conflict
fileB 2-sided conflict
Hint: To resolve the conflicts, start by creating a commit on top of
one of the first conflicted commits:
jj new lylxulpl
jj new kmkuslsw
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you can inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.
[EOF]
"###);
}
#[test]
fn test_status_untracked_files() {
let test_env = TestEnvironment::default();
test_env.add_config(r#"snapshot.auto-track = "none()""#);
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("always-untracked-file", "...");
work_dir.write_file("initially-untracked-file", "...");
let sub_dir = work_dir.create_dir("sub");
sub_dir.write_file("always-untracked", "...");
sub_dir.write_file("initially-untracked", "...");
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
Untracked paths:
? always-untracked-file
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : qpvuntsm e8849ae1 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
work_dir
.run_jj([
"file",
"track",
"initially-untracked-file",
"sub/initially-untracked",
])
.success();
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
Working copy changes:
A initially-untracked-file
A sub/initially-untracked
Untracked paths:
? always-untracked-file
? sub/always-untracked
Working copy (@) : qpvuntsm b8c1286d (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
work_dir.run_jj(["new"]).success();
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
Untracked paths:
? always-untracked-file
? sub/always-untracked
Working copy (@) : mzvwutvl daa133b8 (empty) (no description set)
Parent commit (@-): qpvuntsm b8c1286d (no description set)
[EOF]
");
work_dir
.run_jj([
"file",
"untrack",
"initially-untracked-file",
"sub/initially-untracked",
])
.success();
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
Working copy changes:
D initially-untracked-file
D sub/initially-untracked
Untracked paths:
? always-untracked-file
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : mzvwutvl 240f261a (no description set)
Parent commit (@-): qpvuntsm b8c1286d (no description set)
[EOF]
");
work_dir.run_jj(["new"]).success();
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
Untracked paths:
? always-untracked-file
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : yostqsxw 50beac0d (empty) (no description set)
Parent commit (@-): mzvwutvl 240f261a (no description set)
[EOF]
");
}
|