]>
Commit | Line | Data |
---|---|---|
a1bbc6c0 SB |
1 | #include "builtin.h" |
2 | #include "cache.h" | |
b2141fc1 | 3 | #include "config.h" |
a1bbc6c0 SB |
4 | #include "dir.h" |
5 | #include "parse-options.h" | |
6 | #include "run-command.h" | |
7 | #include "sigchain.h" | |
8 | #include "strbuf.h" | |
9 | #include "string-list.h" | |
10 | #include "argv-array.h" | |
525e18c0 | 11 | #include "midx.h" |
5d19e813 | 12 | #include "packfile.h" |
36f0f344 | 13 | #include "object-store.h" |
a1bbc6c0 SB |
14 | |
15 | static int delta_base_offset = 1; | |
ee34a2be | 16 | static int pack_kept_objects = -1; |
2bed2d47 | 17 | static int write_bitmaps; |
16d75fa4 | 18 | static int use_delta_islands; |
a1bbc6c0 SB |
19 | static char *packdir, *packtmp; |
20 | ||
21 | static const char *const git_repack_usage[] = { | |
9c9b4f2f | 22 | N_("git repack [<options>]"), |
a1bbc6c0 SB |
23 | NULL |
24 | }; | |
25 | ||
1c409a70 DT |
26 | static const char incremental_bitmap_conflict_error[] = N_( |
27 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
28 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
29 | ); | |
30 | ||
31 | ||
a1bbc6c0 SB |
32 | static int repack_config(const char *var, const char *value, void *cb) |
33 | { | |
34 | if (!strcmp(var, "repack.usedeltabaseoffset")) { | |
35 | delta_base_offset = git_config_bool(var, value); | |
36 | return 0; | |
37 | } | |
ee34a2be JK |
38 | if (!strcmp(var, "repack.packkeptobjects")) { |
39 | pack_kept_objects = git_config_bool(var, value); | |
40 | return 0; | |
41 | } | |
71d76cb4 JK |
42 | if (!strcmp(var, "repack.writebitmaps") || |
43 | !strcmp(var, "pack.writebitmaps")) { | |
d078d85b | 44 | write_bitmaps = git_config_bool(var, value); |
3198b89f JK |
45 | return 0; |
46 | } | |
16d75fa4 JK |
47 | if (!strcmp(var, "repack.usedeltaislands")) { |
48 | use_delta_islands = git_config_bool(var, value); | |
49 | return 0; | |
50 | } | |
a1bbc6c0 SB |
51 | return git_default_config(var, value, cb); |
52 | } | |
53 | ||
54 | /* | |
55 | * Remove temporary $GIT_OBJECT_DIRECTORY/pack/.tmp-$$-pack-* files. | |
56 | */ | |
57 | static void remove_temporary_files(void) | |
58 | { | |
59 | struct strbuf buf = STRBUF_INIT; | |
60 | size_t dirlen, prefixlen; | |
61 | DIR *dir; | |
62 | struct dirent *e; | |
63 | ||
64 | dir = opendir(packdir); | |
65 | if (!dir) | |
66 | return; | |
67 | ||
68 | /* Point at the slash at the end of ".../objects/pack/" */ | |
69 | dirlen = strlen(packdir) + 1; | |
70 | strbuf_addstr(&buf, packtmp); | |
71 | /* Hold the length of ".tmp-%d-pack-" */ | |
72 | prefixlen = buf.len - dirlen; | |
73 | ||
74 | while ((e = readdir(dir))) { | |
75 | if (strncmp(e->d_name, buf.buf + dirlen, prefixlen)) | |
76 | continue; | |
77 | strbuf_setlen(&buf, dirlen); | |
78 | strbuf_addstr(&buf, e->d_name); | |
79 | unlink(buf.buf); | |
80 | } | |
81 | closedir(dir); | |
82 | strbuf_release(&buf); | |
83 | } | |
84 | ||
85 | static void remove_pack_on_signal(int signo) | |
86 | { | |
87 | remove_temporary_files(); | |
88 | sigchain_pop(signo); | |
89 | raise(signo); | |
90 | } | |
91 | ||
92 | /* | |
93 | * Adds all packs hex strings to the fname list, which do not | |
5d19e813 | 94 | * have a corresponding .keep file. These packs are not to |
0c16cd49 | 95 | * be kept if we are going to pack everything into one file. |
a1bbc6c0 | 96 | */ |
ed7e5fc3 NTND |
97 | static void get_non_kept_pack_filenames(struct string_list *fname_list, |
98 | const struct string_list *extra_keep) | |
a1bbc6c0 SB |
99 | { |
100 | DIR *dir; | |
101 | struct dirent *e; | |
102 | char *fname; | |
a1bbc6c0 SB |
103 | |
104 | if (!(dir = opendir(packdir))) | |
105 | return; | |
106 | ||
107 | while ((e = readdir(dir)) != NULL) { | |
26936bfd | 108 | size_t len; |
ed7e5fc3 NTND |
109 | int i; |
110 | ||
111 | for (i = 0; i < extra_keep->nr; i++) | |
112 | if (!fspathcmp(e->d_name, extra_keep->items[i].string)) | |
113 | break; | |
114 | if (extra_keep->nr > 0 && i < extra_keep->nr) | |
115 | continue; | |
116 | ||
26936bfd | 117 | if (!strip_suffix(e->d_name, ".pack", &len)) |
a1bbc6c0 SB |
118 | continue; |
119 | ||
a1bbc6c0 SB |
120 | fname = xmemdupz(e->d_name, len); |
121 | ||
5d19e813 | 122 | if (!file_exists(mkpath("%s/%s.keep", packdir, fname))) |
a1bbc6c0 SB |
123 | string_list_append_nodup(fname_list, fname); |
124 | else | |
125 | free(fname); | |
126 | } | |
127 | closedir(dir); | |
128 | } | |
129 | ||
130 | static void remove_redundant_pack(const char *dir_name, const char *base_name) | |
131 | { | |
5d19e813 | 132 | const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"}; |
a1bbc6c0 SB |
133 | int i; |
134 | struct strbuf buf = STRBUF_INIT; | |
135 | size_t plen; | |
136 | ||
137 | strbuf_addf(&buf, "%s/%s", dir_name, base_name); | |
138 | plen = buf.len; | |
139 | ||
140 | for (i = 0; i < ARRAY_SIZE(exts); i++) { | |
141 | strbuf_setlen(&buf, plen); | |
142 | strbuf_addstr(&buf, exts[i]); | |
143 | unlink(buf.buf); | |
144 | } | |
145 | strbuf_release(&buf); | |
146 | } | |
147 | ||
2b958e79 JT |
148 | struct pack_objects_args { |
149 | const char *window; | |
150 | const char *window_memory; | |
151 | const char *depth; | |
152 | const char *threads; | |
153 | const char *max_pack_size; | |
154 | int no_reuse_delta; | |
155 | int no_reuse_object; | |
156 | int quiet; | |
157 | int local; | |
158 | }; | |
159 | ||
160 | static void prepare_pack_objects(struct child_process *cmd, | |
161 | const struct pack_objects_args *args) | |
162 | { | |
163 | argv_array_push(&cmd->args, "pack-objects"); | |
164 | if (args->window) | |
165 | argv_array_pushf(&cmd->args, "--window=%s", args->window); | |
166 | if (args->window_memory) | |
167 | argv_array_pushf(&cmd->args, "--window-memory=%s", args->window_memory); | |
168 | if (args->depth) | |
169 | argv_array_pushf(&cmd->args, "--depth=%s", args->depth); | |
170 | if (args->threads) | |
171 | argv_array_pushf(&cmd->args, "--threads=%s", args->threads); | |
172 | if (args->max_pack_size) | |
173 | argv_array_pushf(&cmd->args, "--max-pack-size=%s", args->max_pack_size); | |
174 | if (args->no_reuse_delta) | |
175 | argv_array_pushf(&cmd->args, "--no-reuse-delta"); | |
176 | if (args->no_reuse_object) | |
177 | argv_array_pushf(&cmd->args, "--no-reuse-object"); | |
178 | if (args->local) | |
179 | argv_array_push(&cmd->args, "--local"); | |
180 | if (args->quiet) | |
181 | argv_array_push(&cmd->args, "--quiet"); | |
182 | if (delta_base_offset) | |
183 | argv_array_push(&cmd->args, "--delta-base-offset"); | |
184 | argv_array_push(&cmd->args, packtmp); | |
185 | cmd->git_cmd = 1; | |
186 | cmd->out = -1; | |
187 | } | |
188 | ||
5d19e813 JT |
189 | /* |
190 | * Write oid to the given struct child_process's stdin, starting it first if | |
191 | * necessary. | |
192 | */ | |
193 | static int write_oid(const struct object_id *oid, struct packed_git *pack, | |
194 | uint32_t pos, void *data) | |
195 | { | |
196 | struct child_process *cmd = data; | |
197 | ||
198 | if (cmd->in == -1) { | |
199 | if (start_command(cmd)) | |
200 | die("Could not start pack-objects to repack promisor objects"); | |
201 | } | |
202 | ||
203 | xwrite(cmd->in, oid_to_hex(oid), GIT_SHA1_HEXSZ); | |
204 | xwrite(cmd->in, "\n", 1); | |
205 | return 0; | |
206 | } | |
207 | ||
208 | static void repack_promisor_objects(const struct pack_objects_args *args, | |
209 | struct string_list *names) | |
210 | { | |
211 | struct child_process cmd = CHILD_PROCESS_INIT; | |
212 | FILE *out; | |
213 | struct strbuf line = STRBUF_INIT; | |
214 | ||
215 | prepare_pack_objects(&cmd, args); | |
216 | cmd.in = -1; | |
217 | ||
218 | /* | |
219 | * NEEDSWORK: Giving pack-objects only the OIDs without any ordering | |
220 | * hints may result in suboptimal deltas in the resulting pack. See if | |
221 | * the OIDs can be sent with fake paths such that pack-objects can use a | |
222 | * {type -> existing pack order} ordering when computing deltas instead | |
223 | * of a {type -> size} ordering, which may produce better deltas. | |
224 | */ | |
225 | for_each_packed_object(write_oid, &cmd, | |
226 | FOR_EACH_OBJECT_PROMISOR_ONLY); | |
227 | ||
228 | if (cmd.in == -1) | |
229 | /* No packed objects; cmd was never started */ | |
230 | return; | |
231 | ||
232 | close(cmd.in); | |
233 | ||
234 | out = xfdopen(cmd.out, "r"); | |
235 | while (strbuf_getline_lf(&line, out) != EOF) { | |
236 | char *promisor_name; | |
237 | int fd; | |
238 | if (line.len != 40) | |
239 | die("repack: Expecting 40 character sha1 lines only from pack-objects."); | |
240 | string_list_append(names, line.buf); | |
241 | ||
242 | /* | |
243 | * pack-objects creates the .pack and .idx files, but not the | |
244 | * .promisor file. Create the .promisor file, which is empty. | |
245 | */ | |
246 | promisor_name = mkpathdup("%s-%s.promisor", packtmp, | |
247 | line.buf); | |
248 | fd = open(promisor_name, O_CREAT|O_EXCL|O_WRONLY, 0600); | |
249 | if (fd < 0) | |
250 | die_errno("unable to create '%s'", promisor_name); | |
251 | close(fd); | |
252 | free(promisor_name); | |
253 | } | |
254 | fclose(out); | |
255 | if (finish_command(&cmd)) | |
256 | die("Could not finish pack-objects to repack promisor objects"); | |
257 | } | |
258 | ||
a1bbc6c0 SB |
259 | #define ALL_INTO_ONE 1 |
260 | #define LOOSEN_UNREACHABLE 2 | |
261 | ||
262 | int cmd_repack(int argc, const char **argv, const char *prefix) | |
263 | { | |
42a02d85 JK |
264 | struct { |
265 | const char *name; | |
b77fcd1e | 266 | unsigned optional:1; |
42a02d85 JK |
267 | } exts[] = { |
268 | {".pack"}, | |
269 | {".idx"}, | |
5cf2741c | 270 | {".bitmap", 1}, |
5d19e813 | 271 | {".promisor", 1}, |
42a02d85 | 272 | }; |
d3180279 | 273 | struct child_process cmd = CHILD_PROCESS_INIT; |
a1bbc6c0 | 274 | struct string_list_item *item; |
a1bbc6c0 SB |
275 | struct string_list names = STRING_LIST_INIT_DUP; |
276 | struct string_list rollback = STRING_LIST_INIT_NODUP; | |
277 | struct string_list existing_packs = STRING_LIST_INIT_DUP; | |
278 | struct strbuf line = STRBUF_INIT; | |
ed7e5fc3 | 279 | int i, ext, ret, failed; |
a1bbc6c0 SB |
280 | FILE *out; |
281 | ||
282 | /* variables to be filled by option parsing */ | |
283 | int pack_everything = 0; | |
284 | int delete_redundant = 0; | |
aa8bd519 | 285 | const char *unpack_unreachable = NULL; |
905f27b8 | 286 | int keep_unreachable = 0; |
ed7e5fc3 | 287 | struct string_list keep_pack_list = STRING_LIST_INIT_NODUP; |
a1bbc6c0 | 288 | int no_update_server_info = 0; |
525e18c0 | 289 | int midx_cleared = 0; |
2b958e79 | 290 | struct pack_objects_args po_args = {NULL}; |
a1bbc6c0 SB |
291 | |
292 | struct option builtin_repack_options[] = { | |
293 | OPT_BIT('a', NULL, &pack_everything, | |
294 | N_("pack everything in a single pack"), ALL_INTO_ONE), | |
295 | OPT_BIT('A', NULL, &pack_everything, | |
296 | N_("same as -a, and turn unreachable objects loose"), | |
297 | LOOSEN_UNREACHABLE | ALL_INTO_ONE), | |
298 | OPT_BOOL('d', NULL, &delete_redundant, | |
299 | N_("remove redundant packs, and run git-prune-packed")), | |
2b958e79 | 300 | OPT_BOOL('f', NULL, &po_args.no_reuse_delta, |
a1bbc6c0 | 301 | N_("pass --no-reuse-delta to git-pack-objects")), |
2b958e79 | 302 | OPT_BOOL('F', NULL, &po_args.no_reuse_object, |
a1bbc6c0 SB |
303 | N_("pass --no-reuse-object to git-pack-objects")), |
304 | OPT_BOOL('n', NULL, &no_update_server_info, | |
305 | N_("do not run git-update-server-info")), | |
2b958e79 JT |
306 | OPT__QUIET(&po_args.quiet, N_("be quiet")), |
307 | OPT_BOOL('l', "local", &po_args.local, | |
a1bbc6c0 | 308 | N_("pass --local to git-pack-objects")), |
d078d85b | 309 | OPT_BOOL('b', "write-bitmap-index", &write_bitmaps, |
5cf2741c | 310 | N_("write bitmap index")), |
16d75fa4 JK |
311 | OPT_BOOL('i', "delta-islands", &use_delta_islands, |
312 | N_("pass --delta-islands to git-pack-objects")), | |
a1bbc6c0 SB |
313 | OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"), |
314 | N_("with -A, do not loosen objects older than this")), | |
905f27b8 JK |
315 | OPT_BOOL('k', "keep-unreachable", &keep_unreachable, |
316 | N_("with -a, repack unreachable objects")), | |
2b958e79 | 317 | OPT_STRING(0, "window", &po_args.window, N_("n"), |
a1bbc6c0 | 318 | N_("size of the window used for delta compression")), |
2b958e79 | 319 | OPT_STRING(0, "window-memory", &po_args.window_memory, N_("bytes"), |
a1bbc6c0 | 320 | N_("same as the above, but limit memory size instead of entries count")), |
2b958e79 | 321 | OPT_STRING(0, "depth", &po_args.depth, N_("n"), |
a1bbc6c0 | 322 | N_("limits the maximum delta depth")), |
2b958e79 | 323 | OPT_STRING(0, "threads", &po_args.threads, N_("n"), |
40bcf318 | 324 | N_("limits the maximum number of threads")), |
2b958e79 | 325 | OPT_STRING(0, "max-pack-size", &po_args.max_pack_size, N_("bytes"), |
a1bbc6c0 | 326 | N_("maximum size of each packfile")), |
ee34a2be JK |
327 | OPT_BOOL(0, "pack-kept-objects", &pack_kept_objects, |
328 | N_("repack objects in packs marked with .keep")), | |
ed7e5fc3 NTND |
329 | OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"), |
330 | N_("do not repack this pack")), | |
a1bbc6c0 SB |
331 | OPT_END() |
332 | }; | |
333 | ||
334 | git_config(repack_config, NULL); | |
335 | ||
336 | argc = parse_options(argc, argv, prefix, builtin_repack_options, | |
337 | git_repack_usage, 0); | |
338 | ||
067fbd41 JK |
339 | if (delete_redundant && repository_format_precious_objects) |
340 | die(_("cannot delete packs in a precious-objects repo")); | |
341 | ||
905f27b8 JK |
342 | if (keep_unreachable && |
343 | (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE))) | |
344 | die(_("--keep-unreachable and -A are incompatible")); | |
345 | ||
ee34a2be | 346 | if (pack_kept_objects < 0) |
2bed2d47 | 347 | pack_kept_objects = write_bitmaps; |
ee34a2be | 348 | |
1c409a70 DT |
349 | if (write_bitmaps && !(pack_everything & ALL_INTO_ONE)) |
350 | die(_(incremental_bitmap_conflict_error)); | |
351 | ||
a1bbc6c0 SB |
352 | packdir = mkpathdup("%s/pack", get_object_directory()); |
353 | packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid()); | |
354 | ||
355 | sigchain_push_common(remove_pack_on_signal); | |
356 | ||
2b958e79 JT |
357 | prepare_pack_objects(&cmd, &po_args); |
358 | ||
a2bae2dc | 359 | argv_array_push(&cmd.args, "--keep-true-parents"); |
ee34a2be | 360 | if (!pack_kept_objects) |
a2bae2dc | 361 | argv_array_push(&cmd.args, "--honor-pack-keep"); |
ed7e5fc3 NTND |
362 | for (i = 0; i < keep_pack_list.nr; i++) |
363 | argv_array_pushf(&cmd.args, "--keep-pack=%s", | |
364 | keep_pack_list.items[i].string); | |
a2bae2dc RS |
365 | argv_array_push(&cmd.args, "--non-empty"); |
366 | argv_array_push(&cmd.args, "--all"); | |
367 | argv_array_push(&cmd.args, "--reflog"); | |
368 | argv_array_push(&cmd.args, "--indexed-objects"); | |
0c16cd49 JT |
369 | if (repository_format_partial_clone) |
370 | argv_array_push(&cmd.args, "--exclude-promisor-objects"); | |
2bed2d47 | 371 | if (write_bitmaps) |
a2bae2dc | 372 | argv_array_push(&cmd.args, "--write-bitmap-index"); |
16d75fa4 JK |
373 | if (use_delta_islands) |
374 | argv_array_push(&cmd.args, "--delta-islands"); | |
a1bbc6c0 SB |
375 | |
376 | if (pack_everything & ALL_INTO_ONE) { | |
ed7e5fc3 | 377 | get_non_kept_pack_filenames(&existing_packs, &keep_pack_list); |
a1bbc6c0 | 378 | |
5d19e813 JT |
379 | repack_promisor_objects(&po_args, &names); |
380 | ||
a1bbc6c0 | 381 | if (existing_packs.nr && delete_redundant) { |
8d422993 | 382 | if (unpack_unreachable) { |
a2bae2dc | 383 | argv_array_pushf(&cmd.args, |
a1bbc6c0 SB |
384 | "--unpack-unreachable=%s", |
385 | unpack_unreachable); | |
8d422993 JK |
386 | argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); |
387 | } else if (pack_everything & LOOSEN_UNREACHABLE) { | |
a2bae2dc | 388 | argv_array_push(&cmd.args, |
a1bbc6c0 | 389 | "--unpack-unreachable"); |
905f27b8 JK |
390 | } else if (keep_unreachable) { |
391 | argv_array_push(&cmd.args, "--keep-unreachable"); | |
e26a8c47 | 392 | argv_array_push(&cmd.args, "--pack-loose-unreachable"); |
8d422993 JK |
393 | } else { |
394 | argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); | |
395 | } | |
a1bbc6c0 SB |
396 | } |
397 | } else { | |
a2bae2dc RS |
398 | argv_array_push(&cmd.args, "--unpacked"); |
399 | argv_array_push(&cmd.args, "--incremental"); | |
a1bbc6c0 SB |
400 | } |
401 | ||
a1bbc6c0 SB |
402 | cmd.no_stdin = 1; |
403 | ||
404 | ret = start_command(&cmd); | |
405 | if (ret) | |
ffc9329f | 406 | return ret; |
a1bbc6c0 | 407 | |
a1bbc6c0 | 408 | out = xfdopen(cmd.out, "r"); |
8f309aeb | 409 | while (strbuf_getline_lf(&line, out) != EOF) { |
a1bbc6c0 SB |
410 | if (line.len != 40) |
411 | die("repack: Expecting 40 character sha1 lines only from pack-objects."); | |
412 | string_list_append(&names, line.buf); | |
a1bbc6c0 SB |
413 | } |
414 | fclose(out); | |
415 | ret = finish_command(&cmd); | |
416 | if (ret) | |
ffc9329f | 417 | return ret; |
a1bbc6c0 | 418 | |
2b958e79 | 419 | if (!names.nr && !po_args.quiet) |
a1bbc6c0 SB |
420 | printf("Nothing new to pack.\n"); |
421 | ||
422 | /* | |
423 | * Ok we have prepared all new packfiles. | |
424 | * First see if there are packs of the same name and if so | |
425 | * if we can move them out of the way (this can happen if we | |
426 | * repacked immediately after packing fully. | |
427 | */ | |
428 | failed = 0; | |
429 | for_each_string_list_item(item, &names) { | |
b328c216 | 430 | for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { |
e3cf2303 | 431 | char *fname, *fname_old; |
525e18c0 DS |
432 | |
433 | if (!midx_cleared) { | |
434 | /* if we move a packfile, it will invalidated the midx */ | |
435 | clear_midx_file(get_object_directory()); | |
436 | midx_cleared = 1; | |
437 | } | |
438 | ||
9d7fbfd2 | 439 | fname = mkpathdup("%s/pack-%s%s", packdir, |
42a02d85 | 440 | item->string, exts[ext].name); |
a1bbc6c0 SB |
441 | if (!file_exists(fname)) { |
442 | free(fname); | |
443 | continue; | |
444 | } | |
445 | ||
e3cf2303 | 446 | fname_old = mkpathdup("%s/old-%s%s", packdir, |
42a02d85 | 447 | item->string, exts[ext].name); |
a1bbc6c0 SB |
448 | if (file_exists(fname_old)) |
449 | if (unlink(fname_old)) | |
450 | failed = 1; | |
451 | ||
452 | if (!failed && rename(fname, fname_old)) { | |
453 | free(fname); | |
e3cf2303 | 454 | free(fname_old); |
a1bbc6c0 SB |
455 | failed = 1; |
456 | break; | |
457 | } else { | |
458 | string_list_append(&rollback, fname); | |
e3cf2303 | 459 | free(fname_old); |
a1bbc6c0 SB |
460 | } |
461 | } | |
462 | if (failed) | |
463 | break; | |
464 | } | |
465 | if (failed) { | |
466 | struct string_list rollback_failure = STRING_LIST_INIT_DUP; | |
467 | for_each_string_list_item(item, &rollback) { | |
e3cf2303 | 468 | char *fname, *fname_old; |
a1bbc6c0 | 469 | fname = mkpathdup("%s/%s", packdir, item->string); |
e3cf2303 | 470 | fname_old = mkpathdup("%s/old-%s", packdir, item->string); |
a1bbc6c0 SB |
471 | if (rename(fname_old, fname)) |
472 | string_list_append(&rollback_failure, fname); | |
473 | free(fname); | |
e3cf2303 | 474 | free(fname_old); |
a1bbc6c0 SB |
475 | } |
476 | ||
477 | if (rollback_failure.nr) { | |
478 | int i; | |
479 | fprintf(stderr, | |
480 | "WARNING: Some packs in use have been renamed by\n" | |
481 | "WARNING: prefixing old- to their name, in order to\n" | |
482 | "WARNING: replace them with the new version of the\n" | |
483 | "WARNING: file. But the operation failed, and the\n" | |
484 | "WARNING: attempt to rename them back to their\n" | |
485 | "WARNING: original names also failed.\n" | |
486 | "WARNING: Please rename them in %s manually:\n", packdir); | |
487 | for (i = 0; i < rollback_failure.nr; i++) | |
488 | fprintf(stderr, "WARNING: old-%s -> %s\n", | |
489 | rollback_failure.items[i].string, | |
490 | rollback_failure.items[i].string); | |
491 | } | |
492 | exit(1); | |
493 | } | |
494 | ||
495 | /* Now the ones with the same name are out of the way... */ | |
496 | for_each_string_list_item(item, &names) { | |
b328c216 | 497 | for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { |
a1bbc6c0 SB |
498 | char *fname, *fname_old; |
499 | struct stat statbuffer; | |
b77fcd1e | 500 | int exists = 0; |
a1bbc6c0 | 501 | fname = mkpathdup("%s/pack-%s%s", |
42a02d85 | 502 | packdir, item->string, exts[ext].name); |
a1bbc6c0 | 503 | fname_old = mkpathdup("%s-%s%s", |
42a02d85 | 504 | packtmp, item->string, exts[ext].name); |
a1bbc6c0 SB |
505 | if (!stat(fname_old, &statbuffer)) { |
506 | statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH); | |
507 | chmod(fname_old, statbuffer.st_mode); | |
b77fcd1e JK |
508 | exists = 1; |
509 | } | |
510 | if (exists || !exts[ext].optional) { | |
511 | if (rename(fname_old, fname)) | |
512 | die_errno(_("renaming '%s' failed"), fname_old); | |
a1bbc6c0 | 513 | } |
a1bbc6c0 SB |
514 | free(fname); |
515 | free(fname_old); | |
516 | } | |
517 | } | |
518 | ||
519 | /* Remove the "old-" files */ | |
520 | for_each_string_list_item(item, &names) { | |
b328c216 | 521 | for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { |
e3cf2303 JK |
522 | char *fname; |
523 | fname = mkpathdup("%s/old-%s%s", | |
524 | packdir, | |
525 | item->string, | |
526 | exts[ext].name); | |
0b63c6a5 | 527 | if (remove_path(fname)) |
e923a8ab | 528 | warning(_("failed to remove '%s'"), fname); |
e3cf2303 | 529 | free(fname); |
a1bbc6c0 SB |
530 | } |
531 | } | |
532 | ||
533 | /* End of pack replacement. */ | |
534 | ||
5d19e813 JT |
535 | reprepare_packed_git(the_repository); |
536 | ||
a1bbc6c0 | 537 | if (delete_redundant) { |
4489a480 | 538 | int opts = 0; |
3383e199 | 539 | string_list_sort(&names); |
a1bbc6c0 SB |
540 | for_each_string_list_item(item, &existing_packs) { |
541 | char *sha1; | |
542 | size_t len = strlen(item->string); | |
543 | if (len < 40) | |
544 | continue; | |
545 | sha1 = item->string + len - 40; | |
546 | if (!string_list_has_string(&names, sha1)) | |
547 | remove_redundant_pack(packdir, item->string); | |
548 | } | |
2b958e79 | 549 | if (!po_args.quiet && isatty(2)) |
4489a480 RS |
550 | opts |= PRUNE_PACKED_VERBOSE; |
551 | prune_packed_objects(opts); | |
a1bbc6c0 SB |
552 | } |
553 | ||
4489a480 RS |
554 | if (!no_update_server_info) |
555 | update_server_info(0); | |
a1bbc6c0 SB |
556 | remove_temporary_files(); |
557 | string_list_clear(&names, 0); | |
558 | string_list_clear(&rollback, 0); | |
559 | string_list_clear(&existing_packs, 0); | |
560 | strbuf_release(&line); | |
561 | ||
562 | return 0; | |
563 | } |