Function test_fetch_changes_with_commits

src/git.rs:1346–1397

()

    #[tokio::test]
    async fn test_fetch_changes_with_commits() {
        let ctx = AppContext::builder().build();

        // Create main repository
        let main_repo = TestGitRepository::new().unwrap();
        main_repo.init_with_main_branch().unwrap();

        // Create task repository (simulating a copied repository)
        let task_repo = TestGitRepository::new().unwrap();
        task_repo.clone_from(&main_repo).unwrap();

        // Create a branch in task repo with new commits
        let branch_name = "tsk/test/test-task/efgh5678";
        task_repo.checkout_new_branch(branch_name).unwrap();

        // Capture source_commit before adding new commits
        let source_commit = task_repo.get_current_commit().unwrap();

        // Add a new commit
        task_repo
            .create_file("new_feature.rs", "fn new_feature() {}")
            .unwrap();
        task_repo.stage_all().unwrap();
        task_repo.commit("Add new feature").unwrap();

        let manager = RepoManager::new(&ctx);

        // Fetch changes from task repo to main repo (should return true as there are new commits)
        let result = manager
            .fetch_changes(
                task_repo.path(),
                branch_name,
                main_repo.path(),
                &source_commit,
                Some("main"),
                false,
            )
            .await;

        assert!(result.is_ok(), "Error: {result:?}");
        assert!(
            result.unwrap().has_changes,
            "Should return true when new commits exist"
        );

        // Verify the branch exists in main repo
        let main_branches = main_repo.branches().unwrap();
        assert!(
            main_branches.contains(&branch_name.to_string()),
            "Branch should exist after fetch"
        );
    }

    #[tokio::test]
    async fn test_fetch_changes_with_git_town_enabled() {