2022-11-26 23:57:50 +00:00
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-03-17 03:58:04 +00:00
|
|
|
//
|
|
|
|
|
// 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.
|
2023-06-26 03:39:10 +00:00
|
|
|
use std::path::Path;
|
2022-03-17 03:58:04 +00:00
|
|
|
|
2022-03-30 17:47:11 +00:00
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
|
|
2022-03-17 03:58:04 +00:00
|
|
|
#[test]
|
|
|
|
|
fn test_undo_rewrite_with_child() {
|
|
|
|
|
// Test that if we undo an operation that rewrote some commit, any descendants
|
|
|
|
|
// after that will be rebased on top of the un-rewritten commit.
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
2022-03-17 03:58:04 +00:00
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "initial"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "modified"]);
|
2022-03-17 03:58:04 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
|
2023-02-09 02:53:47 +00:00
|
|
|
let op_id_hex = stdout[3..15].to_string();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "-m", "child"]);
|
2022-03-17 03:58:04 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "description"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
@ child
|
2023-03-15 03:37:56 +00:00
|
|
|
◉ modified
|
|
|
|
|
◉
|
2022-03-17 03:58:04 +00:00
|
|
|
"###);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo", &op_id_hex]);
|
2022-03-17 03:58:04 +00:00
|
|
|
|
|
|
|
|
// Since we undid the description-change, the child commit should now be on top
|
|
|
|
|
// of the initial commit
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "description"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
@ child
|
2023-03-15 03:37:56 +00:00
|
|
|
◉ initial
|
|
|
|
|
◉
|
2022-03-17 03:58:04 +00:00
|
|
|
"###);
|
|
|
|
|
}
|
2023-06-26 03:39:10 +00:00
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_git_push_undo() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
cli: make set of immutable commits configurable
This adds a new `revset-aliases.immutable_heads()s` config for
defining the set of immutable commits. The set is defined as the
configured revset, as well as its ancestors, and the root commit
commit (even if the configured set is empty).
This patch also adds enforcement of the config where we already had
checks preventing rewrite of the root commit. The working-copy commit
is implicitly assumed to be writable in most cases. Specifically, we
won't prevent amending the working copy even if the user includes it
in the config but we do prevent `jj edit @` in that case. That seems
good enough to me. Maybe we should emit a warning when the working
copy is in the set of immutable commits.
Maybe we should add support for something more like [Mercurial's
phases](https://wiki.mercurial-scm.org/Phases), which is propagated on
push and pull. There's already some affordance for that in the view
object's `public_heads` field. However, this is simpler, especially
since we can't propagate the phase to Git remotes, and seems like a
good start. Also, it lets you say that commits authored by other users
are immutable, for example.
For now, the functionality is in the CLI library. I'm not sure if we
want to move it into the library crate. I'm leaning towards letting
library users do whatever they want without being restricted by
immutable commits. I do think we should move the functionality into a
future `ui-lib` or `ui-util` crate. That crate would have most of the
functionality in the current `cli_util` module (but in a
non-CLI-specific form).
2023-09-02 02:12:01 +00:00
|
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
2023-06-26 03:39:10 +00:00
|
|
|
let git_repo_path = test_env.env_root().join("git-repo");
|
|
|
|
|
git2::Repository::init_bare(git_repo_path).unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "clone", "git-repo", "repo"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "AA"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "BB"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// Refs at this point look as follows (-- means no ref)
|
|
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | AA | AA | AA
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
2023-08-21 00:34:49 +00:00
|
|
|
let pre_push_opid = test_env.current_operation_id(&repo_path);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | BB | BB | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@origin: qpvuntsm 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Undo the push
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &pre_push_opid]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | AA | AA | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "CC"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "fetch"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// TODO: The user would probably not expect a conflict here. It currently is
|
|
|
|
|
// because the undo made us forget that the remote was at v2, so the fetch
|
|
|
|
|
// made us think it updated from v1 to v2 (instead of the no-op it could
|
|
|
|
|
// have been).
|
|
|
|
|
//
|
|
|
|
|
// One option to solve this would be to have undo not restore remote-tracking
|
|
|
|
|
// branches, but that also has undersired consequences: the second fetch in `jj
|
|
|
|
|
// git fetch && jj undo && jj git fetch` would become a no-op.
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
main (conflicted):
|
2023-10-26 04:18:58 +00:00
|
|
|
- qpvuntsm hidden 0cffb614 (empty) AA
|
2023-08-07 21:45:01 +00:00
|
|
|
+ qpvuntsm?? 0a3e99f0 (empty) CC
|
|
|
|
|
+ qpvuntsm?? 8c05de15 (empty) BB
|
|
|
|
|
@origin (behind by 1 commits): qpvuntsm?? 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// This test is identical to the previous one, except for one additional
|
|
|
|
|
/// import. It demonstrates that this changes the outcome.
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_git_push_undo_with_import() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
cli: make set of immutable commits configurable
This adds a new `revset-aliases.immutable_heads()s` config for
defining the set of immutable commits. The set is defined as the
configured revset, as well as its ancestors, and the root commit
commit (even if the configured set is empty).
This patch also adds enforcement of the config where we already had
checks preventing rewrite of the root commit. The working-copy commit
is implicitly assumed to be writable in most cases. Specifically, we
won't prevent amending the working copy even if the user includes it
in the config but we do prevent `jj edit @` in that case. That seems
good enough to me. Maybe we should emit a warning when the working
copy is in the set of immutable commits.
Maybe we should add support for something more like [Mercurial's
phases](https://wiki.mercurial-scm.org/Phases), which is propagated on
push and pull. There's already some affordance for that in the view
object's `public_heads` field. However, this is simpler, especially
since we can't propagate the phase to Git remotes, and seems like a
good start. Also, it lets you say that commits authored by other users
are immutable, for example.
For now, the functionality is in the CLI library. I'm not sure if we
want to move it into the library crate. I'm leaning towards letting
library users do whatever they want without being restricted by
immutable commits. I do think we should move the functionality into a
future `ui-lib` or `ui-util` crate. That crate would have most of the
functionality in the current `cli_util` module (but in a
non-CLI-specific form).
2023-09-02 02:12:01 +00:00
|
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
2023-06-26 03:39:10 +00:00
|
|
|
let git_repo_path = test_env.env_root().join("git-repo");
|
|
|
|
|
git2::Repository::init_bare(git_repo_path).unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "clone", "git-repo", "repo"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "AA"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "BB"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// Refs at this point look as follows (-- means no ref)
|
|
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | AA | AA | AA
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
2023-08-21 00:34:49 +00:00
|
|
|
let pre_push_opid = test_env.current_operation_id(&repo_path);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | BB | BB | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@origin: qpvuntsm 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Undo the push
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &pre_push_opid]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | AA | AA | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// PROBLEM: inserting this import changes the outcome compared to previous test
|
|
|
|
|
// TODO: decide if this is the better behavior, and whether import of
|
|
|
|
|
// remote-tracking branches should happen on every operation.
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "import"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | -- | --
|
|
|
|
|
// remote-tracking | BB | BB | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@origin: qpvuntsm 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "CC"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "fetch"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// There is not a conflict. This seems like a good outcome; undoing `git push`
|
|
|
|
|
// was essentially a no-op.
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 0a3e99f0 (empty) CC
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This test is currently *identical* to `test_git_push_undo` except the repo
|
|
|
|
|
// it's operating it is colocated.
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_git_push_undo_colocated() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
cli: make set of immutable commits configurable
This adds a new `revset-aliases.immutable_heads()s` config for
defining the set of immutable commits. The set is defined as the
configured revset, as well as its ancestors, and the root commit
commit (even if the configured set is empty).
This patch also adds enforcement of the config where we already had
checks preventing rewrite of the root commit. The working-copy commit
is implicitly assumed to be writable in most cases. Specifically, we
won't prevent amending the working copy even if the user includes it
in the config but we do prevent `jj edit @` in that case. That seems
good enough to me. Maybe we should emit a warning when the working
copy is in the set of immutable commits.
Maybe we should add support for something more like [Mercurial's
phases](https://wiki.mercurial-scm.org/Phases), which is propagated on
push and pull. There's already some affordance for that in the view
object's `public_heads` field. However, this is simpler, especially
since we can't propagate the phase to Git remotes, and seems like a
good start. Also, it lets you say that commits authored by other users
are immutable, for example.
For now, the functionality is in the CLI library. I'm not sure if we
want to move it into the library crate. I'm leaning towards letting
library users do whatever they want without being restricted by
immutable commits. I do think we should move the functionality into a
future `ui-lib` or `ui-util` crate. That crate would have most of the
functionality in the current `cli_util` module (but in a
non-CLI-specific form).
2023-09-02 02:12:01 +00:00
|
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
2023-06-26 03:39:10 +00:00
|
|
|
let git_repo_path = test_env.env_root().join("git-repo");
|
|
|
|
|
git2::Repository::init_bare(git_repo_path.clone()).unwrap();
|
|
|
|
|
let repo_path = test_env.env_root().join("clone");
|
|
|
|
|
git2::Repository::clone(git_repo_path.to_str().unwrap(), &repo_path).unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["init", "--git-repo=."]);
|
2023-06-26 03:39:10 +00:00
|
|
|
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "AA"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "BB"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// Refs at this point look as follows (-- means no ref)
|
|
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | BB | BB
|
|
|
|
|
// remote-tracking | AA | AA | AA
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@git: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
2023-08-21 00:34:49 +00:00
|
|
|
let pre_push_opid = test_env.current_operation_id(&repo_path);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | BB | BB
|
|
|
|
|
// remote-tracking | BB | BB | BB
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@git: qpvuntsm 8c05de15 (empty) BB
|
|
|
|
|
@origin: qpvuntsm 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Undo the push
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &pre_push_opid]);
|
2023-06-01 03:55:46 +00:00
|
|
|
// === Before auto-export ====
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | BB | BB
|
2023-06-01 03:55:46 +00:00
|
|
|
// remote-tracking | AA | BB | BB
|
|
|
|
|
// === After automatic `jj git export` ====
|
2023-06-26 03:39:10 +00:00
|
|
|
// | jj refs | jj's | git
|
|
|
|
|
// | | git | repo
|
|
|
|
|
// | |tracking|
|
|
|
|
|
// ------------------------------------------
|
|
|
|
|
// local `main` | BB | BB | BB
|
2023-06-01 03:55:46 +00:00
|
|
|
// remote-tracking | AA | AA | AA
|
2023-06-26 03:39:10 +00:00
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@git: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "CC"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "fetch"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
// We have the same conflict as `test_git_push_undo`. TODO: why did we get the
|
|
|
|
|
// same result in a seemingly different way?
|
2023-06-01 03:55:46 +00:00
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-06-01 03:55:46 +00:00
|
|
|
main (conflicted):
|
2023-10-26 04:18:58 +00:00
|
|
|
- qpvuntsm hidden 0cffb614 (empty) AA
|
2023-08-07 21:45:01 +00:00
|
|
|
+ qpvuntsm?? 0a3e99f0 (empty) CC
|
|
|
|
|
+ qpvuntsm?? 8c05de15 (empty) BB
|
|
|
|
|
@git (behind by 1 commits): qpvuntsm?? 0a3e99f0 (empty) CC
|
|
|
|
|
@origin (behind by 1 commits): qpvuntsm?? 8c05de15 (empty) BB
|
2023-06-01 03:55:46 +00:00
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This test is currently *identical* to `test_git_push_undo` except
|
|
|
|
|
// both the git_refs and the remote-tracking branches are preserved by undo.
|
|
|
|
|
// TODO: Investigate the different outcome
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_git_push_undo_repo_only() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
cli: make set of immutable commits configurable
This adds a new `revset-aliases.immutable_heads()s` config for
defining the set of immutable commits. The set is defined as the
configured revset, as well as its ancestors, and the root commit
commit (even if the configured set is empty).
This patch also adds enforcement of the config where we already had
checks preventing rewrite of the root commit. The working-copy commit
is implicitly assumed to be writable in most cases. Specifically, we
won't prevent amending the working copy even if the user includes it
in the config but we do prevent `jj edit @` in that case. That seems
good enough to me. Maybe we should emit a warning when the working
copy is in the set of immutable commits.
Maybe we should add support for something more like [Mercurial's
phases](https://wiki.mercurial-scm.org/Phases), which is propagated on
push and pull. There's already some affordance for that in the view
object's `public_heads` field. However, this is simpler, especially
since we can't propagate the phase to Git remotes, and seems like a
good start. Also, it lets you say that commits authored by other users
are immutable, for example.
For now, the functionality is in the CLI library. I'm not sure if we
want to move it into the library crate. I'm leaning towards letting
library users do whatever they want without being restricted by
immutable commits. I do think we should move the functionality into a
future `ui-lib` or `ui-util` crate. That crate would have most of the
functionality in the current `cli_util` module (but in a
non-CLI-specific form).
2023-09-02 02:12:01 +00:00
|
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
2023-06-01 03:55:46 +00:00
|
|
|
let git_repo_path = test_env.env_root().join("git-repo");
|
|
|
|
|
git2::Repository::init_bare(git_repo_path).unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "clone", "git-repo", "repo"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "AA"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 0cffb614 (empty) AA
|
2023-10-18 06:12:17 +00:00
|
|
|
@origin: qpvuntsm 0cffb614 (empty) AA
|
2023-06-01 03:55:46 +00:00
|
|
|
"###);
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "BB"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 0cffb614 (empty) AA
|
2023-06-01 03:55:46 +00:00
|
|
|
"###);
|
2023-08-21 00:34:49 +00:00
|
|
|
let pre_push_opid = test_env.current_operation_id(&repo_path);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
|
|
|
|
|
// Undo the push, but keep both the git_refs and the remote-tracking branches
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(
|
2023-06-01 03:55:46 +00:00
|
|
|
&repo_path,
|
|
|
|
|
&["op", "restore", "--what=repo", &pre_push_opid],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 8c05de15 (empty) BB
|
2023-10-18 06:12:17 +00:00
|
|
|
@origin: qpvuntsm 8c05de15 (empty) BB
|
2023-06-01 03:55:46 +00:00
|
|
|
"###);
|
|
|
|
|
test_env.advance_test_rng_seed_to_multiple_of(100_000);
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "CC"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "fetch"]);
|
2023-06-01 03:55:46 +00:00
|
|
|
// This currently gives an identical result to `test_git_push_undo_import`.
|
2023-06-26 03:39:10 +00:00
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
2023-07-11 01:46:38 +00:00
|
|
|
main: qpvuntsm 0a3e99f0 (empty) CC
|
2023-10-24 01:43:12 +00:00
|
|
|
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 8c05de15 (empty) BB
|
2023-06-26 03:39:10 +00:00
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-20 07:55:24 +00:00
|
|
|
#[test]
|
|
|
|
|
fn test_branch_track_untrack_undo() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
|
|
|
|
let git_repo_path = test_env.env_root().join("git-repo");
|
|
|
|
|
git2::Repository::init_bare(git_repo_path).unwrap();
|
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "clone", "git-repo", "repo"]);
|
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-mcommit"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "feature1", "feature2"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["git", "push"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "delete", "feature2"]);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2 (deleted)
|
|
|
|
|
@origin: qpvuntsm 270721f5 (empty) commit
|
2023-12-15 12:50:35 +00:00
|
|
|
(this branch will be *deleted permanently* on the remote on the next `jj git push`. Use `jj branch forget` to prevent this)
|
2023-10-20 07:55:24 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Track/untrack can be undone so long as states can be trivially merged.
|
|
|
|
|
test_env.jj_cmd_ok(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&["branch", "untrack", "feature1@origin", "feature2@origin"],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature1@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2 (deleted)
|
|
|
|
|
@origin: qpvuntsm 270721f5 (empty) commit
|
2023-12-15 12:50:35 +00:00
|
|
|
(this branch will be *deleted permanently* on the remote on the next `jj git push`. Use `jj branch forget` to prevent this)
|
2023-10-20 07:55:24 +00:00
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature1@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "track", "feature1@origin"]);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
|
|
|
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
|
|
|
|
|
feature1: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature1@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
feature2@origin: qpvuntsm 270721f5 (empty) commit
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2023-06-26 03:39:10 +00:00
|
|
|
fn get_branch_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
2023-10-18 06:12:17 +00:00
|
|
|
test_env.jj_cmd_success(repo_path, &["branch", "list", "--all"])
|
2023-06-26 03:39:10 +00:00
|
|
|
}
|
