cli/tests: move a lot of the cli tests to gitoxide
#5575
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
from
57ad301 to
230f526
Compare
martinvonz
reviewed
Feb 4, 2025
yuja
reviewed
Feb 4, 2025
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
10 times, most recently
from
523dc68 to
a4632fe
Compare
|
Managed to port another test ( |
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
6 times, most recently
from
93d73fe to
c9d7d11
Compare
|
Ported |
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
from
c9d7d11 to
a56c843
Compare
yuja
reviewed
Feb 7, 2025
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
2 times, most recently
from
0ffe93a to
ac5aabf
Compare
yuja
reviewed
Feb 9, 2025
| @@ -145,7 +120,6 @@ fn test_git_colocated_unborn_bookmark() { | |||
| ◆ 0000000000000000000000000000000000000000 | |||
| "###); | |||
| // Staged change shouldn't persist. | |||
| checkout_index(); | |||
There was a problem hiding this comment.
We need to either check out the index content to working copy or assert the index contents to ensure that the Git index is reset by jj new root().
yuja
reviewed
Feb 9, 2025
| let git_repo = init_git_repo(&workspace_root, false); | ||
| git_repo.config().unwrap().remove("core.bare").unwrap(); | ||
| let _git_repo = init_git_repo(&workspace_root, false); | ||
| //git_repo.config().unwrap().remove("core.bare").unwrap(); |
There was a problem hiding this comment.
Can you insert a snapshot of .git/config to ensure that core.bare key doesn't exist?
The `mod.rs` was becoming crowded and this makes way for unrelated additions to the test utilities module
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
2 times, most recently
from
a19ec73 to
ddc9f55
Compare
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
from
ddc9f55 to
fc2a52b
Compare
cargo-insta was re-run. This is due to centralizing git interaction code to use a particular different signature, which changes the commit hashes
cargo-insta was re-run. This is due to centralizing git interaction code to use a particular different signature, which changes the commit hashes
cargo-insta was re-run. This is due to centralizing git interaction code to use a particular different signature, which changes the commit hashes
cargo-insta was re-run. This is due to centralizing git interaction code to use a particular different signature, which changes the commit hashes
bsdinis
force-pushed
the
bsdinis/srruzkxpyysz
branch
from
fc2a52b to
0a97779
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In keeping with #5548 , this moves a lot of the current
clitests to gitoxide.This doesn't do it all. but thought it best to send this as is, as there is a lot of code to review already (even though most of it is relatively straightforward). Nevertheless, this is what is missing:
push/fetch/clone/remoterequire adding git remotes, which is not easy. Maybe when git: port remote management togix#5553 is merged we can use that machinery directly heretest_git_colocated: i have it mostly done locally, but not quitetest_git_init: dittoThis PR also consolidates a lot of what was copy pasted code (namely creating new repos and adding commits to it). This, plus gitoxide's idiosyncrasies make most of the git hashes in the tests change, hence
cargo-instawas run in a separate commit to avoid the noise.The new
gitoxidehelpers incli/tests/common/gitoxide.rshelp centralize a lot of common functionality, and make sure we don't run into GitoxideLabs/gitoxide#1829.Overall, this PR has a lot of commits to help reviewing, but at the end of the day, I think the commit structure should be: