forked from mirrors/jj
d66fcf2ca0
this greatly speeds up the time to run all tests, at the cost of slightly larger recompile times for individual tests. this unfortunately adds the requirement that all tests are listed in `runner.rs` for the crate. to avoid forgetting, i've added a new test that ensures the directory is in sync with the file. ## benchmarks before this change, recompiling all tests took 32-50 seconds and running a single test took 3.5 seconds: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test test_working_copy' Time (mean ± σ): 3.543 s ± 0.168 s [User: 2.597 s, System: 1.262 s] Range (min … max): 3.400 s … 3.847 s 10 runs ``` after this change, recompiling all tests take 4 seconds: ``` ; hyperfine 'touch lib/src/lib.rs ; cargo t --test runner --no-run' Time (mean ± σ): 4.055 s ± 0.123 s [User: 3.591 s, System: 1.593 s] Range (min … max): 3.804 s … 4.159 s 10 runs ``` and running a single test takes about the same: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test runner -- test_working_copy' Time (mean ± σ): 4.129 s ± 0.120 s [User: 3.636 s, System: 1.593 s] Range (min … max): 3.933 s … 4.346 s 10 runs ``` about 1.4 seconds of that is the time for the runner, of which .4 is the time for the linker. so there may be room for further improving the times.
902 lines
37 KiB
Rust
902 lines
37 KiB
Rust
// 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::{get_stderr_string, get_stdout_string, TestEnvironment};
|
|
|
|
fn set_up() -> (TestEnvironment, PathBuf) {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "origin"]);
|
|
let origin_path = test_env.env_root().join("origin");
|
|
let origin_git_repo_path = origin_path
|
|
.join(".jj")
|
|
.join("repo")
|
|
.join("store")
|
|
.join("git");
|
|
|
|
test_env.jj_cmd_ok(&origin_path, &["describe", "-m=description 1"]);
|
|
test_env.jj_cmd_ok(&origin_path, &["branch", "create", "branch1"]);
|
|
test_env.jj_cmd_ok(&origin_path, &["new", "root()", "-m=description 2"]);
|
|
test_env.jj_cmd_ok(&origin_path, &["branch", "create", "branch2"]);
|
|
test_env.jj_cmd_ok(&origin_path, &["git", "export"]);
|
|
|
|
test_env.jj_cmd_ok(
|
|
test_env.env_root(),
|
|
&[
|
|
"git",
|
|
"clone",
|
|
"--config-toml=git.auto-local-branch=true",
|
|
origin_git_repo_path.to_str().unwrap(),
|
|
"local",
|
|
],
|
|
);
|
|
let workspace_root = test_env.env_root().join("local");
|
|
(test_env, workspace_root)
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_nothing() {
|
|
let (test_env, workspace_root) = set_up();
|
|
// Show the setup. `insta` has trouble if this is done inside `set_up()`
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: lzmmnrxq 45a3aa29 (empty) description 1
|
|
@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
branch2: rlzusymt 8476341e (empty) description 2
|
|
@origin: rlzusymt 8476341e (empty) description 2
|
|
"###);
|
|
// No branches to push yet
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--all"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_current_branch() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
|
// Update some branches. `branch1` is not a current branch, but `branch2` and
|
|
// `my-branch` are.
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["describe", "branch1", "-m", "modified branch1 commit"],
|
|
);
|
|
test_env.jj_cmd_ok(&workspace_root, &["co", "branch2"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch2"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
// Check the setup
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: lzmmnrxq 19e00bf6 (empty) modified branch1 commit
|
|
@origin (ahead by 1 commits, behind by 1 commits): lzmmnrxq hidden 45a3aa29 (empty) description 1
|
|
branch2: yostqsxw 10ee3363 (empty) foo
|
|
@origin (behind by 1 commits): rlzusymt 8476341e (empty) description 2
|
|
my-branch: yostqsxw 10ee3363 (empty) foo
|
|
"###);
|
|
// First dry-run. `branch1` should not get pushed.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--dry-run"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Move branch branch2 from 8476341eb395 to 10ee3363b259
|
|
Add branch my-branch to 10ee3363b259
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Move branch branch2 from 8476341eb395 to 10ee3363b259
|
|
Add branch my-branch to 10ee3363b259
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: lzmmnrxq 19e00bf6 (empty) modified branch1 commit
|
|
@origin (ahead by 1 commits, behind by 1 commits): lzmmnrxq hidden 45a3aa29 (empty) description 1
|
|
branch2: yostqsxw 10ee3363 (empty) foo
|
|
@origin: yostqsxw 10ee3363 (empty) foo
|
|
my-branch: yostqsxw 10ee3363 (empty) foo
|
|
@origin: yostqsxw 10ee3363 (empty) foo
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_parent_branch() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
|
test_env.jj_cmd_ok(&workspace_root, &["edit", "branch1"]);
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["describe", "-m", "modified branch1 commit"],
|
|
);
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "non-empty description"]);
|
|
std::fs::write(workspace_root.join("file"), "file").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Force branch branch1 from 45a3aa29e907 to d47326d59ee1
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_no_matching_branch() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
No branches found in the default push revset, `remote_branches(remote=origin)..@`.
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_matching_branch_unchanged() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["co", "branch1"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
No branches found in the default push revset, `remote_branches(remote=origin)..@`.
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
/// Test that `jj git push` without arguments pushes a branch to the specified
|
|
/// remote even if it's already up to date on another remote
|
|
/// (`remote_branches(remote=<remote>)..@` vs. `remote_branches()..@`).
|
|
#[test]
|
|
fn test_git_push_other_remote_has_branch() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
|
// Create another remote (but actually the same)
|
|
let other_remote_path = test_env
|
|
.env_root()
|
|
.join("origin")
|
|
.join(".jj")
|
|
.join("repo")
|
|
.join("store")
|
|
.join("git");
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&[
|
|
"git",
|
|
"remote",
|
|
"add",
|
|
"other",
|
|
other_remote_path.to_str().unwrap(),
|
|
],
|
|
);
|
|
// Modify branch1 and push it to `origin`
|
|
test_env.jj_cmd_ok(&workspace_root, &["edit", "branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m=modified"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Force branch branch1 from 45a3aa29e907 to 50421a29358a
|
|
"###);
|
|
// Since it's already pushed to origin, nothing will happen if push again
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
No branches found in the default push revset, `remote_branches(remote=origin)..@`.
|
|
Nothing changed.
|
|
"###);
|
|
// But it will still get pushed to another remote
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--remote=other"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to other:
|
|
Add branch branch1 to 50421a29358a
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_not_fast_forward() {
|
|
let (test_env, workspace_root) = set_up();
|
|
|
|
// Move branch1 forward on the remote
|
|
let origin_path = test_env.env_root().join("origin");
|
|
test_env.jj_cmd_ok(&origin_path, &["new", "branch1", "-m=remote"]);
|
|
std::fs::write(origin_path.join("remote"), "remote").unwrap();
|
|
test_env.jj_cmd_ok(&origin_path, &["branch", "set", "branch1"]);
|
|
test_env.jj_cmd_ok(&origin_path, &["git", "export"]);
|
|
|
|
// Move branch1 forward to another commit locally
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "branch1", "-m=local"]);
|
|
std::fs::write(workspace_root.join("local"), "local").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch1"]);
|
|
|
|
// Pushing should fail
|
|
let assert = test_env
|
|
.jj_cmd(&workspace_root, &["git", "push"])
|
|
.assert()
|
|
.code(1);
|
|
insta::assert_snapshot!(get_stdout_string(&assert), @"");
|
|
insta::assert_snapshot!(get_stderr_string(&assert), @r###"
|
|
Branch changes to push to origin:
|
|
Move branch branch1 from 45a3aa29e907 to c35839cb8e8c
|
|
Error: The push conflicts with changes made on the remote (it is not fast-forwardable).
|
|
Hint: Try fetching from the remote, then make the branch point to where you want it to be, and push again.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_locally_created_and_rewritten() {
|
|
let (test_env, workspace_root) = set_up();
|
|
// Ensure that remote branches aren't tracked automatically
|
|
test_env.add_config("git.auto-local-branch = false");
|
|
|
|
// Push locally-created branch
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "root()", "-mlocal 1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my"]);
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch my to fcc999921ce9
|
|
"###);
|
|
|
|
// Rewrite it and push again, which would fail if the pushed branch weren't
|
|
// set to "tracking"
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-mlocal 2"]);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: lzmmnrxq 45a3aa29 (empty) description 1
|
|
@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
branch2: rlzusymt 8476341e (empty) description 2
|
|
@origin: rlzusymt 8476341e (empty) description 2
|
|
my: vruxwmqv bde1d2e4 (empty) local 2
|
|
@origin (ahead by 1 commits, behind by 1 commits): vruxwmqv hidden fcc99992 (empty) local 1
|
|
"###);
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Force branch my from fcc999921ce9 to bde1d2e44b2a
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_multiple() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "delete", "branch1"]);
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["branch", "set", "--allow-backwards", "branch2"],
|
|
);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
// Check the setup
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1 (deleted)
|
|
@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
(this branch will be *deleted permanently* on the remote on the next `jj git push`. Use `jj branch forget` to prevent this)
|
|
branch2: yqosqzyt 15dcdaa4 (empty) foo
|
|
@origin (ahead by 1 commits, behind by 1 commits): rlzusymt 8476341e (empty) description 2
|
|
my-branch: yqosqzyt 15dcdaa4 (empty) foo
|
|
"###);
|
|
// First dry-run
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--all", "--dry-run"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
Force branch branch2 from 8476341eb395 to 15dcdaa4f12f
|
|
Add branch my-branch to 15dcdaa4f12f
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Dry run requesting two specific branches
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["git", "push", "-b=branch1", "-b=my-branch", "--dry-run"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
Add branch my-branch to 15dcdaa4f12f
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Dry run requesting two specific branches twice
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&[
|
|
"git",
|
|
"push",
|
|
"-b=branch1",
|
|
"-b=my-branch",
|
|
"-b=branch1",
|
|
"-b=glob:my-*",
|
|
"--dry-run",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
Add branch my-branch to 15dcdaa4f12f
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Dry run with glob pattern
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["git", "push", "-b=glob:branch?", "--dry-run"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
Force branch branch2 from 8476341eb395 to 15dcdaa4f12f
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
|
|
// Unmatched branch name is error
|
|
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "-b=foo"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No such branch: foo
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&workspace_root,
|
|
&["git", "push", "-b=foo", "-b=glob:?branch"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No matching branches for patterns: foo, ?branch
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--all"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
Force branch branch2 from 8476341eb395 to 15dcdaa4f12f
|
|
Add branch my-branch to 15dcdaa4f12f
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch2: yqosqzyt 15dcdaa4 (empty) foo
|
|
@origin: yqosqzyt 15dcdaa4 (empty) foo
|
|
my-branch: yqosqzyt 15dcdaa4 (empty) foo
|
|
@origin: yqosqzyt 15dcdaa4 (empty) foo
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-rall()"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ yqosqzyt test.user@example.com 2001-02-03 04:05:17.000 +07:00 branch2 my-branch 15dcdaa4
|
|
│ (empty) foo
|
|
│ ◉ rlzusymt test.user@example.com 2001-02-03 04:05:10.000 +07:00 8476341e
|
|
├─╯ (empty) description 2
|
|
│ ◉ lzmmnrxq test.user@example.com 2001-02-03 04:05:08.000 +07:00 45a3aa29
|
|
├─╯ (empty) description 1
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_changes() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "bar"]);
|
|
std::fs::write(workspace_root.join("file"), "modified").unwrap();
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--change", "@"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Creating branch push-yostqsxwqrlt for revision @
|
|
Branch changes to push to origin:
|
|
Add branch push-yostqsxwqrlt to 28d7620ea63a
|
|
"###);
|
|
// test pushing two changes at once
|
|
std::fs::write(workspace_root.join("file"), "modified2").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=@", "-c=@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Creating branch push-yqosqzytrlsw for revision @-
|
|
Branch changes to push to origin:
|
|
Force branch push-yostqsxwqrlt from 28d7620ea63a to 48d8c7948133
|
|
Add branch push-yqosqzytrlsw to fa16a14170fb
|
|
"###);
|
|
// specifying the same change twice doesn't break things
|
|
std::fs::write(workspace_root.join("file"), "modified3").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=@", "-c=@"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Force branch push-yostqsxwqrlt from 48d8c7948133 to b5f030322b1d
|
|
"###);
|
|
// Test changing `git.push-branch-prefix`. It causes us to push again.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&[
|
|
"git",
|
|
"push",
|
|
"--config-toml",
|
|
r"git.push-branch-prefix='test-'",
|
|
"--change=@",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Creating branch test-yostqsxwqrlt for revision @
|
|
Branch changes to push to origin:
|
|
Add branch test-yostqsxwqrlt to b5f030322b1d
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_revisions() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "bar"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-1"]);
|
|
std::fs::write(workspace_root.join("file"), "modified").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "baz"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-2a"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-2b"]);
|
|
std::fs::write(workspace_root.join("file"), "modified again").unwrap();
|
|
|
|
// Push an empty set
|
|
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "-r=none()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Empty revision set
|
|
"###);
|
|
// Push a revision with no branches
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-r=@--"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
No branches point to the specified revisions.
|
|
Nothing changed.
|
|
"###);
|
|
// Push a revision with a single branch
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-r=@-", "--dry-run"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch branch-1 to 7decc7932d9c
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Push multiple revisions of which some have branches
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["git", "push", "-r=@--", "-r=@-", "--dry-run"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch branch-1 to 7decc7932d9c
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Push a revision with a multiple branches
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-r=@", "--dry-run"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch branch-2a to 1b45449e18d0
|
|
Add branch branch-2b to 1b45449e18d0
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
// Repeating a commit doesn't result in repeated messages about the branch
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["git", "push", "-r=@-", "-r=@-", "--dry-run"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch branch-1 to 7decc7932d9c
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_mixed() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "bar"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-1"]);
|
|
std::fs::write(workspace_root.join("file"), "modified").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "baz"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-2a"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch-2b"]);
|
|
std::fs::write(workspace_root.join("file"), "modified again").unwrap();
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["git", "push", "--change=@--", "--branch=branch-1", "-r=@"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Creating branch push-yqosqzytrlsw for revision @--
|
|
Branch changes to push to origin:
|
|
Add branch branch-1 to 7decc7932d9c
|
|
Add branch push-yqosqzytrlsw to fa16a14170fb
|
|
Add branch branch-2a to 1b45449e18d0
|
|
Add branch branch-2b to 1b45449e18d0
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_existing_long_branch() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["branch", "create", "push-19b790168e73f7a73a98deae21e807c0"],
|
|
);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--change=@"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Add branch push-19b790168e73f7a73a98deae21e807c0 to fa16a14170fb
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_unsnapshotted_change() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "foo"]);
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--change", "@"]);
|
|
std::fs::write(workspace_root.join("file"), "modified").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--change", "@"]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_conflict() {
|
|
let (test_env, workspace_root) = set_up();
|
|
std::fs::write(workspace_root.join("file"), "first").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "first"]);
|
|
std::fs::write(workspace_root.join("file"), "second").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "second"]);
|
|
std::fs::write(workspace_root.join("file"), "third").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["rebase", "-r", "@", "-d", "@--"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "third"]);
|
|
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--all"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 1973d389875c since it has conflicts
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_no_description() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m="]);
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch", "my-branch"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 5b36783cd11c since it has no description
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_missing_author() {
|
|
let (test_env, workspace_root) = set_up();
|
|
let run_without_var = |var: &str, args: &[&str]| {
|
|
test_env
|
|
.jj_cmd(&workspace_root, args)
|
|
.env_remove(var)
|
|
.assert()
|
|
.success();
|
|
};
|
|
run_without_var("JJ_USER", &["checkout", "root()", "-m=initial"]);
|
|
run_without_var("JJ_USER", &["branch", "create", "missing-name"]);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&workspace_root,
|
|
&["git", "push", "--branch", "missing-name"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 944313939bbd since it has no author and/or committer set
|
|
"###);
|
|
run_without_var("JJ_EMAIL", &["checkout", "root()", "-m=initial"]);
|
|
run_without_var("JJ_EMAIL", &["branch", "create", "missing-email"]);
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch=missing-email"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 59354714f789 since it has no author and/or committer set
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_missing_committer() {
|
|
let (test_env, workspace_root) = set_up();
|
|
let run_without_var = |var: &str, args: &[&str]| {
|
|
test_env
|
|
.jj_cmd(&workspace_root, args)
|
|
.env_remove(var)
|
|
.assert()
|
|
.success();
|
|
};
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "missing-name"]);
|
|
run_without_var("JJ_USER", &["describe", "-m=no committer name"]);
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch=missing-name"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 4fd190283d1a since it has no author and/or committer set
|
|
"###);
|
|
test_env.jj_cmd_ok(&workspace_root, &["checkout", "root()"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "missing-email"]);
|
|
run_without_var("JJ_EMAIL", &["describe", "-m=no committer email"]);
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch=missing-email"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit eab97428a6ec since it has no author and/or committer set
|
|
"###);
|
|
|
|
// Test message when there are multiple reasons (missing committer and
|
|
// description)
|
|
run_without_var("JJ_EMAIL", &["describe", "-m=", "missing-email"]);
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch=missing-email"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Won't push commit 1143ed607f54 since it has no description and it has no author and/or committer set
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_deleted() {
|
|
let (test_env, workspace_root) = set_up();
|
|
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "delete", "branch1"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--deleted"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch1 from 45a3aa29e907
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-rall()"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ rlzusymt test.user@example.com 2001-02-03 04:05:10.000 +07:00 branch2 8476341e
|
|
│ (empty) description 2
|
|
│ ◉ lzmmnrxq test.user@example.com 2001-02-03 04:05:08.000 +07:00 45a3aa29
|
|
├─╯ (empty) description 1
|
|
│ @ yqosqzyt test.user@example.com 2001-02-03 04:05:13.000 +07:00 5b36783c
|
|
├─╯ (empty) (no description set)
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--deleted"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_conflicting_branches() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.add_config("git.auto-local-branch = true");
|
|
let git_repo = {
|
|
let mut git_repo_path = workspace_root.clone();
|
|
git_repo_path.extend([".jj", "repo", "store", "git"]);
|
|
git2::Repository::open(&git_repo_path).unwrap()
|
|
};
|
|
|
|
// Forget remote ref, move local ref, then fetch to create conflict.
|
|
git_repo
|
|
.find_reference("refs/remotes/origin/branch2")
|
|
.unwrap()
|
|
.delete()
|
|
.unwrap();
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "import"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "root()", "-m=description 3"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch2"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "fetch"]);
|
|
insta::assert_snapshot!(
|
|
test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]), @r###"
|
|
branch1: lzmmnrxq 45a3aa29 (empty) description 1
|
|
@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
branch2 (conflicted):
|
|
+ yostqsxw 8e670e2d (empty) description 3
|
|
+ rlzusymt 8476341e (empty) description 2
|
|
@origin (behind by 1 commits): rlzusymt 8476341e (empty) description 2
|
|
"###);
|
|
|
|
let bump_branch1 = || {
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "branch1", "-m=bump"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch1"]);
|
|
};
|
|
|
|
// Conflicting branch at @
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch branch2 is conflicted
|
|
Hint: Run `jj branch list` to inspect, and use `jj branch set` to fix it up.
|
|
Nothing changed.
|
|
"###);
|
|
|
|
// --branch should be blocked by conflicting branch
|
|
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch", "branch2"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Branch branch2 is conflicted
|
|
Hint: Run `jj branch list` to inspect, and use `jj branch set` to fix it up.
|
|
"###);
|
|
|
|
// --all shouldn't be blocked by conflicting branch
|
|
bump_branch1();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--all"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch branch2 is conflicted
|
|
Hint: Run `jj branch list` to inspect, and use `jj branch set` to fix it up.
|
|
Branch changes to push to origin:
|
|
Move branch branch1 from 45a3aa29e907 to fd1d63e031ea
|
|
"###);
|
|
|
|
// --revisions shouldn't be blocked by conflicting branch
|
|
bump_branch1();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-rall()"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch branch2 is conflicted
|
|
Hint: Run `jj branch list` to inspect, and use `jj branch set` to fix it up.
|
|
Branch changes to push to origin:
|
|
Move branch branch1 from fd1d63e031ea to 8263cf992d33
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_deleted_untracked() {
|
|
let (test_env, workspace_root) = set_up();
|
|
|
|
// Absent local branch shouldn't be considered "deleted" compared to
|
|
// non-tracking remote branch.
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "delete", "branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "untrack", "branch1@origin"]);
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--deleted"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--branch=branch1"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No such branch: branch1
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_tracked_vs_all() {
|
|
let (test_env, workspace_root) = set_up();
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "branch1", "-mmoved branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "branch2", "-mmoved branch2"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "delete", "branch2"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "untrack", "branch1@origin"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "branch3"]);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: vruxwmqv a25f24af (empty) moved branch1
|
|
branch1@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
branch2 (deleted)
|
|
@origin: rlzusymt 8476341e (empty) description 2
|
|
(this branch will be *deleted permanently* on the remote on the next `jj git push`. Use `jj branch forget` to prevent this)
|
|
branch3: znkkpsqq 998d6a78 (empty) moved branch2
|
|
"###);
|
|
|
|
// At this point, only branch2 is still tracked. `jj git push --tracked` would
|
|
// try to push it and no other branches.
|
|
let (_stdout, stderr) =
|
|
test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--tracked", "--dry-run"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to origin:
|
|
Delete branch branch2 from 8476341eb395
|
|
Dry-run requested, not pushing.
|
|
"###);
|
|
|
|
// Untrack the last remaining tracked branch.
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "untrack", "branch2@origin"]);
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list", "--all"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
branch1: vruxwmqv a25f24af (empty) moved branch1
|
|
branch1@origin: lzmmnrxq 45a3aa29 (empty) description 1
|
|
branch2@origin: rlzusymt 8476341e (empty) description 2
|
|
branch3: znkkpsqq 998d6a78 (empty) moved branch2
|
|
"###);
|
|
|
|
// Now, no branches are tracked. --tracked does not push anything
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--tracked"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
|
|
// All branches are still untracked.
|
|
// - --all tries to push branch1, but fails because a branch with the same
|
|
// name exist on the remote.
|
|
// - --all succeeds in pushing branch3, since there is no branch of the same
|
|
// name on the remote.
|
|
// - It does not try to push branch2.
|
|
//
|
|
// TODO: Not trying to push branch2 could be considered correct, or perhaps
|
|
// we want to consider this as a deletion of the branch that failed because
|
|
// the branch was untracked. In the latter case, an error message should be
|
|
// printed. Some considerations:
|
|
// - Whatever we do should be consistent with what `jj branch list` does; it
|
|
// currently does *not* list branches like branch2 as "about to be deleted",
|
|
// as can be seen above.
|
|
// - We could consider showing some hint on `jj branch untrack branch2@origin`
|
|
// instead of showing an error here.
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--all"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Non-tracking remote branch branch1@origin exists
|
|
Hint: Run `jj branch track branch1@origin` to import the remote branch.
|
|
Branch changes to push to origin:
|
|
Add branch branch3 to 998d6a7853d9
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_moved_forward_untracked() {
|
|
let (test_env, workspace_root) = set_up();
|
|
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "branch1", "-mmoved branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch1"]);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "untrack", "branch1@origin"]);
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Non-tracking remote branch branch1@origin exists
|
|
Hint: Run `jj branch track branch1@origin` to import the remote branch.
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_moved_sideways_untracked() {
|
|
let (test_env, workspace_root) = set_up();
|
|
|
|
test_env.jj_cmd_ok(&workspace_root, &["new", "root()", "-mmoved branch1"]);
|
|
test_env.jj_cmd_ok(
|
|
&workspace_root,
|
|
&["branch", "set", "--allow-backwards", "branch1"],
|
|
);
|
|
test_env.jj_cmd_ok(&workspace_root, &["branch", "untrack", "branch1@origin"]);
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Non-tracking remote branch branch1@origin exists
|
|
Hint: Run `jj branch track branch1@origin` to import the remote branch.
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_push_to_remote_named_git() {
|
|
let (test_env, workspace_root) = set_up();
|
|
let git_repo = {
|
|
let mut git_repo_path = workspace_root.clone();
|
|
git_repo_path.extend([".jj", "repo", "store", "git"]);
|
|
git2::Repository::open(&git_repo_path).unwrap()
|
|
};
|
|
git_repo.remote_rename("origin", "git").unwrap();
|
|
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&workspace_root, &["git", "push", "--all", "--remote=git"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Branch changes to push to git:
|
|
Add branch branch1 to 45a3aa29e907
|
|
Add branch branch2 to 8476341eb395
|
|
Error: Git remote named 'git' is reserved for local Git repository
|
|
"###);
|
|
}
|