mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-05 15:32:49 +00:00
dd73b5ab7d
With this change a warning is shown if the user does not explicitly specify the target revision, but the behavior is unchanged (it still defaults to the working copy). In the future the warning will be turned into an error. In other words, it will be required to specify target revision. The bulk of the changes here are to prepare tests for the upcoming change, to make the transition easier. For additional details please see: * https://github.com/jj-vcs/jj/issues/5374 * https://github.com/jj-vcs/jj/discussions/5363
265 lines
9.1 KiB
Rust
265 lines
9.1 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::fs;
|
|
use std::path::PathBuf;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test]
|
|
fn test_git_remotes() {
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "foo", "http://example.com/repo/foo"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "bar", "http://example.com/repo/bar"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
bar http://example.com/repo/bar
|
|
foo http://example.com/repo/foo
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["git", "remote", "remove", "foo"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @"bar http://example.com/repo/bar
|
|
");
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["git", "remote", "remove", "nonexistent"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No git remote named 'nonexistent'
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_remote_add() {
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "foo", "http://example.com/repo/foo"],
|
|
);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&[
|
|
"git",
|
|
"remote",
|
|
"add",
|
|
"foo",
|
|
"http://example.com/repo/foo2",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'foo' already exists
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&["git", "remote", "add", "git", "http://example.com/repo/git"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'git' is reserved for local Git repository
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
foo http://example.com/repo/foo
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_remote_set_url() {
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "foo", "http://example.com/repo/foo"],
|
|
);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&[
|
|
"git",
|
|
"remote",
|
|
"set-url",
|
|
"bar",
|
|
"http://example.com/repo/bar",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No git remote named 'bar'
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&[
|
|
"git",
|
|
"remote",
|
|
"set-url",
|
|
"git",
|
|
"http://example.com/repo/git",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'git' is reserved for local Git repository
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&[
|
|
"git",
|
|
"remote",
|
|
"set-url",
|
|
"foo",
|
|
"http://example.com/repo/bar",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
foo http://example.com/repo/bar
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_remote_relative_path() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
// Relative path using OS-native separator
|
|
let path = PathBuf::from_iter(["..", "native", "sep"]);
|
|
test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "foo", path.to_str().unwrap()],
|
|
);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @"foo $TEST_ENV/native/sep");
|
|
|
|
// Relative path using UNIX separator
|
|
test_env.jj_cmd_ok(
|
|
test_env.env_root(),
|
|
&["-Rrepo", "git", "remote", "set-url", "foo", "unix/sep"],
|
|
);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @"foo $TEST_ENV/unix/sep");
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_remote_rename() {
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "foo", "http://example.com/repo/foo"],
|
|
);
|
|
test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["git", "remote", "add", "baz", "http://example.com/repo/baz"],
|
|
);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["git", "remote", "rename", "bar", "foo"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No git remote named 'bar'
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["git", "remote", "rename", "foo", "baz"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'baz' already exists
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["git", "remote", "rename", "foo", "git"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'git' is reserved for local Git repository
|
|
"###);
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "remote", "rename", "foo", "bar"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
bar http://example.com/repo/foo
|
|
baz http://example.com/repo/baz
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_remote_named_git() {
|
|
let test_env = TestEnvironment::default();
|
|
|
|
// Existing remote named 'git' shouldn't block the repo initialization.
|
|
let repo_path = test_env.env_root().join("repo");
|
|
let git_repo = git2::Repository::init(&repo_path).unwrap();
|
|
git_repo
|
|
.remote("git", "http://example.com/repo/repo")
|
|
.unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "init", "--git-repo=."]);
|
|
test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "-r@", "main"]);
|
|
|
|
// The remote can be renamed.
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "remote", "rename", "git", "bar"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
bar http://example.com/repo/repo
|
|
"###);
|
|
// @git bookmark shouldn't be renamed.
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-rmain@git", "-Tbookmarks"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ main
|
|
│
|
|
~
|
|
"###);
|
|
|
|
// The remote cannot be renamed back by jj.
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["git", "remote", "rename", "bar", "git"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Git remote named 'git' is reserved for local Git repository
|
|
"###);
|
|
|
|
// Reinitialize the repo with remote named 'git'.
|
|
fs::remove_dir_all(repo_path.join(".jj")).unwrap();
|
|
git_repo.remote_rename("bar", "git").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "init", "--git-repo=."]);
|
|
|
|
// The remote can also be removed.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["git", "remote", "remove", "git"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
"###);
|
|
// @git bookmark shouldn't be removed.
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-rmain@git", "-Tbookmarks"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
○ main
|
|
│
|
|
~
|
|
"###);
|
|
}
|