cli: report branches as missing, not deleted

"Deleted" is inaccurate if the branch never existed to begin with.
jj-vcs · Dec 14, 2022 · 00c3f3a · 00c3f3a
1 parent b237e3c
commit 00c3f3a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/commands.rs b/src/commands.rs
@@ -3593,7 +3593,7 @@ fn list_branches(
                 }
             }
             None => {
-                writeln!(formatter, " (deleted)")?;
+                writeln!(formatter, " (missing)")?;
             }
         }
         Ok(())

diff --git a/tests/test_git_import_export.rs b/tests/test_git_import_export.rs
@@ -98,7 +98,7 @@ fn test_git_import_remote_only_branch() {
     test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote=origin"]);
     insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
     feature1: 9f01a0e04879 message
-    feature2 (deleted)
+    feature2 (missing)
       @origin: 9f01a0e04879 message
     "###);
 }

diff --git a/tests/test_git_push.rs b/tests/test_git_push.rs
@@ -142,7 +142,7 @@ fn test_git_push_all() {
     // Check the setup
     let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);
     insta::assert_snapshot!(stdout, @r###"
-    branch1 (deleted)
+    branch1 (missing)
       @origin: 828a683493c6 description 1
     branch2: afc3e612e744 foo
       @origin (ahead by 1 commits, behind by 1 commits): 752dad8b1718 description 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -3593,7 +3593,7 @@ fn list_branches( @@
                     }
                 }
                 None => {
-                    writeln!(formatter, " (deleted)")?;
+                    writeln!(formatter, " (missing)")?;
                 }
             }
             Ok(())
@@ Expand Down @@