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
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
// Copyright 2025 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 crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[must_use]
fn get_colocation_status(work_dir: &TestWorkDir) -> CommandOutput {
work_dir.run_jj([
"git",
"colocation",
"status",
"--ignore-working-copy",
"--quiet", // suppress hint
])
}
fn read_git_target(workspace_root: &std::path::Path) -> String {
let mut path = workspace_root.to_path_buf();
path.extend([".jj", "repo", "store", "git_target"]);
std::fs::read_to_string(path).unwrap()
}
#[test]
fn test_git_colocation_enable_success() {
let test_env = TestEnvironment::default();
// Initialize a non-colocated Jujutsu/Git workspace
test_env
.run_jj_in(
test_env.env_root(),
["git", "init", "--no-colocate", "repo"],
)
.success();
let work_dir = test_env.work_dir("repo");
let workspace_root = work_dir.root();
// Need at least one commit to be able to set git HEAD later
work_dir.run_jj(["new"]).success();
// Verify it's not colocated initially
assert!(!workspace_root.join(".git").exists());
assert_eq!(read_git_target(workspace_root), "git");
// And that there is no Git HEAD yet
insta::assert_snapshot!(get_colocation_status(&work_dir), @r"
Workspace is currently not colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
");
// Run colocate command
let output = work_dir.run_jj(["git", "colocation", "enable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace successfully converted into a colocated Jujutsu/Git workspace.
[EOF]
");
// Verify colocate succeeded
assert!(workspace_root.join(".git").exists());
assert!(
!workspace_root
.join(".jj")
.join("repo")
.join("store")
.join("git")
.exists()
);
assert_eq!(read_git_target(workspace_root), "../../../.git");
// Verify .jj/.gitignore was created
let gitignore_content =
std::fs::read_to_string(workspace_root.join(".jj").join(".gitignore")).unwrap();
assert_eq!(gitignore_content, "/*\n");
// Verify that Git HEAD was set correctly
insta::assert_snapshot!(get_colocation_status(&work_dir), @r"
Workspace is currently colocated with Git.
Last imported/exported Git HEAD: e8849ae12c709f2321908879bc724fdb2ab8a781
[EOF]
");
// Verify that the repo changed
let output = work_dir.run_jj(["op", "show", "-T", "description ++ '\n'"]);
insta::assert_snapshot!(output, @"
set git head to working copy parent
[EOF]
");
}
#[test]
fn test_git_colocation_enable_empty() {
let test_env = TestEnvironment::default();
// Initialize a non-colocated Jujutsu/Git workspace
test_env
.run_jj_in(
test_env.env_root(),
["git", "init", "--no-colocate", "repo"],
)
.success();
let work_dir = test_env.work_dir("repo");
let setup_op_id = work_dir.current_operation_id();
// Run colocate command
let output = work_dir.run_jj(["git", "colocation", "enable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace successfully converted into a colocated Jujutsu/Git workspace.
[EOF]
");
// Verify that Git HEAD was set correctly
insta::assert_snapshot!(get_colocation_status(&work_dir), @"
Workspace is currently colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
");
// No repo change required
assert_eq!(setup_op_id, work_dir.current_operation_id());
}
#[test]
fn test_git_colocation_enable_already_colocated() {
let test_env = TestEnvironment::default();
// Initialize a colocated Jujutsu/Git repo
test_env
.run_jj_in(test_env.env_root(), ["git", "init", "--colocate", "repo"])
.success();
let work_dir = test_env.work_dir("repo");
// Try to colocate it again - should fail
let output = work_dir.run_jj(["git", "colocation", "enable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace is already colocated with Git.
[EOF]
");
}
#[test]
fn test_git_colocation_enable_with_existing_git_dir() {
let test_env = TestEnvironment::default();
// Initialize a non-colocated Jujutsu/Git repo
test_env
.run_jj_in(
test_env.env_root(),
["git", "init", "--no-colocate", "repo"],
)
.success();
let work_dir = test_env.work_dir("repo");
let workspace_root = work_dir.root();
// Create a .git directory manually
std::fs::create_dir(workspace_root.join(".git")).unwrap();
std::fs::write(workspace_root.join(".git").join("dummy"), "dummy").unwrap();
// Try to colocate - should fail
let output = work_dir.run_jj(["git", "colocation", "enable"]);
insta::assert_snapshot!(output.strip_stderr_last_line(), @r"
------- stderr -------
Error: A .git directory already exists in the workspace root. Cannot colocate.
[EOF]
[exit status: 1]
");
}
#[test]
fn test_git_colocation_disable_success() {
let test_env = TestEnvironment::default();
// Create a colocated Jujutsu/Git repo
test_env
.run_jj_in(test_env.env_root(), ["git", "init", "--colocate", "repo"])
.success();
let work_dir = test_env.work_dir("repo");
let workspace_root = work_dir.root();
// Need at least one commit to be able to set git HEAD later
work_dir.run_jj(["new"]).success();
// Verify that Git HEAD is set
insta::assert_snapshot!(get_colocation_status(&work_dir), @r"
Workspace is currently colocated with Git.
Last imported/exported Git HEAD: e8849ae12c709f2321908879bc724fdb2ab8a781
[EOF]
");
// Verify it's colocated
assert!(workspace_root.join(".git").exists());
assert_eq!(read_git_target(workspace_root), "../../../.git");
// Disable colocation
let output = work_dir.run_jj(["git", "colocation", "disable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace successfully converted into a non-colocated Jujutsu/Git workspace.
[EOF]
");
// Verify that disable colocation succeeded
assert!(!workspace_root.join(".git").exists());
assert!(
workspace_root
.join(".jj")
.join("repo")
.join("store")
.join("git")
.exists()
);
assert_eq!(read_git_target(workspace_root), "git");
assert!(!workspace_root.join(".jj").join(".gitignore").exists());
// Verify that Git HEAD was removed correctly
insta::assert_snapshot!(get_colocation_status(&work_dir), @r"
Workspace is currently not colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
");
// Verify that the repo changed
let output = work_dir.run_jj(["op", "show", "-T", "description ++ '\n'"]);
insta::assert_snapshot!(output, @"
remove git head reference
[EOF]
");
}
#[test]
fn test_git_colocation_disable_empty() {
let test_env = TestEnvironment::default();
// Create a colocated Jujutsu/Git repo
test_env
.run_jj_in(test_env.env_root(), ["git", "init", "--colocate", "repo"])
.success();
let work_dir = test_env.work_dir("repo");
let setup_op_id = work_dir.current_operation_id();
// Verify that Git HEAD is unset
insta::assert_snapshot!(get_colocation_status(&work_dir), @"
Workspace is currently colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
");
// Disable colocation
let output = work_dir.run_jj(["git", "colocation", "disable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace successfully converted into a non-colocated Jujutsu/Git workspace.
[EOF]
");
// No repo change required
assert_eq!(setup_op_id, work_dir.current_operation_id());
}
#[test]
fn test_git_colocation_disable_not_colocated() {
let test_env = TestEnvironment::default();
// Initialize a non-colocated Jujutsu/Git repo
test_env
.run_jj_in(
test_env.env_root(),
["git", "init", "--no-colocate", "repo"],
)
.success();
let work_dir = test_env.work_dir("repo");
// Try to disable colocation when not colocated - should fail
let output = work_dir.run_jj(["git", "colocation", "disable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Workspace is already not colocated with Git.
[EOF]
");
}
#[test]
fn test_git_colocation_status_non_colocated() {
let test_env = TestEnvironment::default();
// Initialize a non-colocated Jujutsu/Git repo
test_env
.run_jj_in(
test_env.env_root(),
["git", "init", "--no-colocate", "repo"],
)
.success();
let work_dir = test_env.work_dir("repo");
// Check status - should show non-colocated
let output = work_dir.run_jj(["git", "colocation", "status"]);
insta::assert_snapshot!(output, @r"
Workspace is currently not colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
------- stderr -------
Hint: To enable colocation, run: `jj git colocation enable`
[EOF]
");
}
#[test]
fn test_git_colocation_status_colocated() {
let test_env = TestEnvironment::default();
// Initialize a colocated jj repo
test_env
.run_jj_in(test_env.env_root(), ["git", "init", "--colocate", "repo"])
.success();
let work_dir = test_env.work_dir("repo");
// Check status - should show colocated
let output = work_dir.run_jj(["git", "colocation", "status"]);
insta::assert_snapshot!(output, @r"
Workspace is currently colocated with Git.
Last imported/exported Git HEAD: (none)
[EOF]
------- stderr -------
Hint: To disable colocation, run: `jj git colocation disable`
[EOF]
");
}
#[test]
fn test_git_colocation_in_secondary_workspace() {
let test_env = TestEnvironment::default();
test_env
.run_jj_in(".", ["git", "init", "--no-colocate", "main"])
.success();
let main_dir = test_env.work_dir("main");
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
let secondary_dir = test_env.work_dir("secondary");
let output = secondary_dir.run_jj(["git", "colocation", "status"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: This command cannot be used in a non-main Jujutsu workspace
[EOF]
[exit status: 1]
");
let output = secondary_dir.run_jj(["git", "colocation", "enable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: This command cannot be used in a non-main Jujutsu workspace
[EOF]
[exit status: 1]
");
let output = secondary_dir.run_jj(["git", "colocation", "disable"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: This command cannot be used in a non-main Jujutsu workspace
[EOF]
[exit status: 1]
");
}
|
