gitgrip 0.18.0

Multi-repo workflow tool - manage multiple git repositories as one
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208

//! Integration tests for the cherry-pick command.

mod common;

use common::fixtures::WorkspaceBuilder;
use common::git_helpers;

#[test]
fn test_cherry_pick_applies_commit() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();

    let manifest = ws.load_manifest();

    // Create a branch, make a commit, then switch back to main
    git_helpers::create_branch(&ws.repo_path("app"), "feat/source");
    let sha = git_helpers::commit_file(
        &ws.repo_path("app"),
        "new-feature.txt",
        "feature content",
        "Add new feature",
    );
    git_helpers::checkout(&ws.repo_path("app"), "main");

    // Cherry-pick the commit onto main
    let result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        Some(&sha),
        false,
        false,
        None,
        None,
    );
    assert!(
        result.is_ok(),
        "cherry-pick should succeed: {:?}",
        result.err()
    );

    // Verify the file exists on main
    assert!(ws.repo_path("app").join("new-feature.txt").exists());
}

#[test]
fn test_cherry_pick_skips_repos_without_commit() {
    let ws = WorkspaceBuilder::new()
        .add_repo("frontend")
        .add_repo("backend")
        .build();

    let manifest = ws.load_manifest();

    // Create commit only in frontend
    git_helpers::create_branch(&ws.repo_path("frontend"), "feat/source");
    let sha = git_helpers::commit_file(
        &ws.repo_path("frontend"),
        "frontend-only.txt",
        "content",
        "Frontend-only change",
    );
    git_helpers::checkout(&ws.repo_path("frontend"), "main");

    // Cherry-pick — backend should be silently skipped
    let result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        Some(&sha),
        false,
        false,
        None,
        None,
    );
    assert!(
        result.is_ok(),
        "cherry-pick should succeed: {:?}",
        result.err()
    );

    // frontend has the file, backend does not
    assert!(ws.repo_path("frontend").join("frontend-only.txt").exists());
    assert!(!ws.repo_path("backend").join("frontend-only.txt").exists());
}

#[test]
fn test_cherry_pick_conflict_reports_error() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();

    let manifest = ws.load_manifest();

    // Create conflicting changes
    git_helpers::create_branch(&ws.repo_path("app"), "feat/conflict");
    let sha = git_helpers::commit_file(
        &ws.repo_path("app"),
        "README.md",
        "conflict branch content",
        "Change README on branch",
    );
    git_helpers::checkout(&ws.repo_path("app"), "main");
    git_helpers::commit_file(
        &ws.repo_path("app"),
        "README.md",
        "main branch content",
        "Change README on main",
    );

    // Cherry-pick should report conflict
    let result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        Some(&sha),
        false,
        false,
        None,
        None,
    );
    // Should succeed (doesn't return error, just reports conflict)
    assert!(
        result.is_ok(),
        "cherry-pick with conflict should not return error: {:?}",
        result.err()
    );

    // Clean up: abort the cherry-pick
    let abort_result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        None,
        true, // abort
        false,
        None,
        None,
    );
    assert!(abort_result.is_ok());
}

#[test]
fn test_cherry_pick_abort() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();

    let manifest = ws.load_manifest();

    // Create conflicting changes
    git_helpers::create_branch(&ws.repo_path("app"), "feat/conflict");
    let sha = git_helpers::commit_file(
        &ws.repo_path("app"),
        "README.md",
        "conflict content",
        "Conflict change",
    );
    git_helpers::checkout(&ws.repo_path("app"), "main");
    git_helpers::commit_file(
        &ws.repo_path("app"),
        "README.md",
        "main content",
        "Main change",
    );

    // Cherry-pick (will conflict)
    gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        Some(&sha),
        false,
        false,
        None,
        None,
    )
    .unwrap();

    // Abort
    let result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        None,
        true, // abort
        false,
        None,
        None,
    );
    assert!(
        result.is_ok(),
        "cherry-pick abort should succeed: {:?}",
        result.err()
    );
}

#[test]
fn test_cherry_pick_nonexistent_sha() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();

    let manifest = ws.load_manifest();

    // Cherry-pick a non-existent SHA
    let result = gitgrip::cli::commands::cherry_pick::run_cherry_pick(
        &ws.workspace_root,
        &manifest,
        Some("deadbeef1234567890abcdef1234567890abcdef"),
        false,
        false,
        None,
        None,
    );
    assert!(
        result.is_ok(),
        "cherry-pick with bad SHA should succeed gracefully: {:?}",
        result.err()
    );
}