🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.1.2 / . / fast-import.c
blob: a40b4ea2d0447e5369efafa9943e1e46a28cc477 [file] [log] [blame]
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1/*
Elijah Newren98e1a412009-03-25 21:22:13[diff] [blame]2(See Documentation/git-fast-import.txt for maintained documentation.)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]3Format of STDIN stream:
4
5 stream ::= cmd*;
6
7 cmd ::= new_blob
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]8 | new_commit
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]9 | new_tag
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]10 | reset_branch
Shawn O. Pearce8c1f22d2007-02-05 21:05:11[diff] [blame]11 | checkpoint
Shawn O. Pearceac053c02007-08-01 14:23:08[diff] [blame]12 | progress
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]13 ;
14
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]15 new_blob ::= 'blob' lf
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]16 mark?
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]17 file_content;
18 file_content ::= data;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]19
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]20 new_commit ::= 'commit' sp ref_str lf
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]21 mark?
Shawn O. Pearce74fbd112009-12-30 15:03:48[diff] [blame]22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]24 commit_msg
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]25 ('from' sp commit-ish lf)?
26 ('merge' sp commit-ish lf)*
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]27 (file_change | ls)*
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]28 lf?;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]29 commit_msg ::= data;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]30
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]31 ls ::= 'ls' sp '"' quoted(path) '"' lf;
32
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]33 file_change ::= file_clr
34 | file_del
35 | file_rnm
36 | file_cpy
37 | file_obm
38 | file_inm;
Shawn O. Pearce825769a2007-02-07 07:03:03[diff] [blame]39 file_clr ::= 'deleteall' lf;
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]40 file_del ::= 'D' sp path_str lf;
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]41 file_rnm ::= 'R' sp path_str sp path_str lf;
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]42 file_cpy ::= 'C' sp path_str sp path_str lf;
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]43 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
44 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
45 data;
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]46 note_obm ::= 'N' sp (hexsha1 | idnum) sp commit-ish lf;
47 note_inm ::= 'N' sp 'inline' sp commit-ish lf
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]48 data;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]49
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]50 new_tag ::= 'tag' sp tag_str lf
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]51 'from' sp commit-ish lf
Shawn O. Pearce74fbd112009-12-30 15:03:48[diff] [blame]52 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]53 tag_msg;
54 tag_msg ::= data;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]55
Shawn O. Pearce9938ffc2007-01-12 03:28:39[diff] [blame]56 reset_branch ::= 'reset' sp ref_str lf
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]57 ('from' sp commit-ish lf)?
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]58 lf?;
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]59
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]60 checkpoint ::= 'checkpoint' lf
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]61 lf?;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]62
Shawn O. Pearceac053c02007-08-01 14:23:08[diff] [blame]63 progress ::= 'progress' sp not_lf* lf
64 lf?;
65
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]66 # note: the first idnum in a stream should be 1 and subsequent
67 # idnums should not have gaps between values as this will cause
68 # the stream parser to reserve space for the gapped values. An
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]69 # idnum can be updated in the future to a new object by issuing
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]70 # a new mark directive with the old idnum.
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]71 #
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]72 mark ::= 'mark' sp idnum lf;
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]73 data ::= (delimited_data | exact_data)
Shawn O. Pearce2c570cd2007-08-01 04:24:25[diff] [blame]74 lf?;
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]75
76 # note: delim may be any string but must not contain lf.
77 # data_line may contain any data but must not be exactly
78 # delim.
79 delimited_data ::= 'data' sp '<<' delim lf
80 (data_line lf)*
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]81 delim lf;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]82
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]83 # note: declen indicates the length of binary_data in bytes.
Mike Ralphson3ea3c212009-04-17 18:13:30[diff] [blame]84 # declen does not include the lf preceding the binary data.
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]85 #
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]86 exact_data ::= 'data' sp declen lf
87 binary_data;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]88
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]89 # note: quoted strings are C-style quoting supporting \c for
90 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]91 # is the signed byte value in octal. Note that the only
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]92 # characters which must actually be escaped to protect the
93 # stream formatting is: \, " and LF. Otherwise these values
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]94 # are UTF8.
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]95 #
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]96 commit-ish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
Shawn O. Pearce6c3aac12007-02-06 01:30:37[diff] [blame]97 ref_str ::= ref;
98 sha1exp_str ::= sha1exp;
99 tag_str ::= tag;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]100 path_str ::= path | '"' quoted(path) '"' ;
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]101 mode ::= '100644' | '644'
102 | '100755' | '755'
Junio C Hamano9981b6d2007-02-06 20:46:11[diff] [blame]103 | '120000'
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]104 ;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]105
106 declen ::= # unsigned 32 bit value, ascii base10 notation;
Shawn O. Pearce21048382007-01-17 05:33:18[diff] [blame]107 bigint ::= # unsigned integer value, ascii base10 notation;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]108 binary_data ::= # file content, not interpreted;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]109
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]110 when ::= raw_when | rfc2822_when;
111 raw_when ::= ts sp tz;
112 rfc2822_when ::= # Valid RFC 2822 date and time;
113
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]114 sp ::= # ASCII space character;
115 lf ::= # ASCII newline (LF) character;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]116
117 # note: a colon (':') must precede the numerical value assigned to
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]118 # an idnum. This is to distinguish it from a ref or tag name as
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]119 # GIT does not permit ':' in ref or tag strings.
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]120 #
Shawn O. Pearce21048382007-01-17 05:33:18[diff] [blame]121 idnum ::= ':' bigint;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]122 path ::= # GIT style file path, e.g. "a/b/c";
123 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
124 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]125 sha1exp ::= # Any valid GIT SHA1 expression;
126 hexsha1 ::= # SHA1 in hexadecimal format;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]127
128 # note: name and email are UTF8 strings, however name must not
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]129 # contain '<' or lf and email must not contain any of the
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]130 # following: '<', '>', lf.
Alex Riesenc905e092007-07-15 08:57:40[diff] [blame]131 #
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]132 name ::= # valid GIT author/committer name;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]133 email ::= # valid GIT author/committer email;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]134 ts ::= # time since the epoch in seconds, ascii base10 notation;
135 tz ::= # GIT style timezone;
Shawn O. Pearce401d53f2007-08-01 04:05:15[diff] [blame]136
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]137 # note: comments, ls and cat requests may appear anywhere
Jonathan Nieder777f80d2010-11-28 19:45:58[diff] [blame]138 # in the input, except within a data command. Any form
139 # of the data command always escapes the related input
140 # from comment processing.
Shawn O. Pearce401d53f2007-08-01 04:05:15[diff] [blame]141 #
142 # In case it is not clear, the '#' that starts the comment
Michael J Gruberb18cc5a2009-04-22 21:15:56[diff] [blame]143 # must be the first character on that line (an lf
Mike Ralphson3ea3c212009-04-17 18:13:30[diff] [blame]144 # preceded it).
Shawn O. Pearce401d53f2007-08-01 04:05:15[diff] [blame]145 #
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]146
Jonathan Nieder777f80d2010-11-28 19:45:58[diff] [blame]147 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]148 ls_tree ::= 'ls' sp (hexsha1 | idnum) sp path_str lf;
Jonathan Nieder777f80d2010-11-28 19:45:58[diff] [blame]149
Shawn O. Pearce401d53f2007-08-01 04:05:15[diff] [blame]150 comment ::= '#' not_lf* lf;
151 not_lf ::= # Any byte that is not ASCII newline (LF);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]152*/
153
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]154#include "builtin.h"
155#include "cache.h"
156#include "object.h"
157#include "blob.h"
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]158#include "tree.h"
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]159#include "commit.h"
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]160#include "delta.h"
161#include "pack.h"
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]162#include "refs.h"
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]163#include "csum-file.h"
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]164#include "quote.h"
Steffen Prohaska2fb3f6d2009-01-18 12:00:12[diff] [blame]165#include "exec_cmd.h"
Joshua Jensen50906e02010-10-03 09:56:46[diff] [blame]166#include "dir.h"
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]167
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]168#define PACK_ID_BITS 16
169#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]170#define DEPTH_BITS 13
171#define MAX_DEPTH ((1<<DEPTH_BITS)-1)
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]172
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]173/*
174 * We abuse the setuid bit on directories to mean "do not delta".
175 */
176#define NO_DELTA S_ISUID
177
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]178struct object_entry {
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]179 struct pack_idx_entry idx;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]180 struct object_entry *next;
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]181 uint32_t type : TYPE_BITS,
182 pack_id : PACK_ID_BITS,
183 depth : DEPTH_BITS;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]184};
185
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]186struct object_entry_pool {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]187 struct object_entry_pool *next_pool;
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]188 struct object_entry *next_free;
189 struct object_entry *end;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]190 struct object_entry entries[FLEX_ARRAY]; /* more */
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]191};
192
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]193struct mark_set {
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]194 union {
195 struct object_entry *marked[1024];
196 struct mark_set *sets[1024];
197 } data;
Shawn O. Pearce6f64f6d2007-01-17 05:57:23[diff] [blame]198 unsigned int shift;
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]199};
200
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]201struct last_object {
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]202 struct strbuf data;
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]203 off_t offset;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]204 unsigned int depth;
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]205 unsigned no_swap : 1;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]206};
207
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]208struct mem_pool {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]209 struct mem_pool *next_pool;
210 char *next_free;
211 char *end;
David S. Miller69ae5172007-12-15 04:39:16[diff] [blame]212 uintmax_t space[FLEX_ARRAY]; /* more */
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]213};
214
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]215struct atom_str {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]216 struct atom_str *next_atom;
Shawn O. Pearce10831c52007-02-05 21:34:56[diff] [blame]217 unsigned short str_len;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]218 char str_dat[FLEX_ARRAY]; /* more */
219};
220
221struct tree_content;
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]222struct tree_entry {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]223 struct tree_content *tree;
Felipe Contreras4b25d092009-05-01 09:06:36[diff] [blame]224 struct atom_str *name;
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]225 struct tree_entry_ms {
Shawn O. Pearce10831c52007-02-05 21:34:56[diff] [blame]226 uint16_t mode;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]227 unsigned char sha1[20];
228 } versions[2];
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]229};
230
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]231struct tree_content {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]232 unsigned int entry_capacity; /* must match avail_tree_content */
233 unsigned int entry_count;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]234 unsigned int delta_depth;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]235 struct tree_entry *entries[FLEX_ARRAY]; /* more */
236};
237
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]238struct avail_tree_content {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]239 unsigned int entry_capacity; /* must match tree_content */
240 struct avail_tree_content *next_avail;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]241};
242
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]243struct branch {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]244 struct branch *table_next_branch;
245 struct branch *active_next_branch;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]246 const char *name;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]247 struct tree_entry branch_tree;
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]248 uintmax_t last_commit;
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]249 uintmax_t num_notes;
Shawn O. Pearce734c91f2007-03-05 17:31:09[diff] [blame]250 unsigned active : 1;
Felipe Contreras4ee1b222014-04-20 18:59:27[diff] [blame]251 unsigned delete : 1;
Shawn O. Pearce734c91f2007-03-05 17:31:09[diff] [blame]252 unsigned pack_id : PACK_ID_BITS;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]253 unsigned char sha1[20];
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]254};
255
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]256struct tag {
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]257 struct tag *next_tag;
258 const char *name;
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]259 unsigned int pack_id;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]260 unsigned char sha1[20];
261};
262
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]263struct hash_list {
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]264 struct hash_list *next;
265 unsigned char sha1[20];
266};
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]267
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]268typedef enum {
269 WHENSPEC_RAW = 1,
270 WHENSPEC_RFC2822,
Gary V. Vaughan4b055482010-05-14 09:31:35[diff] [blame]271 WHENSPEC_NOW
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]272} whenspec_type;
273
Jonathan Nieder9cba13c2011-03-16 07:08:34[diff] [blame]274struct recent_command {
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]275 struct recent_command *prev;
276 struct recent_command *next;
277 char *buf;
278};
279
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]280/* Configured limits on output */
Shawn O. Pearced5c57b22006-08-23 06:00:31[diff] [blame]281static unsigned long max_depth = 10;
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]282static off_t max_packsize;
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]283static int force_update;
Shawn O. Pearcebb23fdf2008-01-21 04:36:54[diff] [blame]284static int pack_compression_level = Z_DEFAULT_COMPRESSION;
285static int pack_compression_seen;
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]286
287/* Stats and misc. counters */
288static uintmax_t alloc_count;
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]289static uintmax_t marks_set_count;
290static uintmax_t object_count_by_type[1 << TYPE_BITS];
291static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
292static uintmax_t delta_count_by_type[1 << TYPE_BITS];
Dmitry Ivankov94c3b482011-08-20 19:04:11[diff] [blame]293static uintmax_t delta_count_attempts_by_type[1 << TYPE_BITS];
Shawn O. Pearcea7ddc482007-01-16 09:55:41[diff] [blame]294static unsigned long object_count;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]295static unsigned long branch_count;
Shawn O. Pearced6c7eb22006-08-23 08:31:12[diff] [blame]296static unsigned long branch_load_count;
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]297static int failure;
Shawn O. Pearcebdf1c062007-02-12 00:45:56[diff] [blame]298static FILE *pack_edges;
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]299static unsigned int show_stats = 1;
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]300static int global_argc;
Ramsay Jones84d32bf2013-04-27 19:19:47[diff] [blame]301static char **global_argv;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]302
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]303/* Memory pools */
304static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
305static size_t total_allocd;
306static struct mem_pool *mem_pool;
307
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]308/* Atom management */
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]309static unsigned int atom_table_sz = 4451;
310static unsigned int atom_cnt;
311static struct atom_str **atom_table;
312
313/* The .pack file being generated */
Junio C Hamanoebcfb372011-02-25 23:43:25[diff] [blame]314static struct pack_idx_option pack_idx_opts;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]315static unsigned int pack_id;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]316static struct sha1file *pack_file;
Shawn O. Pearced489bc12007-01-14 11:20:23[diff] [blame]317static struct packed_git *pack_data;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]318static struct packed_git **all_packs;
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]319static off_t pack_size;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]320
321/* Table of objects we've written. */
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]322static unsigned int object_entry_alloc = 5000;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]323static struct object_entry_pool *blocks;
324static struct object_entry *object_table[1 << 16];
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]325static struct mark_set *marks;
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]326static const char *export_marks_file;
327static const char *import_marks_file;
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]328static int import_marks_file_from_stream;
Ramkumar Ramachandradded4f12011-01-15 06:31:46[diff] [blame]329static int import_marks_file_ignore_missing;
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]330static int relative_marks_paths;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]331
332/* Our last blob */
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]333static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]334
335/* Tree management */
336static unsigned int tree_entry_alloc = 1000;
337static void *avail_tree_entry;
338static unsigned int avail_tree_table_sz = 100;
339static struct avail_tree_content **avail_tree_table;
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]340static struct strbuf old_tree = STRBUF_INIT;
341static struct strbuf new_tree = STRBUF_INIT;
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]342
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]343/* Branch data */
Shawn O. Pearced5c57b22006-08-23 06:00:31[diff] [blame]344static unsigned long max_active_branches = 5;
345static unsigned long cur_active_branches;
346static unsigned long branch_table_sz = 1039;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]347static struct branch **branch_table;
348static struct branch *active_branches;
349
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]350/* Tag data */
351static struct tag *first_tag;
352static struct tag *last_tag;
353
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]354/* Input stream parsing */
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]355static whenspec_type whenspec = WHENSPEC_RAW;
Pierre Habouzit4a241d72007-09-06 11:20:07[diff] [blame]356static struct strbuf command_buf = STRBUF_INIT;
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]357static int unread_command_buf;
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]358static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
359static struct recent_command *cmd_tail = &cmd_hist;
360static struct recent_command *rc_free;
361static unsigned int cmd_save = 100;
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]362static uintmax_t next_mark;
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]363static struct strbuf new_data = STRBUF_INIT;
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]364static int seen_data_command;
Sverre Rabbelierbe568622011-07-16 13:03:32[diff] [blame]365static int require_explicit_termination;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]366
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]367/* Signal handling */
368static volatile sig_atomic_t checkpoint_requested;
369
David Barr85c62392010-11-28 19:45:01[diff] [blame]370/* Where to write output of cat-blob commands */
371static int cat_blob_fd = STDOUT_FILENO;
372
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]373static void parse_argv(void);
Jeff King97313be2014-06-18 19:49:12[diff] [blame]374static void parse_cat_blob(const char *p);
375static void parse_ls(const char *p, struct branch *b);
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]376
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]377static void write_branch_report(FILE *rpt, struct branch *b)
378{
379 fprintf(rpt, "%s:\n", b->name);
380
381 fprintf(rpt, " status :");
382 if (b->active)
383 fputs(" active", rpt);
384 if (b->branch_tree.tree)
385 fputs(" loaded", rpt);
386 if (is_null_sha1(b->branch_tree.versions[1].sha1))
387 fputs(" dirty", rpt);
388 fputc('\n', rpt);
389
390 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
391 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
392 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
393 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
394
395 fputs(" last pack : ", rpt);
396 if (b->pack_id < MAX_PACK_ID)
397 fprintf(rpt, "%u", b->pack_id);
398 fputc('\n', rpt);
399
400 fputc('\n', rpt);
401}
402
Shawn O. Pearce3b08e5b2008-02-14 06:34:40[diff] [blame]403static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
404
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]405static void write_crash_report(const char *err)
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]406{
David Soria Parra85e72832008-08-31 12:09:39[diff] [blame]407 char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]408 FILE *rpt = fopen(loc, "w");
409 struct branch *b;
410 unsigned long lu;
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]411 struct recent_command *rc;
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]412
413 if (!rpt) {
414 error("can't write crash report %s: %s", loc, strerror(errno));
415 return;
416 }
417
418 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
419
420 fprintf(rpt, "fast-import crash report:\n");
David Soria Parra85e72832008-08-31 12:09:39[diff] [blame]421 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
422 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]423 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
424 fputc('\n', rpt);
425
426 fputs("fatal: ", rpt);
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]427 fputs(err, rpt);
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]428 fputc('\n', rpt);
429
430 fputc('\n', rpt);
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]431 fputs("Most Recent Commands Before Crash\n", rpt);
432 fputs("---------------------------------\n", rpt);
433 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
434 if (rc->next == &cmd_hist)
435 fputs("* ", rpt);
436 else
437 fputs(" ", rpt);
438 fputs(rc->buf, rpt);
439 fputc('\n', rpt);
440 }
441
442 fputc('\n', rpt);
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]443 fputs("Active Branch LRU\n", rpt);
444 fputs("-----------------\n", rpt);
445 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
446 cur_active_branches,
447 max_active_branches);
448 fputc('\n', rpt);
449 fputs(" pos clock name\n", rpt);
450 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
451 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
452 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
453 ++lu, b->last_commit, b->name);
454
455 fputc('\n', rpt);
456 fputs("Inactive Branches\n", rpt);
457 fputs("-----------------\n", rpt);
458 for (lu = 0; lu < branch_table_sz; lu++) {
459 for (b = branch_table[lu]; b; b = b->table_next_branch)
460 write_branch_report(rpt, b);
461 }
462
Shawn O. Pearcefbc63ea2008-02-14 06:34:36[diff] [blame]463 if (first_tag) {
464 struct tag *tg;
465 fputc('\n', rpt);
466 fputs("Annotated Tags\n", rpt);
467 fputs("--------------\n", rpt);
468 for (tg = first_tag; tg; tg = tg->next_tag) {
469 fputs(sha1_to_hex(tg->sha1), rpt);
470 fputc(' ', rpt);
471 fputs(tg->name, rpt);
472 fputc('\n', rpt);
473 }
474 }
475
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]476 fputc('\n', rpt);
Shawn O. Pearce3b08e5b2008-02-14 06:34:40[diff] [blame]477 fputs("Marks\n", rpt);
478 fputs("-----\n", rpt);
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]479 if (export_marks_file)
480 fprintf(rpt, " exported to %s\n", export_marks_file);
Shawn O. Pearce3b08e5b2008-02-14 06:34:40[diff] [blame]481 else
482 dump_marks_helper(rpt, 0, marks);
483
484 fputc('\n', rpt);
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]485 fputs("-------------------\n", rpt);
486 fputs("END OF CRASH REPORT\n", rpt);
487 fclose(rpt);
488}
489
Shawn O. Pearce118805b2008-02-14 06:34:43[diff] [blame]490static void end_packfile(void);
491static void unkeep_all_packs(void);
492static void dump_marks(void);
493
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]494static NORETURN void die_nicely(const char *err, va_list params)
495{
496 static int zombie;
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]497 char message[2 * PATH_MAX];
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]498
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]499 vsnprintf(message, sizeof(message), err, params);
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]500 fputs("fatal: ", stderr);
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]501 fputs(message, stderr);
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]502 fputc('\n', stderr);
503
504 if (!zombie) {
505 zombie = 1;
Alex Riesen4bf53832007-08-21 03:38:14[diff] [blame]506 write_crash_report(message);
Shawn O. Pearce118805b2008-02-14 06:34:43[diff] [blame]507 end_packfile();
508 unkeep_all_packs();
509 dump_marks();
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]510 }
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]511 exit(128);
512}
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]513
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]514#ifndef SIGUSR1 /* Windows, for example */
515
516static void set_checkpoint_signal(void)
517{
518}
519
520#else
521
522static void checkpoint_signal(int signo)
523{
524 checkpoint_requested = 1;
525}
526
527static void set_checkpoint_signal(void)
528{
529 struct sigaction sa;
530
531 memset(&sa, 0, sizeof(sa));
532 sa.sa_handler = checkpoint_signal;
533 sigemptyset(&sa.sa_mask);
534 sa.sa_flags = SA_RESTART;
535 sigaction(SIGUSR1, &sa, NULL);
536}
537
538#endif
539
Shawn O. Pearce03842d82007-01-15 05:16:23[diff] [blame]540static void alloc_objects(unsigned int cnt)
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]541{
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]542 struct object_entry_pool *b;
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]543
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]544 b = xmalloc(sizeof(struct object_entry_pool)
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]545 + cnt * sizeof(struct object_entry));
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]546 b->next_pool = blocks;
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]547 b->next_free = b->entries;
548 b->end = b->entries + cnt;
549 blocks = b;
550 alloc_count += cnt;
551}
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]552
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]553static struct object_entry *new_object(unsigned char *sha1)
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]554{
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]555 struct object_entry *e;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]556
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]557 if (blocks->next_free == blocks->end)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]558 alloc_objects(object_entry_alloc);
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]559
560 e = blocks->next_free++;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]561 hashcpy(e->idx.sha1, sha1);
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]562 return e;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]563}
564
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]565static struct object_entry *find_object(unsigned char *sha1)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]566{
567 unsigned int h = sha1[0] << 8 | sha1[1];
568 struct object_entry *e;
569 for (e = object_table[h]; e; e = e->next)
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]570 if (!hashcmp(sha1, e->idx.sha1))
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]571 return e;
572 return NULL;
573}
574
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]575static struct object_entry *insert_object(unsigned char *sha1)
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]576{
577 unsigned int h = sha1[0] << 8 | sha1[1];
Shawn O. Pearce27d6d292006-08-08 04:03:59[diff] [blame]578 struct object_entry *e = object_table[h];
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]579
580 while (e) {
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]581 if (!hashcmp(sha1, e->idx.sha1))
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]582 return e;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]583 e = e->next;
584 }
585
586 e = new_object(sha1);
David Barrb7c1ce42010-11-23 07:53:48[diff] [blame]587 e->next = object_table[h];
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]588 e->idx.offset = 0;
David Barrb7c1ce42010-11-23 07:53:48[diff] [blame]589 object_table[h] = e;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]590 return e;
591}
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]592
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]593static unsigned int hc_str(const char *s, size_t len)
594{
595 unsigned int r = 0;
596 while (len-- > 0)
597 r = r * 31 + *s++;
598 return r;
599}
600
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]601static void *pool_alloc(size_t len)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]602{
603 struct mem_pool *p;
604 void *r;
605
YONETANI Tomokazu2fad5322008-12-14 02:08:22[diff] [blame]606 /* round up to a 'uintmax_t' alignment */
607 if (len & (sizeof(uintmax_t) - 1))
608 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
609
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]610 for (p = mem_pool; p; p = p->next_pool)
611 if ((p->end - p->next_free >= len))
612 break;
613
614 if (!p) {
615 if (len >= (mem_pool_alloc/2)) {
616 total_allocd += len;
617 return xmalloc(len);
618 }
619 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
620 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
621 p->next_pool = mem_pool;
David S. Miller69ae5172007-12-15 04:39:16[diff] [blame]622 p->next_free = (char *) p->space;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]623 p->end = p->next_free + mem_pool_alloc;
624 mem_pool = p;
625 }
626
627 r = p->next_free;
628 p->next_free += len;
629 return r;
630}
631
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]632static void *pool_calloc(size_t count, size_t size)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]633{
634 size_t len = count * size;
635 void *r = pool_alloc(len);
636 memset(r, 0, len);
637 return r;
638}
639
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]640static char *pool_strdup(const char *s)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]641{
642 char *r = pool_alloc(strlen(s) + 1);
643 strcpy(r, s);
644 return r;
645}
646
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]647static void insert_mark(uintmax_t idnum, struct object_entry *oe)
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]648{
649 struct mark_set *s = marks;
650 while ((idnum >> s->shift) >= 1024) {
651 s = pool_calloc(1, sizeof(struct mark_set));
652 s->shift = marks->shift + 10;
653 s->data.sets[0] = marks;
654 marks = s;
655 }
656 while (s->shift) {
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]657 uintmax_t i = idnum >> s->shift;
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]658 idnum -= i << s->shift;
659 if (!s->data.sets[i]) {
660 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
661 s->data.sets[i]->shift = s->shift - 10;
662 }
663 s = s->data.sets[i];
664 }
665 if (!s->data.marked[idnum])
666 marks_set_count++;
667 s->data.marked[idnum] = oe;
668}
669
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]670static struct object_entry *find_mark(uintmax_t idnum)
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]671{
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]672 uintmax_t orig_idnum = idnum;
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]673 struct mark_set *s = marks;
674 struct object_entry *oe = NULL;
675 if ((idnum >> s->shift) < 1024) {
676 while (s && s->shift) {
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]677 uintmax_t i = idnum >> s->shift;
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]678 idnum -= i << s->shift;
679 s = s->data.sets[i];
680 }
681 if (s)
682 oe = s->data.marked[idnum];
683 }
684 if (!oe)
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]685 die("mark :%" PRIuMAX " not declared", orig_idnum);
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]686 return oe;
687}
688
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]689static struct atom_str *to_atom(const char *s, unsigned short len)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]690{
691 unsigned int hc = hc_str(s, len) % atom_table_sz;
692 struct atom_str *c;
693
694 for (c = atom_table[hc]; c; c = c->next_atom)
695 if (c->str_len == len && !strncmp(s, c->str_dat, len))
696 return c;
697
698 c = pool_alloc(sizeof(struct atom_str) + len + 1);
699 c->str_len = len;
700 strncpy(c->str_dat, s, len);
701 c->str_dat[len] = 0;
702 c->next_atom = atom_table[hc];
703 atom_table[hc] = c;
704 atom_cnt++;
705 return c;
706}
707
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]708static struct branch *lookup_branch(const char *name)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]709{
710 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
711 struct branch *b;
712
713 for (b = branch_table[hc]; b; b = b->table_next_branch)
714 if (!strcmp(name, b->name))
715 return b;
716 return NULL;
717}
718
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]719static struct branch *new_branch(const char *name)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]720{
721 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
Felipe Contreras4b25d092009-05-01 09:06:36[diff] [blame]722 struct branch *b = lookup_branch(name);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]723
724 if (b)
725 die("Invalid attempt to create duplicate branch: %s", name);
Michael Haggerty8d9c5012011-09-15 21:10:25[diff] [blame]726 if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL))
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]727 die("Branch name doesn't conform to GIT standards: %s", name);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]728
729 b = pool_calloc(1, sizeof(struct branch));
730 b->name = pool_strdup(name);
731 b->table_next_branch = branch_table[hc];
Shawn O. Pearce8a8c55e2006-08-29 02:06:13[diff] [blame]732 b->branch_tree.versions[0].mode = S_IFDIR;
733 b->branch_tree.versions[1].mode = S_IFDIR;
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]734 b->num_notes = 0;
Shawn O. Pearce734c91f2007-03-05 17:31:09[diff] [blame]735 b->active = 0;
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]736 b->pack_id = MAX_PACK_ID;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]737 branch_table[hc] = b;
738 branch_count++;
739 return b;
740}
741
742static unsigned int hc_entries(unsigned int cnt)
743{
744 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
745 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
746}
747
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]748static struct tree_content *new_tree_content(unsigned int cnt)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]749{
750 struct avail_tree_content *f, *l = NULL;
751 struct tree_content *t;
752 unsigned int hc = hc_entries(cnt);
753
754 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
755 if (f->entry_capacity >= cnt)
756 break;
757
758 if (f) {
759 if (l)
760 l->next_avail = f->next_avail;
761 else
762 avail_tree_table[hc] = f->next_avail;
763 } else {
764 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
765 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
766 f->entry_capacity = cnt;
767 }
768
769 t = (struct tree_content*)f;
770 t->entry_count = 0;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]771 t->delta_depth = 0;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]772 return t;
773}
774
775static void release_tree_entry(struct tree_entry *e);
776static void release_tree_content(struct tree_content *t)
777{
778 struct avail_tree_content *f = (struct avail_tree_content*)t;
779 unsigned int hc = hc_entries(f->entry_capacity);
Shawn O. Pearceafde8dd2006-08-23 05:33:47[diff] [blame]780 f->next_avail = avail_tree_table[hc];
781 avail_tree_table[hc] = f;
782}
783
784static void release_tree_content_recursive(struct tree_content *t)
785{
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]786 unsigned int i;
787 for (i = 0; i < t->entry_count; i++)
788 release_tree_entry(t->entries[i]);
Shawn O. Pearceafde8dd2006-08-23 05:33:47[diff] [blame]789 release_tree_content(t);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]790}
791
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]792static struct tree_content *grow_tree_content(
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]793 struct tree_content *t,
794 int amt)
795{
796 struct tree_content *r = new_tree_content(t->entry_count + amt);
797 r->entry_count = t->entry_count;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]798 r->delta_depth = t->delta_depth;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]799 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
800 release_tree_content(t);
801 return r;
802}
803
Shawn O. Pearcee5b14442007-02-06 05:43:59[diff] [blame]804static struct tree_entry *new_tree_entry(void)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]805{
806 struct tree_entry *e;
807
808 if (!avail_tree_entry) {
809 unsigned int n = tree_entry_alloc;
Shawn O. Pearce8435a9c2006-08-25 18:53:32[diff] [blame]810 total_allocd += n * sizeof(struct tree_entry);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]811 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
Shawn O. Pearce2eb26d82006-08-27 02:38:02[diff] [blame]812 while (n-- > 1) {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]813 *((void**)e) = e + 1;
814 e++;
815 }
Shawn O. Pearce35ef2372006-08-27 03:37:31[diff] [blame]816 *((void**)e) = NULL;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]817 }
818
819 e = avail_tree_entry;
820 avail_tree_entry = *((void**)e);
821 return e;
822}
823
824static void release_tree_entry(struct tree_entry *e)
825{
826 if (e->tree)
Shawn O. Pearceafde8dd2006-08-23 05:33:47[diff] [blame]827 release_tree_content_recursive(e->tree);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]828 *((void**)e) = avail_tree_entry;
829 avail_tree_entry = e;
830}
831
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]832static struct tree_content *dup_tree_content(struct tree_content *s)
833{
834 struct tree_content *d;
835 struct tree_entry *a, *b;
836 unsigned int i;
837
838 if (!s)
839 return NULL;
840 d = new_tree_content(s->entry_count);
841 for (i = 0; i < s->entry_count; i++) {
842 a = s->entries[i];
843 b = new_tree_entry();
844 memcpy(b, a, sizeof(*a));
845 if (a->tree && is_null_sha1(b->versions[1].sha1))
846 b->tree = dup_tree_content(a->tree);
847 else
848 b->tree = NULL;
849 d->entries[i] = b;
850 }
851 d->entry_count = s->entry_count;
852 d->delta_depth = s->delta_depth;
853
854 return d;
855}
856
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]857static void start_packfile(void)
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]858{
Ævar Arnfjörð Bjarmasonab1900a2011-12-21 01:18:21[diff] [blame]859 static char tmp_file[PATH_MAX];
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]860 struct packed_git *p;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]861 struct pack_header hdr;
Shawn O. Pearce0fcbcae2007-01-16 06:20:57[diff] [blame]862 int pack_fd;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]863
Ævar Arnfjörð Bjarmasonab1900a2011-12-21 01:18:21[diff] [blame]864 pack_fd = odb_mkstemp(tmp_file, sizeof(tmp_file),
Junio C Hamano6e180cd2009-02-25 07:11:29[diff] [blame]865 "pack/tmp_pack_XXXXXX");
Ævar Arnfjörð Bjarmasonab1900a2011-12-21 01:18:21[diff] [blame]866 p = xcalloc(1, sizeof(*p) + strlen(tmp_file) + 2);
867 strcpy(p->pack_name, tmp_file);
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]868 p->pack_fd = pack_fd;
Shawn O. Pearced131b7a2011-03-02 18:01:54[diff] [blame]869 p->do_not_close = 1;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]870 pack_file = sha1fd(pack_fd, p->pack_name);
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]871
872 hdr.hdr_signature = htonl(PACK_SIGNATURE);
873 hdr.hdr_version = htonl(2);
874 hdr.hdr_entries = 0;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]875 sha1write(pack_file, &hdr, sizeof(hdr));
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]876
877 pack_data = p;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]878 pack_size = sizeof(hdr);
879 object_count = 0;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]880
881 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
882 all_packs[pack_id] = p;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]883}
884
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]885static const char *create_index(void)
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]886{
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]887 const char *tmpfile;
888 struct pack_idx_entry **idx, **c, **last;
889 struct object_entry *e;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]890 struct object_entry_pool *o;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]891
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]892 /* Build the table of object IDs. */
893 idx = xmalloc(object_count * sizeof(*idx));
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]894 c = idx;
895 for (o = blocks; o; o = o->next_pool)
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]896 for (e = o->next_free; e-- != o->entries;)
897 if (pack_id == e->pack_id)
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]898 *c++ = &e->idx;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]899 last = idx + object_count;
Shawn O. Pearce2fce1f32007-01-15 11:51:58[diff] [blame]900 if (c != last)
901 die("internal consistency error creating the index");
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]902
Junio C Hamanoebcfb372011-02-25 23:43:25[diff] [blame]903 tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, pack_data->sha1);
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]904 free(idx);
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]905 return tmpfile;
906}
907
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]908static char *keep_pack(const char *curr_index_name)
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]909{
910 static char name[PATH_MAX];
Shawn O. Pearce3a556022007-03-07 01:44:17[diff] [blame]911 static const char *keep_msg = "fast-import";
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]912 int keep_fd;
913
Junio C Hamano6e180cd2009-02-25 07:11:29[diff] [blame]914 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]915 if (keep_fd < 0)
Thomas Rast0721c312009-06-27 15:58:47[diff] [blame]916 die_errno("cannot create keep file");
Jim Meyering95693d42008-01-10 08:54:25[diff] [blame]917 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
918 if (close(keep_fd))
Thomas Rast0721c312009-06-27 15:58:47[diff] [blame]919 die_errno("failed to write keep file");
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]920
921 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
922 get_object_directory(), sha1_to_hex(pack_data->sha1));
923 if (move_temp_to_file(pack_data->pack_name, name))
924 die("cannot store pack file");
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]925
926 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
927 get_object_directory(), sha1_to_hex(pack_data->sha1));
928 if (move_temp_to_file(curr_index_name, name))
929 die("cannot store index file");
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]930 free((void *)curr_index_name);
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]931 return name;
932}
933
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]934static void unkeep_all_packs(void)
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]935{
936 static char name[PATH_MAX];
937 int k;
938
939 for (k = 0; k < pack_id; k++) {
940 struct packed_git *p = all_packs[k];
941 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
942 get_object_directory(), sha1_to_hex(p->sha1));
Alex Riesen691f1a22009-04-29 21:22:56[diff] [blame]943 unlink_or_warn(name);
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]944 }
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]945}
946
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]947static void end_packfile(void)
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]948{
Jeff King3c078b92014-08-23 05:27:41[diff] [blame]949 if (!pack_data)
950 return;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]951
Shawn O. Pearce3d20c632009-02-10 21:36:12[diff] [blame]952 clear_delta_base_cache();
Shawn O. Pearce3e005ba2007-01-15 11:39:39[diff] [blame]953 if (object_count) {
Jeff King3c078b92014-08-23 05:27:41[diff] [blame]954 struct packed_git *new_p;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]955 unsigned char cur_pack_sha1[20];
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]956 char *idx_name;
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]957 int i;
958 struct branch *b;
959 struct tag *t;
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]960
Shawn O. Pearcec9ced052008-01-18 03:57:00[diff] [blame]961 close_pack_windows(pack_data);
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]962 sha1close(pack_file, cur_pack_sha1, 0);
Dana L. How8b0eca72007-05-02 16:13:14[diff] [blame]963 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
Nicolas Pitreabeb40e2008-08-29 20:07:59[diff] [blame]964 pack_data->pack_name, object_count,
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]965 cur_pack_sha1, pack_size);
Dana L. How8b0eca72007-05-02 16:13:14[diff] [blame]966 close(pack_data->pack_fd);
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]967 idx_name = keep_pack(create_index());
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]968
Mike Ralphson3ea3c212009-04-17 18:13:30[diff] [blame]969 /* Register the packfile with core git's machinery. */
Shawn O. Pearce3e005ba2007-01-15 11:39:39[diff] [blame]970 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
971 if (!new_p)
972 die("core git rejected index %s", idx_name);
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]973 all_packs[pack_id] = new_p;
Shawn O. Pearce3e005ba2007-01-15 11:39:39[diff] [blame]974 install_packed_git(new_p);
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]975
976 /* Print the boundary */
Shawn O. Pearcebdf1c062007-02-12 00:45:56[diff] [blame]977 if (pack_edges) {
978 fprintf(pack_edges, "%s:", new_p->pack_name);
979 for (i = 0; i < branch_table_sz; i++) {
980 for (b = branch_table[i]; b; b = b->table_next_branch) {
981 if (b->pack_id == pack_id)
982 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
983 }
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]984 }
Shawn O. Pearcebdf1c062007-02-12 00:45:56[diff] [blame]985 for (t = first_tag; t; t = t->next_tag) {
986 if (t->pack_id == pack_id)
987 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
988 }
989 fputc('\n', pack_edges);
990 fflush(pack_edges);
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]991 }
Shawn O. Pearce2369ed72007-01-16 21:18:44[diff] [blame]992
993 pack_id++;
Shawn O. Pearce3e005ba2007-01-15 11:39:39[diff] [blame]994 }
Johannes Schindelin87c8a562008-12-15 21:11:40[diff] [blame]995 else {
Jeff King3c078b92014-08-23 05:27:41[diff] [blame]996 close(pack_data->pack_fd);
997 unlink_or_warn(pack_data->pack_name);
Johannes Schindelin87c8a562008-12-15 21:11:40[diff] [blame]998 }
Jeff King3c078b92014-08-23 05:27:41[diff] [blame]999 free(pack_data);
1000 pack_data = NULL;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1001
1002 /* We can't carry a delta across packfiles. */
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1003 strbuf_release(&last_blob.data);
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1004 last_blob.offset = 0;
1005 last_blob.depth = 0;
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]1006}
1007
Shawn O. Pearce820b9312007-02-07 07:42:44[diff] [blame]1008static void cycle_packfile(void)
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1009{
1010 end_packfile();
1011 start_packfile();
1012}
1013
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1014static int store_object(
1015 enum object_type type,
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1016 struct strbuf *dat,
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]1017 struct last_object *last,
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]1018 unsigned char *sha1out,
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]1019 uintmax_t mark)
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1020{
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1021 void *out, *delta;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1022 struct object_entry *e;
1023 unsigned char hdr[96];
1024 unsigned char sha1[20];
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1025 unsigned long hdrlen, deltalen;
Nicolas Pitre9126f002008-10-01 18:05:20[diff] [blame]1026 git_SHA_CTX c;
Junio C Hamanoef49a7a2011-06-10 18:52:15[diff] [blame]1027 git_zstream s;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1028
Felipe Contreras4b25d092009-05-01 09:06:36[diff] [blame]1029 hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1030 (unsigned long)dat->len) + 1;
Nicolas Pitre9126f002008-10-01 18:05:20[diff] [blame]1031 git_SHA1_Init(&c);
1032 git_SHA1_Update(&c, hdr, hdrlen);
1033 git_SHA1_Update(&c, dat->buf, dat->len);
1034 git_SHA1_Final(sha1, &c);
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]1035 if (sha1out)
Shawn O. Pearce445b8592006-08-28 14:46:58[diff] [blame]1036 hashcpy(sha1out, sha1);
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1037
1038 e = insert_object(sha1);
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]1039 if (mark)
1040 insert_mark(mark, e);
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1041 if (e->idx.offset) {
Shawn O. Pearce6143f062006-08-08 05:14:21[diff] [blame]1042 duplicate_count_by_type[type]++;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1043 return 1;
Shawn O. Pearcea5c17802007-04-20 15:23:45[diff] [blame]1044 } else if (find_sha1_pack(sha1, packed_git)) {
1045 e->type = type;
1046 e->pack_id = MAX_PACK_ID;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1047 e->idx.offset = 1; /* just not zero! */
Shawn O. Pearcea5c17802007-04-20 15:23:45[diff] [blame]1048 duplicate_count_by_type[type]++;
1049 return 1;
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1050 }
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1051
Nicolas Pitreb500d5e2010-02-17 19:05:56[diff] [blame]1052 if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
Dmitry Ivankov94c3b482011-08-20 19:04:11[diff] [blame]1053 delta_count_attempts_by_type[type]++;
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1054 delta = diff_delta(last->data.buf, last->data.len,
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1055 dat->buf, dat->len,
Nicolas Pitreb500d5e2010-02-17 19:05:56[diff] [blame]1056 &deltalen, dat->len - 20);
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1057 } else
1058 delta = NULL;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1059
1060 memset(&s, 0, sizeof(s));
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1061 git_deflate_init(&s, pack_compression_level);
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1062 if (delta) {
1063 s.next_in = delta;
1064 s.avail_in = deltalen;
1065 } else {
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1066 s.next_in = (void *)dat->buf;
1067 s.avail_in = dat->len;
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1068 }
Junio C Hamano225a6f12011-06-10 18:18:17[diff] [blame]1069 s.avail_out = git_deflate_bound(&s, s.avail_in);
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1070 s.next_out = out = xmalloc(s.avail_out);
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1071 while (git_deflate(&s, Z_FINISH) == Z_OK)
1072 ; /* nothing */
1073 git_deflate_end(&s);
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1074
1075 /* Determine if we should auto-checkpoint. */
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]1076 if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1077 || (pack_size + 60 + s.total_out) < pack_size) {
1078
1079 /* This new object needs to *not* have the current pack_id. */
1080 e->pack_id = pack_id + 1;
Shawn O. Pearce820b9312007-02-07 07:42:44[diff] [blame]1081 cycle_packfile();
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1082
1083 /* We cannot carry a delta into the new pack. */
1084 if (delta) {
1085 free(delta);
1086 delta = NULL;
Shawn O. Pearce5d6f3ef2007-01-16 04:40:27[diff] [blame]1087
1088 memset(&s, 0, sizeof(s));
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1089 git_deflate_init(&s, pack_compression_level);
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1090 s.next_in = (void *)dat->buf;
1091 s.avail_in = dat->len;
Junio C Hamano225a6f12011-06-10 18:18:17[diff] [blame]1092 s.avail_out = git_deflate_bound(&s, s.avail_in);
Shawn O. Pearce5d6f3ef2007-01-16 04:40:27[diff] [blame]1093 s.next_out = out = xrealloc(out, s.avail_out);
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1094 while (git_deflate(&s, Z_FINISH) == Z_OK)
1095 ; /* nothing */
1096 git_deflate_end(&s);
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1097 }
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1098 }
1099
1100 e->type = type;
1101 e->pack_id = pack_id;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1102 e->idx.offset = pack_size;
Shawn O. Pearced9ee53c2007-01-15 13:00:49[diff] [blame]1103 object_count++;
1104 object_count_by_type[type]++;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1105
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]1106 crc32_begin(pack_file);
1107
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1108 if (delta) {
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]1109 off_t ofs = e->idx.offset - last->offset;
Shawn O. Pearced489bc12007-01-14 11:20:23[diff] [blame]1110 unsigned pos = sizeof(hdr) - 1;
1111
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1112 delta_count_by_type[type]++;
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]1113 e->depth = last->depth + 1;
Shawn O. Pearced489bc12007-01-14 11:20:23[diff] [blame]1114
Michael Lukashov1b22b6c2010-02-16 23:42:54[diff] [blame]1115 hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1116 sha1write(pack_file, hdr, hdrlen);
Shawn O. Pearced489bc12007-01-14 11:20:23[diff] [blame]1117 pack_size += hdrlen;
1118
1119 hdr[pos] = ofs & 127;
1120 while (ofs >>= 7)
1121 hdr[--pos] = 128 | (--ofs & 127);
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1122 sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
Shawn O. Pearced489bc12007-01-14 11:20:23[diff] [blame]1123 pack_size += sizeof(hdr) - pos;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1124 } else {
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]1125 e->depth = 0;
Michael Lukashov1b22b6c2010-02-16 23:42:54[diff] [blame]1126 hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1127 sha1write(pack_file, hdr, hdrlen);
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]1128 pack_size += hdrlen;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1129 }
1130
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1131 sha1write(pack_file, out, s.total_out);
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]1132 pack_size += s.total_out;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1133
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]1134 e->idx.crc32 = crc32_end(pack_file);
1135
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1136 free(out);
Shawn O. Pearcee7d06a42007-02-06 17:05:51[diff] [blame]1137 free(delta);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1138 if (last) {
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1139 if (last->no_swap) {
1140 last->data = *dat;
1141 } else {
Pierre Habouzitc76689d2007-09-19 22:42:12[diff] [blame]1142 strbuf_swap(&last->data, dat);
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1143 }
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1144 last->offset = e->idx.offset;
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]1145 last->depth = e->depth;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1146 }
1147 return 0;
1148}
1149
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1150static void truncate_pack(struct sha1file_checkpoint *checkpoint)
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1151{
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1152 if (sha1file_truncate(pack_file, checkpoint))
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1153 die_errno("cannot truncate pack to skip duplicate");
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1154 pack_size = checkpoint->offset;
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1155}
1156
1157static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1158{
1159 size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1160 unsigned char *in_buf = xmalloc(in_sz);
1161 unsigned char *out_buf = xmalloc(out_sz);
1162 struct object_entry *e;
1163 unsigned char sha1[20];
1164 unsigned long hdrlen;
1165 off_t offset;
1166 git_SHA_CTX c;
Junio C Hamanoef49a7a2011-06-10 18:52:15[diff] [blame]1167 git_zstream s;
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1168 struct sha1file_checkpoint checkpoint;
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1169 int status = Z_OK;
1170
1171 /* Determine if we should auto-checkpoint. */
Nicolas Pitre89e0a3a2010-02-17 19:05:54[diff] [blame]1172 if ((max_packsize && (pack_size + 60 + len) > max_packsize)
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1173 || (pack_size + 60 + len) < pack_size)
1174 cycle_packfile();
1175
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1176 sha1file_checkpoint(pack_file, &checkpoint);
1177 offset = checkpoint.offset;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1178
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1179 hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1180 if (out_sz <= hdrlen)
1181 die("impossibly large object header");
1182
1183 git_SHA1_Init(&c);
1184 git_SHA1_Update(&c, out_buf, hdrlen);
1185
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]1186 crc32_begin(pack_file);
1187
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1188 memset(&s, 0, sizeof(s));
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1189 git_deflate_init(&s, pack_compression_level);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1190
Michael Lukashov1b22b6c2010-02-16 23:42:54[diff] [blame]1191 hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1192 if (out_sz <= hdrlen)
1193 die("impossibly large object header");
1194
1195 s.next_out = out_buf + hdrlen;
1196 s.avail_out = out_sz - hdrlen;
1197
1198 while (status != Z_STREAM_END) {
1199 if (0 < len && !s.avail_in) {
1200 size_t cnt = in_sz < len ? in_sz : (size_t)len;
1201 size_t n = fread(in_buf, 1, cnt, stdin);
1202 if (!n && feof(stdin))
1203 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1204
1205 git_SHA1_Update(&c, in_buf, n);
1206 s.next_in = in_buf;
1207 s.avail_in = n;
1208 len -= n;
1209 }
1210
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1211 status = git_deflate(&s, len ? 0 : Z_FINISH);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1212
1213 if (!s.avail_out || status == Z_STREAM_END) {
1214 size_t n = s.next_out - out_buf;
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1215 sha1write(pack_file, out_buf, n);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1216 pack_size += n;
1217 s.next_out = out_buf;
1218 s.avail_out = out_sz;
1219 }
1220
1221 switch (status) {
1222 case Z_OK:
1223 case Z_BUF_ERROR:
1224 case Z_STREAM_END:
1225 continue;
1226 default:
1227 die("unexpected deflate failure: %d", status);
1228 }
1229 }
Junio C Hamano55bb5c92011-06-10 17:55:10[diff] [blame]1230 git_deflate_end(&s);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1231 git_SHA1_Final(sha1, &c);
1232
1233 if (sha1out)
1234 hashcpy(sha1out, sha1);
1235
1236 e = insert_object(sha1);
1237
1238 if (mark)
1239 insert_mark(mark, e);
1240
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1241 if (e->idx.offset) {
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1242 duplicate_count_by_type[OBJ_BLOB]++;
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1243 truncate_pack(&checkpoint);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1244
1245 } else if (find_sha1_pack(sha1, packed_git)) {
1246 e->type = OBJ_BLOB;
1247 e->pack_id = MAX_PACK_ID;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1248 e->idx.offset = 1; /* just not zero! */
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1249 duplicate_count_by_type[OBJ_BLOB]++;
Junio C Hamano6c526142011-11-18 00:26:54[diff] [blame]1250 truncate_pack(&checkpoint);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1251
1252 } else {
1253 e->depth = 0;
1254 e->type = OBJ_BLOB;
1255 e->pack_id = pack_id;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1256 e->idx.offset = offset;
Nicolas Pitre427cb222010-02-17 19:05:53[diff] [blame]1257 e->idx.crc32 = crc32_end(pack_file);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1258 object_count++;
1259 object_count_by_type[OBJ_BLOB]++;
1260 }
1261
1262 free(in_buf);
1263 free(out_buf);
1264}
1265
Shawn O. Pearce7422bac2008-01-21 04:37:01[diff] [blame]1266/* All calls must be guarded by find_object() or find_mark() to
1267 * ensure the 'struct object_entry' passed was written by this
1268 * process instance. We unpack the entry by the offset, avoiding
1269 * the need for the corresponding .idx file. This unpacking rule
1270 * works because we only use OBJ_REF_DELTA within the packfiles
1271 * created by fast-import.
1272 *
1273 * oe must not be NULL. Such an oe usually comes from giving
1274 * an unknown SHA-1 to find_object() or an undefined mark to
1275 * find_mark(). Callers must test for this condition and use
1276 * the standard read_sha1_file() when it happens.
1277 *
1278 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1279 * find_mark(), where the mark was reloaded from an existing marks
1280 * file and is referencing an object that this fast-import process
1281 * instance did not write out to a packfile. Callers must test for
1282 * this condition and use read_sha1_file() instead.
1283 */
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1284static void *gfi_unpack_entry(
1285 struct object_entry *oe,
1286 unsigned long *sizep)
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]1287{
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]1288 enum object_type type;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1289 struct packed_git *p = all_packs[oe->pack_id];
Shawn O. Pearcec9ced052008-01-18 03:57:00[diff] [blame]1290 if (p == pack_data && p->pack_size < (pack_size + 20)) {
Shawn O. Pearce7422bac2008-01-21 04:37:01[diff] [blame]1291 /* The object is stored in the packfile we are writing to
1292 * and we have modified it since the last time we scanned
1293 * back to read a previously written object. If an old
1294 * window covered [p->pack_size, p->pack_size + 20) its
1295 * data is stale and is not valid. Closing all windows
1296 * and updating the packfile length ensures we can read
1297 * the newly written data.
1298 */
Shawn O. Pearcec9ced052008-01-18 03:57:00[diff] [blame]1299 close_pack_windows(p);
Nicolas Pitre21281812010-02-17 19:05:52[diff] [blame]1300 sha1flush(pack_file);
Shawn O. Pearce7422bac2008-01-21 04:37:01[diff] [blame]1301
1302 /* We have to offer 20 bytes additional on the end of
1303 * the packfile as the core unpacker code assumes the
1304 * footer is present at the file end and must promise
1305 * at least 20 bytes within any window it maps. But
1306 * we don't actually create the footer here.
1307 */
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1308 p->pack_size = pack_size + 20;
Shawn O. Pearcec9ced052008-01-18 03:57:00[diff] [blame]1309 }
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1310 return unpack_entry(p, oe->idx.offset, &type, sizep);
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]1311}
1312
Shawn O. Pearce10831c52007-02-05 21:34:56[diff] [blame]1313static const char *get_mode(const char *str, uint16_t *modep)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1314{
1315 unsigned char c;
Shawn O. Pearce10831c52007-02-05 21:34:56[diff] [blame]1316 uint16_t mode = 0;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1317
1318 while ((c = *str++) != ' ') {
1319 if (c < '0' || c > '7')
1320 return NULL;
1321 mode = (mode << 3) + (c - '0');
1322 }
1323 *modep = mode;
1324 return str;
1325}
1326
1327static void load_tree(struct tree_entry *root)
1328{
Felipe Contreras4b25d092009-05-01 09:06:36[diff] [blame]1329 unsigned char *sha1 = root->versions[1].sha1;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1330 struct object_entry *myoe;
1331 struct tree_content *t;
1332 unsigned long size;
1333 char *buf;
1334 const char *c;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1335
1336 root->tree = t = new_tree_content(8);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1337 if (is_null_sha1(sha1))
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1338 return;
1339
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1340 myoe = find_object(sha1);
Simon Hausmann20f546a2007-05-23 21:01:49[diff] [blame]1341 if (myoe && myoe->pack_id != MAX_PACK_ID) {
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]1342 if (myoe->type != OBJ_TREE)
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1343 die("Not a tree: %s", sha1_to_hex(sha1));
Shawn O. Pearce436e7a72007-11-14 04:48:42[diff] [blame]1344 t->delta_depth = myoe->depth;
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]1345 buf = gfi_unpack_entry(myoe, &size);
Shawn O. Pearcee8b32e02008-02-14 06:34:34[diff] [blame]1346 if (!buf)
1347 die("Can't load tree %s", sha1_to_hex(sha1));
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1348 } else {
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]1349 enum object_type type;
1350 buf = read_sha1_file(sha1, &type, &size);
1351 if (!buf || type != OBJ_TREE)
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1352 die("Can't load tree %s", sha1_to_hex(sha1));
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1353 }
1354
1355 c = buf;
1356 while (c != (buf + size)) {
1357 struct tree_entry *e = new_tree_entry();
1358
1359 if (t->entry_count == t->entry_capacity)
Jeff Kingf022f852007-03-11 02:39:17[diff] [blame]1360 root->tree = t = grow_tree_content(t, t->entry_count);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1361 t->entries[t->entry_count++] = e;
1362
1363 e->tree = NULL;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1364 c = get_mode(c, &e->versions[1].mode);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1365 if (!c)
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1366 die("Corrupt mode in %s", sha1_to_hex(sha1));
1367 e->versions[0].mode = e->versions[1].mode;
Shawn O. Pearce061e35c2007-03-12 19:48:37[diff] [blame]1368 e->name = to_atom(c, strlen(c));
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1369 c += e->name->str_len + 1;
Felipe Contreras4b25d092009-05-01 09:06:36[diff] [blame]1370 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1371 hashcpy(e->versions[1].sha1, (unsigned char *)c);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1372 c += 20;
1373 }
1374 free(buf);
1375}
1376
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1377static int tecmp0 (const void *_a, const void *_b)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1378{
1379 struct tree_entry *a = *((struct tree_entry**)_a);
1380 struct tree_entry *b = *((struct tree_entry**)_b);
1381 return base_name_compare(
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1382 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1383 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1384}
1385
1386static int tecmp1 (const void *_a, const void *_b)
1387{
1388 struct tree_entry *a = *((struct tree_entry**)_a);
1389 struct tree_entry *b = *((struct tree_entry**)_b);
1390 return base_name_compare(
1391 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1392 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1393}
1394
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1395static void mktree(struct tree_content *t, int v, struct strbuf *b)
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1396{
1397 size_t maxlen = 0;
1398 unsigned int i;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1399
1400 if (!v)
1401 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1402 else
1403 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1404
1405 for (i = 0; i < t->entry_count; i++) {
1406 if (t->entries[i]->versions[v].mode)
1407 maxlen += t->entries[i]->name->str_len + 34;
1408 }
1409
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1410 strbuf_reset(b);
1411 strbuf_grow(b, maxlen);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1412 for (i = 0; i < t->entry_count; i++) {
1413 struct tree_entry *e = t->entries[i];
1414 if (!e->versions[v].mode)
1415 continue;
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]1416 strbuf_addf(b, "%o %s%c",
1417 (unsigned int)(e->versions[v].mode & ~NO_DELTA),
1418 e->name->str_dat, '\0');
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1419 strbuf_add(b, e->versions[v].sha1, 20);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1420 }
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1421}
1422
1423static void store_tree(struct tree_entry *root)
1424{
Maxim Bublis2668d692014-08-29 11:53:37[diff] [blame]1425 struct tree_content *t;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1426 unsigned int i, j, del;
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1427 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]1428 struct object_entry *le = NULL;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1429
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1430 if (!is_null_sha1(root->versions[1].sha1))
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1431 return;
1432
Maxim Bublis2668d692014-08-29 11:53:37[diff] [blame]1433 if (!root->tree)
1434 load_tree(root);
1435 t = root->tree;
1436
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1437 for (i = 0; i < t->entry_count; i++) {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1438 if (t->entries[i]->tree)
1439 store_tree(t->entries[i]);
1440 }
1441
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]1442 if (!(root->versions[0].mode & NO_DELTA))
1443 le = find_object(root->versions[0].sha1);
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1444 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1445 mktree(t, 0, &old_tree);
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]1446 lo.data = old_tree;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1447 lo.offset = le->idx.offset;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1448 lo.depth = t->delta_depth;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1449 }
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1450
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1451 mktree(t, 1, &new_tree);
1452 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1453
1454 t->delta_depth = lo.depth;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1455 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1456 struct tree_entry *e = t->entries[i];
1457 if (e->versions[1].mode) {
1458 e->versions[0].mode = e->versions[1].mode;
1459 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1460 t->entries[j++] = e;
1461 } else {
1462 release_tree_entry(e);
1463 del++;
1464 }
1465 }
1466 t->entry_count -= del;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1467}
1468
Jonathan Nieder34215782010-10-18 01:08:53[diff] [blame]1469static void tree_content_replace(
1470 struct tree_entry *root,
1471 const unsigned char *sha1,
1472 const uint16_t mode,
1473 struct tree_content *newtree)
1474{
1475 if (!S_ISDIR(mode))
1476 die("Root cannot be a non-directory");
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]1477 hashclr(root->versions[0].sha1);
Jonathan Nieder34215782010-10-18 01:08:53[diff] [blame]1478 hashcpy(root->versions[1].sha1, sha1);
1479 if (root->tree)
1480 release_tree_content_recursive(root->tree);
1481 root->tree = newtree;
1482}
1483
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1484static int tree_content_set(
1485 struct tree_entry *root,
1486 const char *p,
1487 const unsigned char *sha1,
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1488 const uint16_t mode,
1489 struct tree_content *subtree)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1490{
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1491 struct tree_content *t;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1492 const char *slash1;
1493 unsigned int i, n;
1494 struct tree_entry *e;
1495
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1496 slash1 = strchrnul(p, '/');
1497 n = slash1 - p;
Shawn O. Pearce475d1b32007-04-29 00:01:27[diff] [blame]1498 if (!n)
1499 die("Empty path component found in input");
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1500 if (!*slash1 && !S_ISDIR(mode) && subtree)
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1501 die("Non-directories cannot have subtrees");
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1502
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1503 if (!root->tree)
1504 load_tree(root);
1505 t = root->tree;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1506 for (i = 0; i < t->entry_count; i++) {
1507 e = t->entries[i];
Joshua Jensen50906e02010-10-03 09:56:46[diff] [blame]1508 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1509 if (!*slash1) {
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1510 if (!S_ISDIR(mode)
1511 && e->versions[1].mode == mode
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1512 && !hashcmp(e->versions[1].sha1, sha1))
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1513 return 0;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1514 e->versions[1].mode = mode;
1515 hashcpy(e->versions[1].sha1, sha1);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1516 if (e->tree)
Shawn O. Pearceafde8dd2006-08-23 05:33:47[diff] [blame]1517 release_tree_content_recursive(e->tree);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1518 e->tree = subtree;
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]1519
1520 /*
1521 * We need to leave e->versions[0].sha1 alone
1522 * to avoid modifying the preimage tree used
1523 * when writing out the parent directory.
1524 * But after replacing the subdir with a
1525 * completely different one, it's not a good
1526 * delta base any more, and besides, we've
1527 * thrown away the tree entries needed to
1528 * make a delta against it.
1529 *
1530 * So let's just explicitly disable deltas
1531 * for the subtree.
1532 */
1533 if (S_ISDIR(e->versions[0].mode))
1534 e->versions[0].mode |= NO_DELTA;
1535
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1536 hashclr(root->versions[1].sha1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1537 return 1;
1538 }
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1539 if (!S_ISDIR(e->versions[1].mode)) {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1540 e->tree = new_tree_content(8);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1541 e->versions[1].mode = S_IFDIR;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1542 }
1543 if (!e->tree)
1544 load_tree(e);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1545 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1546 hashclr(root->versions[1].sha1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1547 return 1;
1548 }
1549 return 0;
1550 }
1551 }
1552
1553 if (t->entry_count == t->entry_capacity)
Jeff Kingf022f852007-03-11 02:39:17[diff] [blame]1554 root->tree = t = grow_tree_content(t, t->entry_count);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1555 e = new_tree_entry();
Shawn O. Pearce061e35c2007-03-12 19:48:37[diff] [blame]1556 e->name = to_atom(p, n);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1557 e->versions[0].mode = 0;
1558 hashclr(e->versions[0].sha1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1559 t->entries[t->entry_count++] = e;
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1560 if (*slash1) {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1561 e->tree = new_tree_content(8);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1562 e->versions[1].mode = S_IFDIR;
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1563 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1564 } else {
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1565 e->tree = subtree;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1566 e->versions[1].mode = mode;
1567 hashcpy(e->versions[1].sha1, sha1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1568 }
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1569 hashclr(root->versions[1].sha1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1570 return 1;
1571}
1572
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1573static int tree_content_remove(
1574 struct tree_entry *root,
1575 const char *p,
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]1576 struct tree_entry *backup_leaf,
1577 int allow_root)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1578{
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1579 struct tree_content *t;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1580 const char *slash1;
1581 unsigned int i, n;
1582 struct tree_entry *e;
1583
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1584 slash1 = strchrnul(p, '/');
1585 n = slash1 - p;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1586
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1587 if (!root->tree)
1588 load_tree(root);
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]1589
1590 if (!*p && allow_root) {
1591 e = root;
1592 goto del_entry;
1593 }
1594
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1595 t = root->tree;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1596 for (i = 0; i < t->entry_count; i++) {
1597 e = t->entries[i];
Joshua Jensen50906e02010-10-03 09:56:46[diff] [blame]1598 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1599 if (*slash1 && !S_ISDIR(e->versions[1].mode))
Elijah Newren253fb5f2010-07-09 13:10:56[diff] [blame]1600 /*
1601 * If p names a file in some subdirectory, and a
1602 * file or symlink matching the name of the
1603 * parent directory of p exists, then p cannot
1604 * exist and need not be deleted.
1605 */
1606 return 1;
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1607 if (!*slash1 || !S_ISDIR(e->versions[1].mode))
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1608 goto del_entry;
1609 if (!e->tree)
1610 load_tree(e);
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]1611 if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) {
Shawn O. Pearceb54d6422006-08-29 01:43:04[diff] [blame]1612 for (n = 0; n < e->tree->entry_count; n++) {
1613 if (e->tree->entries[n]->versions[1].mode) {
1614 hashclr(root->versions[1].sha1);
1615 return 1;
1616 }
1617 }
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1618 backup_leaf = NULL;
Shawn O. Pearceb54d6422006-08-29 01:43:04[diff] [blame]1619 goto del_entry;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1620 }
1621 return 0;
1622 }
1623 }
1624 return 0;
1625
1626del_entry:
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1627 if (backup_leaf)
1628 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1629 else if (e->tree)
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1630 release_tree_content_recursive(e->tree);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]1631 e->tree = NULL;
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]1632 e->versions[1].mode = 0;
1633 hashclr(e->versions[1].sha1);
1634 hashclr(root->versions[1].sha1);
Shawn O. Pearceac47a732006-08-08 04:46:13[diff] [blame]1635 return 1;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]1636}
1637
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1638static int tree_content_get(
1639 struct tree_entry *root,
1640 const char *p,
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1641 struct tree_entry *leaf,
1642 int allow_root)
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1643{
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1644 struct tree_content *t;
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1645 const char *slash1;
1646 unsigned int i, n;
1647 struct tree_entry *e;
1648
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1649 slash1 = strchrnul(p, '/');
1650 n = slash1 - p;
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1651 if (!n && !allow_root)
Jonathan Nieder178e1de2012-03-10 04:07:22[diff] [blame]1652 die("Empty path component found in input");
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1653
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1654 if (!root->tree)
1655 load_tree(root);
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1656
1657 if (!n) {
1658 e = root;
1659 goto found_entry;
1660 }
1661
Jonathan Nieder5edde512010-10-18 01:03:38[diff] [blame]1662 t = root->tree;
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1663 for (i = 0; i < t->entry_count; i++) {
1664 e = t->entries[i];
Joshua Jensen50906e02010-10-03 09:56:46[diff] [blame]1665 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
Rohit Mani2c5495f2014-03-08 06:48:31[diff] [blame]1666 if (!*slash1)
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1667 goto found_entry;
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1668 if (!S_ISDIR(e->versions[1].mode))
1669 return 0;
1670 if (!e->tree)
1671 load_tree(e);
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1672 return tree_content_get(e, slash1 + 1, leaf, 0);
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1673 }
1674 }
1675 return 0;
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]1676
1677found_entry:
1678 memcpy(leaf, e, sizeof(*leaf));
1679 if (e->tree && is_null_sha1(e->versions[1].sha1))
1680 leaf->tree = dup_tree_content(e->tree);
1681 else
1682 leaf->tree = NULL;
1683 return 1;
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]1684}
1685
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1686static int update_branch(struct branch *b)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1687{
1688 static const char *msg = "fast-import";
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1689 struct ref_lock *lock;
1690 unsigned char old_sha1[20];
1691
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1692 if (read_ref(b->name, old_sha1))
1693 hashclr(old_sha1);
Felipe Contreras4ee1b222014-04-20 18:59:27[diff] [blame]1694 if (is_null_sha1(b->sha1)) {
1695 if (b->delete)
1696 delete_ref(b->name, old_sha1, 0);
1697 return 0;
1698 }
Brad King9bbb0fa2013-08-30 18:12:00[diff] [blame]1699 lock = lock_any_ref_for_update(b->name, old_sha1, 0, NULL);
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1700 if (!lock)
1701 return error("Unable to lock %s", b->name);
1702 if (!force_update && !is_null_sha1(old_sha1)) {
1703 struct commit *old_cmit, *new_cmit;
1704
1705 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1706 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1707 if (!old_cmit || !new_cmit) {
1708 unlock_ref(lock);
1709 return error("Branch %s is missing commits.", b->name);
1710 }
1711
Junio C Hamanoa20efee2012-08-27 21:46:01[diff] [blame]1712 if (!in_merge_bases(old_cmit, new_cmit)) {
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1713 unlock_ref(lock);
Theodore Ts'o46efd2d2007-03-30 23:07:05[diff] [blame]1714 warning("Not updating %s"
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1715 " (new tip %s does not contain %s)",
1716 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1717 return -1;
1718 }
1719 }
1720 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1721 return error("Unable to update %s", b->name);
1722 return 0;
1723}
1724
1725static void dump_branches(void)
1726{
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1727 unsigned int i;
1728 struct branch *b;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1729
1730 for (i = 0; i < branch_table_sz; i++) {
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]1731 for (b = branch_table[i]; b; b = b->table_next_branch)
1732 failure |= update_branch(b);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]1733 }
1734}
1735
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]1736static void dump_tags(void)
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]1737{
1738 static const char *msg = "fast-import";
1739 struct tag *t;
1740 struct ref_lock *lock;
Jeff Kingc2527852014-08-23 05:32:37[diff] [blame]1741 struct strbuf ref_name = STRBUF_INIT;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]1742
1743 for (t = first_tag; t; t = t->next_tag) {
Jeff Kingc2527852014-08-23 05:32:37[diff] [blame]1744 strbuf_reset(&ref_name);
1745 strbuf_addf(&ref_name, "tags/%s", t->name);
1746 lock = lock_ref_sha1(ref_name.buf, NULL);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]1747 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
Jeff Kingc2527852014-08-23 05:32:37[diff] [blame]1748 failure |= error("Unable to update %s", ref_name.buf);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]1749 }
Jeff Kingc2527852014-08-23 05:32:37[diff] [blame]1750 strbuf_release(&ref_name);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]1751}
1752
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1753static void dump_marks_helper(FILE *f,
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]1754 uintmax_t base,
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1755 struct mark_set *m)
1756{
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]1757 uintmax_t k;
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1758 if (m->shift) {
1759 for (k = 0; k < 1024; k++) {
1760 if (m->data.sets[k])
Raja R Harinath7e7db5e2010-07-13 11:51:48[diff] [blame]1761 dump_marks_helper(f, base + (k << m->shift),
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1762 m->data.sets[k]);
1763 }
1764 } else {
1765 for (k = 0; k < 1024; k++) {
1766 if (m->data.marked[k])
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]1767 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1768 sha1_to_hex(m->data.marked[k]->idx.sha1));
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1769 }
1770 }
1771}
1772
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]1773static void dump_marks(void)
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1774{
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1775 static struct lock_file mark_lock;
1776 int mark_fd;
1777 FILE *f;
1778
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1779 if (!export_marks_file)
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1780 return;
1781
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1782 mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1783 if (mark_fd < 0) {
1784 failure |= error("Unable to write marks file %s: %s",
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1785 export_marks_file, strerror(errno));
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1786 return;
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1787 }
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1788
1789 f = fdopen(mark_fd, "w");
1790 if (!f) {
Jim Meyering5a7b1b52008-01-18 18:35:49[diff] [blame]1791 int saved_errno = errno;
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1792 rollback_lock_file(&mark_lock);
1793 failure |= error("Unable to write marks file %s: %s",
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1794 export_marks_file, strerror(saved_errno));
Shawn O. Pearce60b90042007-03-07 23:05:38[diff] [blame]1795 return;
1796 }
1797
Brandon Casey4ed7cd32008-01-16 19:12:46[diff] [blame]1798 /*
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1799 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1800 * Assign -1 to the lock file descriptor so that commit_lock_file()
Brandon Casey4ed7cd32008-01-16 19:12:46[diff] [blame]1801 * won't try to close() it.
1802 */
1803 mark_lock.fd = -1;
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1804
1805 dump_marks_helper(f, 0, marks);
1806 if (ferror(f) || fclose(f)) {
Jim Meyering5a7b1b52008-01-18 18:35:49[diff] [blame]1807 int saved_errno = errno;
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1808 rollback_lock_file(&mark_lock);
1809 failure |= error("Unable to write marks file %s: %s",
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1810 export_marks_file, strerror(saved_errno));
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1811 return;
1812 }
1813
1814 if (commit_lock_file(&mark_lock)) {
Jim Meyering5a7b1b52008-01-18 18:35:49[diff] [blame]1815 int saved_errno = errno;
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1816 rollback_lock_file(&mark_lock);
1817 failure |= error("Unable to commit marks file %s: %s",
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1818 export_marks_file, strerror(saved_errno));
Brandon Caseyfb54abd2008-01-17 16:58:34[diff] [blame]1819 return;
1820 }
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]1821}
1822
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1823static void read_marks(void)
1824{
1825 char line[512];
1826 FILE *f = fopen(import_marks_file, "r");
Ramkumar Ramachandradded4f12011-01-15 06:31:46[diff] [blame]1827 if (f)
1828 ;
1829 else if (import_marks_file_ignore_missing && errno == ENOENT)
1830 return; /* Marks file does not exist */
1831 else
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1832 die_errno("cannot read '%s'", import_marks_file);
1833 while (fgets(line, sizeof(line), f)) {
1834 uintmax_t mark;
1835 char *end;
1836 unsigned char sha1[20];
1837 struct object_entry *e;
1838
1839 end = strchr(line, '\n');
1840 if (line[0] != ':' || !end)
1841 die("corrupt mark line: %s", line);
1842 *end = 0;
1843 mark = strtoumax(line + 1, &end, 10);
1844 if (!mark || end == line + 1
Felipe Contreras45c5d4a2013-05-05 22:38:52[diff] [blame]1845 || *end != ' ' || get_sha1_hex(end + 1, sha1))
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1846 die("corrupt mark line: %s", line);
1847 e = find_object(sha1);
1848 if (!e) {
1849 enum object_type type = sha1_object_info(sha1, NULL);
1850 if (type < 0)
1851 die("object not found: %s", sha1_to_hex(sha1));
1852 e = insert_object(sha1);
1853 e->type = type;
1854 e->pack_id = MAX_PACK_ID;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]1855 e->idx.offset = 1; /* just not zero! */
Sverre Rabbelier07cd9322009-12-04 17:06:55[diff] [blame]1856 }
1857 insert_mark(mark, e);
1858 }
1859 fclose(f);
1860}
1861
1862
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]1863static int read_next_command(void)
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1864{
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]1865 static int stdin_eof = 0;
1866
1867 if (stdin_eof) {
1868 unread_command_buf = 0;
1869 return EOF;
1870 }
1871
Jonathan Nieder777f80d2010-11-28 19:45:58[diff] [blame]1872 for (;;) {
Jeff King97313be2014-06-18 19:49:12[diff] [blame]1873 const char *p;
1874
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]1875 if (unread_command_buf) {
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]1876 unread_command_buf = 0;
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]1877 } else {
1878 struct recent_command *rc;
1879
Pierre Habouzitb315c5c2007-09-27 10:58:23[diff] [blame]1880 strbuf_detach(&command_buf, NULL);
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]1881 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1882 if (stdin_eof)
1883 return EOF;
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]1884
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]1885 if (!seen_data_command
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1886 && !starts_with(command_buf.buf, "feature ")
1887 && !starts_with(command_buf.buf, "option ")) {
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]1888 parse_argv();
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]1889 }
1890
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]1891 rc = rc_free;
1892 if (rc)
1893 rc_free = rc->next;
1894 else {
1895 rc = cmd_hist.next;
1896 cmd_hist.next = rc->next;
1897 cmd_hist.next->prev = &cmd_hist;
1898 free(rc->buf);
1899 }
1900
1901 rc->buf = command_buf.buf;
1902 rc->prev = cmd_tail;
1903 rc->next = cmd_hist.prev;
1904 rc->prev->next = rc;
1905 cmd_tail = rc;
1906 }
Jeff King97313be2014-06-18 19:49:12[diff] [blame]1907 if (skip_prefix(command_buf.buf, "cat-blob ", &p)) {
1908 parse_cat_blob(p);
Jonathan Nieder777f80d2010-11-28 19:45:58[diff] [blame]1909 continue;
1910 }
1911 if (command_buf.buf[0] == '#')
1912 continue;
1913 return 0;
1914 }
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1915}
1916
Junio C Hamano7e5dcea2007-08-19 09:50:18[diff] [blame]1917static void skip_optional_lf(void)
Shawn O. Pearce2c570cd2007-08-01 04:24:25[diff] [blame]1918{
1919 int term_char = fgetc(stdin);
1920 if (term_char != '\n' && term_char != EOF)
1921 ungetc(term_char, stdin);
1922}
1923
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]1924static void parse_mark(void)
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1925{
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]1926 const char *v;
1927 if (skip_prefix(command_buf.buf, "mark :", &v)) {
1928 next_mark = strtoumax(v, NULL, 10);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1929 read_next_command();
1930 }
1931 else
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]1932 next_mark = 0;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1933}
1934
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1935static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1936{
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]1937 const char *data;
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1938 strbuf_reset(sb);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1939
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]1940 if (!skip_prefix(command_buf.buf, "data ", &data))
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1941 die("Expected 'data n' command, found: %s", command_buf.buf);
1942
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]1943 if (skip_prefix(data, "<<", &data)) {
1944 char *term = xstrdup(data);
1945 size_t term_len = command_buf.len - (data - command_buf.buf);
Pierre Habouzit4a241d72007-09-06 11:20:07[diff] [blame]1946
Pierre Habouzitc2e6b6d2007-10-26 07:59:12[diff] [blame]1947 strbuf_detach(&command_buf, NULL);
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1948 for (;;) {
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]1949 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1950 die("EOF in data (terminator '%s' not found)", term);
1951 if (term_len == command_buf.len
1952 && !strcmp(term, command_buf.buf))
1953 break;
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1954 strbuf_addbuf(sb, &command_buf);
1955 strbuf_addch(sb, '\n');
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1956 }
1957 free(term);
1958 }
1959 else {
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]1960 uintmax_t len = strtoumax(data, NULL, 10);
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1961 size_t n = 0, length = (size_t)len;
Pierre Habouzit4a241d72007-09-06 11:20:07[diff] [blame]1962
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1963 if (limit && limit < len) {
1964 *len_res = len;
1965 return 0;
1966 }
1967 if (length < len)
1968 die("data is too large to use in this context");
Pierre Habouzit4a241d72007-09-06 11:20:07[diff] [blame]1969
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1970 while (n < length) {
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]1971 size_t s = strbuf_fread(sb, length - n, stdin);
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1972 if (!s && feof(stdin))
Johannes Schindelin40db58b2007-02-07 11:38:21[diff] [blame]1973 die("EOF in data (%lu bytes remaining)",
1974 (unsigned long)(length - n));
Shawn O. Pearce3b4dce02007-01-18 18:14:27[diff] [blame]1975 n += s;
1976 }
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1977 }
1978
Shawn O. Pearce2c570cd2007-08-01 04:24:25[diff] [blame]1979 skip_optional_lf();
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]1980 return 1;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]1981}
1982
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]1983static int validate_raw_date(const char *src, char *result, int maxlen)
1984{
1985 const char *orig_src = src;
Benjamin Kramereb3a9dd2009-03-07 20:02:10[diff] [blame]1986 char *endp;
Junio C Hamano1cd749c2009-09-29 06:40:09[diff] [blame]1987 unsigned long num;
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]1988
René Scharfec55fae42008-12-21 01:28:48[diff] [blame]1989 errno = 0;
1990
Junio C Hamano1cd749c2009-09-29 06:40:09[diff] [blame]1991 num = strtoul(src, &endp, 10);
1992 /* NEEDSWORK: perhaps check for reasonable values? */
René Scharfec55fae42008-12-21 01:28:48[diff] [blame]1993 if (errno || endp == src || *endp != ' ')
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]1994 return -1;
1995
1996 src = endp + 1;
1997 if (*src != '-' && *src != '+')
1998 return -1;
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]1999
Junio C Hamano1cd749c2009-09-29 06:40:09[diff] [blame]2000 num = strtoul(src + 1, &endp, 10);
2001 if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
2002 1400 < num)
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2003 return -1;
2004
2005 strcpy(result, orig_src);
2006 return 0;
2007}
2008
2009static char *parse_ident(const char *buf)
2010{
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2011 const char *ltgt;
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2012 size_t name_len;
2013 char *ident;
2014
Dmitry Ivankov17fb0072011-08-11 10:21:07[diff] [blame]2015 /* ensure there is a space delimiter even if there is no name */
2016 if (*buf == '<')
2017 --buf;
2018
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2019 ltgt = buf + strcspn(buf, "<>");
2020 if (*ltgt != '<')
2021 die("Missing < in ident string: %s", buf);
2022 if (ltgt != buf && ltgt[-1] != ' ')
2023 die("Missing space before < in ident string: %s", buf);
2024 ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>");
2025 if (*ltgt != '>')
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2026 die("Missing > in ident string: %s", buf);
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2027 ltgt++;
2028 if (*ltgt != ' ')
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2029 die("Missing space after > in ident string: %s", buf);
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2030 ltgt++;
2031 name_len = ltgt - buf;
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2032 ident = xmalloc(name_len + 24);
2033 strncpy(ident, buf, name_len);
2034
2035 switch (whenspec) {
2036 case WHENSPEC_RAW:
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2037 if (validate_raw_date(ltgt, ident + name_len, 24) < 0)
2038 die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2039 break;
2040 case WHENSPEC_RFC2822:
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2041 if (parse_date(ltgt, ident + name_len, 24) < 0)
2042 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf);
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2043 break;
2044 case WHENSPEC_NOW:
Dmitry Ivankov4b4963c2011-08-11 10:21:08[diff] [blame]2045 if (strcmp("now", ltgt))
Shawn O. Pearce63e0c8b2007-02-06 19:58:30[diff] [blame]2046 die("Date in ident must be 'now': %s", buf);
2047 datestamp(ident + name_len, 24);
2048 break;
2049 }
2050
2051 return ident;
2052}
2053
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2054static void parse_and_store_blob(
2055 struct last_object *last,
2056 unsigned char *sha1out,
2057 uintmax_t mark)
Shawn O. Pearce6143f062006-08-08 05:14:21[diff] [blame]2058{
Pierre Habouzit05576562007-09-17 12:00:38[diff] [blame]2059 static struct strbuf buf = STRBUF_INIT;
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2060 uintmax_t len;
Shawn O. Pearce6143f062006-08-08 05:14:21[diff] [blame]2061
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2062 if (parse_data(&buf, big_file_threshold, &len))
2063 store_object(OBJ_BLOB, &buf, last, sha1out, mark);
2064 else {
2065 if (last) {
2066 strbuf_release(&last->data);
2067 last->offset = 0;
2068 last->depth = 0;
2069 }
2070 stream_blob(len, sha1out, mark);
2071 skip_optional_lf();
2072 }
2073}
2074
2075static void parse_new_blob(void)
2076{
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2077 read_next_command();
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2078 parse_mark();
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2079 parse_and_store_blob(&last_blob, NULL, next_mark);
Shawn O. Pearce6143f062006-08-08 05:14:21[diff] [blame]2080}
2081
Shawn O. Pearcefd992242007-01-17 06:47:25[diff] [blame]2082static void unload_one_branch(void)
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2083{
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]2084 while (cur_active_branches
2085 && cur_active_branches >= max_active_branches) {
Shawn O. Pearce6777a592007-03-07 01:44:34[diff] [blame]2086 uintmax_t min_commit = ULONG_MAX;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2087 struct branch *e, *l = NULL, *p = NULL;
2088
2089 for (e = active_branches; e; e = e->active_next_branch) {
2090 if (e->last_commit < min_commit) {
2091 p = l;
2092 min_commit = e->last_commit;
2093 }
2094 l = e;
2095 }
2096
2097 if (p) {
2098 e = p->active_next_branch;
2099 p->active_next_branch = e->active_next_branch;
2100 } else {
2101 e = active_branches;
2102 active_branches = e->active_next_branch;
2103 }
Shawn O. Pearce734c91f2007-03-05 17:31:09[diff] [blame]2104 e->active = 0;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2105 e->active_next_branch = NULL;
2106 if (e->branch_tree.tree) {
Shawn O. Pearceafde8dd2006-08-23 05:33:47[diff] [blame]2107 release_tree_content_recursive(e->branch_tree.tree);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2108 e->branch_tree.tree = NULL;
2109 }
2110 cur_active_branches--;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2111 }
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2112}
2113
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2114static void load_branch(struct branch *b)
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2115{
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2116 load_tree(&b->branch_tree);
Shawn O. Pearce734c91f2007-03-05 17:31:09[diff] [blame]2117 if (!b->active) {
2118 b->active = 1;
2119 b->active_next_branch = active_branches;
2120 active_branches = b;
2121 cur_active_branches++;
2122 branch_load_count++;
2123 }
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2124}
2125
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2126static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2127{
2128 unsigned char fanout = 0;
2129 while ((num_notes >>= 8))
2130 fanout++;
2131 return fanout;
2132}
2133
2134static void construct_path_with_fanout(const char *hex_sha1,
2135 unsigned char fanout, char *path)
2136{
2137 unsigned int i = 0, j = 0;
2138 if (fanout >= 20)
2139 die("Too large fanout (%u)", fanout);
2140 while (fanout) {
2141 path[i++] = hex_sha1[j++];
2142 path[i++] = hex_sha1[j++];
2143 path[i++] = '/';
2144 fanout--;
2145 }
2146 memcpy(path + i, hex_sha1 + j, 40 - j);
2147 path[i + 40 - j] = '\0';
2148}
2149
2150static uintmax_t do_change_note_fanout(
2151 struct tree_entry *orig_root, struct tree_entry *root,
2152 char *hex_sha1, unsigned int hex_sha1_len,
2153 char *fullpath, unsigned int fullpath_len,
2154 unsigned char fanout)
2155{
2156 struct tree_content *t = root->tree;
2157 struct tree_entry *e, leaf;
2158 unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2159 uintmax_t num_notes = 0;
2160 unsigned char sha1[20];
2161 char realpath[60];
2162
2163 for (i = 0; t && i < t->entry_count; i++) {
2164 e = t->entries[i];
2165 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2166 tmp_fullpath_len = fullpath_len;
2167
2168 /*
2169 * We're interested in EITHER existing note entries (entries
2170 * with exactly 40 hex chars in path, not including directory
2171 * separators), OR directory entries that may contain note
2172 * entries (with < 40 hex chars in path).
2173 * Also, each path component in a note entry must be a multiple
2174 * of 2 chars.
2175 */
2176 if (!e->versions[1].mode ||
2177 tmp_hex_sha1_len > 40 ||
2178 e->name->str_len % 2)
2179 continue;
2180
2181 /* This _may_ be a note entry, or a subdir containing notes */
2182 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2183 e->name->str_len);
2184 if (tmp_fullpath_len)
2185 fullpath[tmp_fullpath_len++] = '/';
2186 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2187 e->name->str_len);
2188 tmp_fullpath_len += e->name->str_len;
2189 fullpath[tmp_fullpath_len] = '\0';
2190
2191 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2192 /* This is a note entry */
Johan Herland18386852011-11-25 00:09:47[diff] [blame]2193 if (fanout == 0xff) {
2194 /* Counting mode, no rename */
2195 num_notes++;
2196 continue;
2197 }
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2198 construct_path_with_fanout(hex_sha1, fanout, realpath);
2199 if (!strcmp(fullpath, realpath)) {
2200 /* Note entry is in correct location */
2201 num_notes++;
2202 continue;
2203 }
2204
2205 /* Rename fullpath to realpath */
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]2206 if (!tree_content_remove(orig_root, fullpath, &leaf, 0))
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2207 die("Failed to remove path %s", fullpath);
2208 tree_content_set(orig_root, realpath,
2209 leaf.versions[1].sha1,
2210 leaf.versions[1].mode,
2211 leaf.tree);
2212 } else if (S_ISDIR(e->versions[1].mode)) {
2213 /* This is a subdir that may contain note entries */
2214 if (!e->tree)
2215 load_tree(e);
2216 num_notes += do_change_note_fanout(orig_root, e,
2217 hex_sha1, tmp_hex_sha1_len,
2218 fullpath, tmp_fullpath_len, fanout);
2219 }
2220
2221 /* The above may have reallocated the current tree_content */
2222 t = root->tree;
2223 }
2224 return num_notes;
2225}
2226
2227static uintmax_t change_note_fanout(struct tree_entry *root,
2228 unsigned char fanout)
2229{
2230 char hex_sha1[40], path[60];
2231 return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2232}
2233
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2234/*
2235 * Given a pointer into a string, parse a mark reference:
2236 *
2237 * idnum ::= ':' bigint;
2238 *
2239 * Return the first character after the value in *endptr.
2240 *
2241 * Complain if the following character is not what is expected,
2242 * either a space or end of the string.
2243 */
2244static uintmax_t parse_mark_ref(const char *p, char **endptr)
2245{
2246 uintmax_t mark;
2247
2248 assert(*p == ':');
2249 p++;
2250 mark = strtoumax(p, endptr, 10);
2251 if (*endptr == p)
2252 die("No value after ':' in mark: %s", command_buf.buf);
2253 return mark;
2254}
2255
2256/*
2257 * Parse the mark reference, and complain if this is not the end of
2258 * the string.
2259 */
2260static uintmax_t parse_mark_ref_eol(const char *p)
2261{
2262 char *end;
2263 uintmax_t mark;
2264
2265 mark = parse_mark_ref(p, &end);
2266 if (*end != '\0')
2267 die("Garbage after mark: %s", command_buf.buf);
2268 return mark;
2269}
2270
2271/*
2272 * Parse the mark reference, demanding a trailing space. Return a
2273 * pointer to the space.
2274 */
2275static uintmax_t parse_mark_ref_space(const char **p)
2276{
2277 uintmax_t mark;
2278 char *end;
2279
2280 mark = parse_mark_ref(*p, &end);
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]2281 if (*end++ != ' ')
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2282 die("Missing space after mark: %s", command_buf.buf);
2283 *p = end;
2284 return mark;
2285}
2286
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2287static void file_change_m(const char *p, struct branch *b)
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2288{
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2289 static struct strbuf uq = STRBUF_INIT;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2290 const char *endp;
Jeff King3aa99df2013-03-21 15:44:39[diff] [blame]2291 struct object_entry *oe;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2292 unsigned char sha1[20];
Shawn O. Pearce10831c52007-02-05 21:34:56[diff] [blame]2293 uint16_t mode, inline_data = 0;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2294
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2295 p = get_mode(p, &mode);
2296 if (!p)
2297 die("Corrupt mode: %s", command_buf.buf);
2298 switch (mode) {
Felipe Contreras3d1d81e2009-01-14 01:37:07[diff] [blame]2299 case 0644:
2300 case 0755:
2301 mode |= S_IFREG;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2302 case S_IFREG | 0644:
2303 case S_IFREG | 0755:
Shawn O. Pearceace4a9d2006-08-21 07:29:13[diff] [blame]2304 case S_IFLNK:
Jonathan Nieder334fba62010-07-01 03:18:19[diff] [blame]2305 case S_IFDIR:
Alexander Gavrilov03db4522008-07-19 12:21:24[diff] [blame]2306 case S_IFGITLINK:
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2307 /* ok */
2308 break;
2309 default:
2310 die("Corrupt mode: %s", command_buf.buf);
2311 }
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2312
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]2313 if (*p == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2314 oe = find_mark(parse_mark_ref_space(&p));
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2315 hashcpy(sha1, oe->idx.sha1);
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]2316 } else if (skip_prefix(p, "inline ", &p)) {
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]2317 inline_data = 1;
Jeff King3aa99df2013-03-21 15:44:39[diff] [blame]2318 oe = NULL; /* not used with inline_data, but makes gcc happy */
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]2319 } else {
2320 if (get_sha1_hex(p, sha1))
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2321 die("Invalid dataref: %s", command_buf.buf);
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]2322 oe = find_object(sha1);
2323 p += 40;
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]2324 if (*p++ != ' ')
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2325 die("Missing space after SHA1: %s", command_buf.buf);
Shawn O. Pearced8397162006-08-23 08:17:45[diff] [blame]2326 }
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2327
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2328 strbuf_reset(&uq);
2329 if (!unquote_c_style(&uq, p, &endp)) {
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2330 if (*endp)
2331 die("Garbage after path in: %s", command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2332 p = uq.buf;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2333 }
2334
Jonathan Nieder8fe533f2011-01-27 06:07:49[diff] [blame]2335 /* Git does not track empty, non-toplevel directories. */
René Scharfe14576df2014-07-18 16:00:51[diff] [blame]2336 if (S_ISDIR(mode) && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN) && *p) {
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]2337 tree_content_remove(&b->branch_tree, p, NULL, 0);
Jonathan Nieder8fe533f2011-01-27 06:07:49[diff] [blame]2338 return;
2339 }
2340
Alexander Gavrilov03db4522008-07-19 12:21:24[diff] [blame]2341 if (S_ISGITLINK(mode)) {
2342 if (inline_data)
2343 die("Git links cannot be specified 'inline': %s",
2344 command_buf.buf);
2345 else if (oe) {
2346 if (oe->type != OBJ_COMMIT)
2347 die("Not a commit (actually a %s): %s",
2348 typename(oe->type), command_buf.buf);
2349 }
2350 /*
2351 * Accept the sha1 without checking; it expected to be in
2352 * another repository.
2353 */
2354 } else if (inline_data) {
Jonathan Nieder334fba62010-07-01 03:18:19[diff] [blame]2355 if (S_ISDIR(mode))
2356 die("Directories cannot be specified 'inline': %s",
2357 command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2358 if (p != uq.buf) {
2359 strbuf_addstr(&uq, p);
2360 p = uq.buf;
2361 }
Shawn O. Pearceb715cfb2007-01-18 20:17:58[diff] [blame]2362 read_next_command();
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2363 parse_and_store_blob(&last_blob, sha1, 0);
Shawn O. Pearce7111fee2006-08-14 06:50:18[diff] [blame]2364 } else {
Jonathan Nieder334fba62010-07-01 03:18:19[diff] [blame]2365 enum object_type expected = S_ISDIR(mode) ?
2366 OBJ_TREE: OBJ_BLOB;
2367 enum object_type type = oe ? oe->type :
2368 sha1_object_info(sha1, NULL);
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]2369 if (type < 0)
Jonathan Nieder334fba62010-07-01 03:18:19[diff] [blame]2370 die("%s not found: %s",
2371 S_ISDIR(mode) ? "Tree" : "Blob",
2372 command_buf.buf);
2373 if (type != expected)
2374 die("Not a %s (actually a %s): %s",
2375 typename(expected), typename(type),
2376 command_buf.buf);
Shawn O. Pearce7111fee2006-08-14 06:50:18[diff] [blame]2377 }
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2378
Jonathan Nieder34215782010-10-18 01:08:53[diff] [blame]2379 if (!*p) {
2380 tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2381 return;
2382 }
Felipe Contreras3d1d81e2009-01-14 01:37:07[diff] [blame]2383 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2384}
2385
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2386static void file_change_d(const char *p, struct branch *b)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2387{
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2388 static struct strbuf uq = STRBUF_INIT;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2389 const char *endp;
2390
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2391 strbuf_reset(&uq);
2392 if (!unquote_c_style(&uq, p, &endp)) {
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2393 if (*endp)
2394 die("Garbage after path in: %s", command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2395 p = uq.buf;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2396 }
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]2397 tree_content_remove(&b->branch_tree, p, NULL, 1);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2398}
2399
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2400static void file_change_cr(const char *s, struct branch *b, int rename)
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2401{
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2402 const char *d;
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2403 static struct strbuf s_uq = STRBUF_INIT;
2404 static struct strbuf d_uq = STRBUF_INIT;
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2405 const char *endp;
2406 struct tree_entry leaf;
2407
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2408 strbuf_reset(&s_uq);
2409 if (!unquote_c_style(&s_uq, s, &endp)) {
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2410 if (*endp != ' ')
2411 die("Missing space after source: %s", command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2412 } else {
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2413 endp = strchr(s, ' ');
2414 if (!endp)
2415 die("Missing space after source: %s", command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2416 strbuf_add(&s_uq, s, endp - s);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2417 }
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2418 s = s_uq.buf;
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2419
2420 endp++;
2421 if (!*endp)
2422 die("Missing dest: %s", command_buf.buf);
2423
2424 d = endp;
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2425 strbuf_reset(&d_uq);
2426 if (!unquote_c_style(&d_uq, d, &endp)) {
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2427 if (*endp)
2428 die("Garbage after dest in: %s", command_buf.buf);
Pierre Habouzit7fb10112007-09-19 22:42:14[diff] [blame]2429 d = d_uq.buf;
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2430 }
2431
2432 memset(&leaf, 0, sizeof(leaf));
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]2433 if (rename)
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]2434 tree_content_remove(&b->branch_tree, s, &leaf, 1);
Shawn O. Pearceb6f34812007-07-15 05:40:37[diff] [blame]2435 else
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]2436 tree_content_get(&b->branch_tree, s, &leaf, 1);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2437 if (!leaf.versions[1].mode)
2438 die("Path %s not in branch", s);
Jonathan Nieder34215782010-10-18 01:08:53[diff] [blame]2439 if (!*d) { /* C "path/to/subdir" "" */
2440 tree_content_replace(&b->branch_tree,
2441 leaf.versions[1].sha1,
2442 leaf.versions[1].mode,
2443 leaf.tree);
2444 return;
2445 }
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2446 tree_content_set(&b->branch_tree, d,
2447 leaf.versions[1].sha1,
2448 leaf.versions[1].mode,
2449 leaf.tree);
Shawn O. Pearcef39a9462007-07-10 02:58:23[diff] [blame]2450}
2451
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2452static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout)
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2453{
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2454 static struct strbuf uq = STRBUF_INIT;
Jeff Kingcbfd5e12013-03-21 11:10:28[diff] [blame]2455 struct object_entry *oe;
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2456 struct branch *s;
2457 unsigned char sha1[20], commit_sha1[20];
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2458 char path[60];
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2459 uint16_t inline_data = 0;
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2460 unsigned char new_fanout;
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2461
Johan Herland18386852011-11-25 00:09:47[diff] [blame]2462 /*
2463 * When loading a branch, we don't traverse its tree to count the real
2464 * number of notes (too expensive to do this for all non-note refs).
2465 * This means that recently loaded notes refs might incorrectly have
2466 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2467 *
2468 * Fix this by traversing the tree and counting the number of notes
2469 * when b->num_notes == 0. If the notes tree is truly empty, the
2470 * calculation should not take long.
2471 */
2472 if (b->num_notes == 0 && *old_fanout == 0) {
2473 /* Invoke change_note_fanout() in "counting mode". */
2474 b->num_notes = change_note_fanout(&b->branch_tree, 0xff);
2475 *old_fanout = convert_num_notes_to_fanout(b->num_notes);
2476 }
2477
2478 /* Now parse the notemodify command. */
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2479 /* <dataref> or 'inline' */
2480 if (*p == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2481 oe = find_mark(parse_mark_ref_space(&p));
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2482 hashcpy(sha1, oe->idx.sha1);
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]2483 } else if (skip_prefix(p, "inline ", &p)) {
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2484 inline_data = 1;
Ramsay Jones0a345942013-03-26 19:09:44[diff] [blame]2485 oe = NULL; /* not used with inline_data, but makes gcc happy */
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2486 } else {
2487 if (get_sha1_hex(p, sha1))
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2488 die("Invalid dataref: %s", command_buf.buf);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2489 oe = find_object(sha1);
2490 p += 40;
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]2491 if (*p++ != ' ')
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2492 die("Missing space after SHA1: %s", command_buf.buf);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2493 }
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2494
Richard Hansena8a54062013-09-04 19:04:31[diff] [blame]2495 /* <commit-ish> */
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2496 s = lookup_branch(p);
2497 if (s) {
Dmitry Ivankov0bc69882011-09-22 19:47:05[diff] [blame]2498 if (is_null_sha1(s->sha1))
2499 die("Can't add a note on empty branch.");
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2500 hashcpy(commit_sha1, s->sha1);
2501 } else if (*p == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2502 uintmax_t commit_mark = parse_mark_ref_eol(p);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2503 struct object_entry *commit_oe = find_mark(commit_mark);
2504 if (commit_oe->type != OBJ_COMMIT)
2505 die("Mark :%" PRIuMAX " not a commit", commit_mark);
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2506 hashcpy(commit_sha1, commit_oe->idx.sha1);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2507 } else if (!get_sha1(p, commit_sha1)) {
2508 unsigned long size;
2509 char *buf = read_object_with_reference(commit_sha1,
2510 commit_type, &size, commit_sha1);
2511 if (!buf || size < 46)
2512 die("Not a valid commit: %s", p);
2513 free(buf);
2514 } else
2515 die("Invalid ref name or SHA1 expression: %s", p);
2516
2517 if (inline_data) {
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2518 if (p != uq.buf) {
2519 strbuf_addstr(&uq, p);
2520 p = uq.buf;
2521 }
2522 read_next_command();
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2523 parse_and_store_blob(&last_blob, sha1, 0);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2524 } else if (oe) {
2525 if (oe->type != OBJ_BLOB)
2526 die("Not a blob (actually a %s): %s",
2527 typename(oe->type), command_buf.buf);
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2528 } else if (!is_null_sha1(sha1)) {
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2529 enum object_type type = sha1_object_info(sha1, NULL);
2530 if (type < 0)
2531 die("Blob not found: %s", command_buf.buf);
2532 if (type != OBJ_BLOB)
2533 die("Not a blob (actually a %s): %s",
2534 typename(type), command_buf.buf);
2535 }
2536
Johan Herland18386852011-11-25 00:09:47[diff] [blame]2537 construct_path_with_fanout(sha1_to_hex(commit_sha1), *old_fanout, path);
John Keeping62bfa112013-06-23 14:58:22[diff] [blame]2538 if (tree_content_remove(&b->branch_tree, path, NULL, 0))
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2539 b->num_notes--;
2540
2541 if (is_null_sha1(sha1))
2542 return; /* nothing to insert */
2543
2544 b->num_notes++;
2545 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2546 construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2547 tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
Johan Herlanda8dd2e72009-10-09 10:22:02[diff] [blame]2548}
2549
Shawn O. Pearce825769a2007-02-07 07:03:03[diff] [blame]2550static void file_change_deleteall(struct branch *b)
2551{
2552 release_tree_content_recursive(b->branch_tree.tree);
2553 hashclr(b->branch_tree.versions[0].sha1);
2554 hashclr(b->branch_tree.versions[1].sha1);
2555 load_tree(&b->branch_tree);
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2556 b->num_notes = 0;
Shawn O. Pearce825769a2007-02-07 07:03:03[diff] [blame]2557}
2558
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2559static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
Shawn O. Pearce654aaa32007-05-24 04:05:19[diff] [blame]2560{
2561 if (!buf || size < 46)
2562 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2563 if (memcmp("tree ", buf, 5)
2564 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2565 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2566 hashcpy(b->branch_tree.versions[0].sha1,
2567 b->branch_tree.versions[1].sha1);
2568}
2569
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2570static void parse_from_existing(struct branch *b)
Shawn O. Pearce654aaa32007-05-24 04:05:19[diff] [blame]2571{
2572 if (is_null_sha1(b->sha1)) {
2573 hashclr(b->branch_tree.versions[0].sha1);
2574 hashclr(b->branch_tree.versions[1].sha1);
2575 } else {
2576 unsigned long size;
2577 char *buf;
2578
2579 buf = read_object_with_reference(b->sha1,
2580 commit_type, &size, b->sha1);
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2581 parse_from_commit(b, buf, size);
Shawn O. Pearce654aaa32007-05-24 04:05:19[diff] [blame]2582 free(buf);
2583 }
2584}
2585
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2586static int parse_from(struct branch *b)
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2587{
Shawn O. Pearce6c3aac12007-02-06 01:30:37[diff] [blame]2588 const char *from;
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2589 struct branch *s;
2590
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2591 if (!skip_prefix(command_buf.buf, "from ", &from))
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]2592 return 0;
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2593
Shawn O. Pearceea5e3702007-02-12 09:08:43[diff] [blame]2594 if (b->branch_tree.tree) {
2595 release_tree_content_recursive(b->branch_tree.tree);
2596 b->branch_tree.tree = NULL;
2597 }
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2598
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2599 s = lookup_branch(from);
2600 if (b == s)
2601 die("Can't create a branch from itself: %s", b->name);
2602 else if (s) {
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]2603 unsigned char *t = s->branch_tree.versions[1].sha1;
Shawn O. Pearce445b8592006-08-28 14:46:58[diff] [blame]2604 hashcpy(b->sha1, s->sha1);
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]2605 hashcpy(b->branch_tree.versions[0].sha1, t);
2606 hashcpy(b->branch_tree.versions[1].sha1, t);
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2607 } else if (*from == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2608 uintmax_t idnum = parse_mark_ref_eol(from);
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2609 struct object_entry *oe = find_mark(idnum);
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2610 if (oe->type != OBJ_COMMIT)
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]2611 die("Mark :%" PRIuMAX " not a commit", idnum);
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2612 hashcpy(b->sha1, oe->idx.sha1);
Shawn O. Pearceaac65ed2007-05-24 04:32:31[diff] [blame]2613 if (oe->pack_id != MAX_PACK_ID) {
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2614 unsigned long size;
Shawn O. Pearceaac65ed2007-05-24 04:32:31[diff] [blame]2615 char *buf = gfi_unpack_entry(oe, &size);
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2616 parse_from_commit(b, buf, size);
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2617 free(buf);
Shawn O. Pearceaac65ed2007-05-24 04:32:31[diff] [blame]2618 } else
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2619 parse_from_existing(b);
Felipe Contreras4ee1b222014-04-20 18:59:27[diff] [blame]2620 } else if (!get_sha1(from, b->sha1)) {
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2621 parse_from_existing(b);
Felipe Contreras4ee1b222014-04-20 18:59:27[diff] [blame]2622 if (is_null_sha1(b->sha1))
2623 b->delete = 1;
2624 }
Shawn O. Pearce654aaa32007-05-24 04:05:19[diff] [blame]2625 else
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2626 die("Invalid ref name or SHA1 expression: %s", from);
2627
2628 read_next_command();
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]2629 return 1;
Shawn O. Pearce00e2b882006-08-24 22:45:26[diff] [blame]2630}
2631
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2632static struct hash_list *parse_merge(unsigned int *count)
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2633{
Jeff King4db34cc2013-03-21 11:08:17[diff] [blame]2634 struct hash_list *list = NULL, **tail = &list, *n;
Shawn O. Pearce6c3aac12007-02-06 01:30:37[diff] [blame]2635 const char *from;
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2636 struct branch *s;
2637
2638 *count = 0;
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2639 while (skip_prefix(command_buf.buf, "merge ", &from)) {
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2640 n = xmalloc(sizeof(*n));
2641 s = lookup_branch(from);
2642 if (s)
2643 hashcpy(n->sha1, s->sha1);
2644 else if (*from == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2645 uintmax_t idnum = parse_mark_ref_eol(from);
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2646 struct object_entry *oe = find_mark(idnum);
2647 if (oe->type != OBJ_COMMIT)
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]2648 die("Mark :%" PRIuMAX " not a commit", idnum);
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2649 hashcpy(n->sha1, oe->idx.sha1);
Shawn O. Pearce2f6dc352007-03-05 17:43:14[diff] [blame]2650 } else if (!get_sha1(from, n->sha1)) {
2651 unsigned long size;
2652 char *buf = read_object_with_reference(n->sha1,
Shawn O. Pearce6b4318e2007-03-05 17:49:02[diff] [blame]2653 commit_type, &size, n->sha1);
Shawn O. Pearce2f6dc352007-03-05 17:43:14[diff] [blame]2654 if (!buf || size < 46)
2655 die("Not a valid commit: %s", from);
2656 free(buf);
2657 } else
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2658 die("Invalid ref name or SHA1 expression: %s", from);
2659
2660 n->next = NULL;
Jeff King4db34cc2013-03-21 11:08:17[diff] [blame]2661 *tail = n;
2662 tail = &n->next;
2663
Shawn O. Pearce10e8d682007-02-06 05:26:49[diff] [blame]2664 (*count)++;
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2665 read_next_command();
2666 }
2667 return list;
2668}
2669
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2670static void parse_new_commit(const char *arg)
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2671{
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2672 static struct strbuf msg = STRBUF_INIT;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2673 struct branch *b;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2674 char *author = NULL;
2675 char *committer = NULL;
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2676 struct hash_list *merge_list = NULL;
2677 unsigned int merge_count;
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2678 unsigned char prev_fanout, new_fanout;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]2679 const char *v;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2680
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2681 b = lookup_branch(arg);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2682 if (!b)
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2683 b = new_branch(arg);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2684
2685 read_next_command();
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2686 parse_mark();
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]2687 if (skip_prefix(command_buf.buf, "author ", &v)) {
2688 author = parse_ident(v);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2689 read_next_command();
2690 }
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]2691 if (skip_prefix(command_buf.buf, "committer ", &v)) {
2692 committer = parse_ident(v);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2693 read_next_command();
2694 }
2695 if (!committer)
2696 die("Expected committer but didn't get one");
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2697 parse_data(&msg, 0, NULL);
Shawn O. Pearce02f33892006-08-25 02:38:13[diff] [blame]2698 read_next_command();
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2699 parse_from(b);
2700 merge_list = parse_merge(&merge_count);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2701
2702 /* ensure the branch is active/loaded */
Shawn O. Pearce41e52572006-08-24 08:37:35[diff] [blame]2703 if (!b->branch_tree.tree || !max_active_branches) {
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2704 unload_one_branch();
2705 load_branch(b);
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2706 }
2707
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2708 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2709
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2710 /* file_change* */
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]2711 while (command_buf.len > 0) {
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2712 if (skip_prefix(command_buf.buf, "M ", &v))
2713 file_change_m(v, b);
2714 else if (skip_prefix(command_buf.buf, "D ", &v))
2715 file_change_d(v, b);
2716 else if (skip_prefix(command_buf.buf, "R ", &v))
2717 file_change_cr(v, b, 1);
2718 else if (skip_prefix(command_buf.buf, "C ", &v))
2719 file_change_cr(v, b, 0);
2720 else if (skip_prefix(command_buf.buf, "N ", &v))
2721 note_change_n(v, b, &prev_fanout);
Shawn O. Pearce825769a2007-02-07 07:03:03[diff] [blame]2722 else if (!strcmp("deleteall", command_buf.buf))
2723 file_change_deleteall(b);
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2724 else if (skip_prefix(command_buf.buf, "ls ", &v))
2725 parse_ls(v, b);
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]2726 else {
2727 unread_command_buf = 1;
2728 break;
2729 }
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]2730 if (read_next_command() == EOF)
2731 break;
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2732 }
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2733
Johan Herland2a113ae2009-12-07 11:27:24[diff] [blame]2734 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2735 if (new_fanout != prev_fanout)
2736 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2737
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2738 /* build the tree and the commit */
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2739 store_tree(&b->branch_tree);
Shawn O. Pearce8a8c55e2006-08-29 02:06:13[diff] [blame]2740 hashcpy(b->branch_tree.versions[0].sha1,
2741 b->branch_tree.versions[1].sha1);
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2742
2743 strbuf_reset(&new_data);
2744 strbuf_addf(&new_data, "tree %s\n",
Shawn O. Pearce4cabf852006-08-28 16:22:50[diff] [blame]2745 sha1_to_hex(b->branch_tree.versions[1].sha1));
Shawn O. Pearce445b8592006-08-28 14:46:58[diff] [blame]2746 if (!is_null_sha1(b->sha1))
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2747 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2748 while (merge_list) {
2749 struct hash_list *next = merge_list->next;
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2750 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
Shawn O. Pearce62b6f482007-01-12 03:21:38[diff] [blame]2751 free(merge_list);
2752 merge_list = next;
2753 }
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2754 strbuf_addf(&new_data,
2755 "author %s\n"
2756 "committer %s\n"
2757 "\n",
2758 author ? author : committer, committer);
2759 strbuf_addbuf(&new_data, &msg);
Shawn O. Pearcee7d06a42007-02-06 17:05:51[diff] [blame]2760 free(author);
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]2761 free(committer);
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2762
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2763 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]2764 b->pack_id = pack_id;
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]2765 b->last_commit = object_count_by_type[OBJ_COMMIT];
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]2766}
2767
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2768static void parse_new_tag(const char *arg)
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2769{
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2770 static struct strbuf msg = STRBUF_INIT;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2771 const char *from;
2772 char *tagger;
2773 struct branch *s;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2774 struct tag *t;
Shawn O. Pearce0ea9f042007-01-16 05:33:19[diff] [blame]2775 uintmax_t from_mark = 0;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2776 unsigned char sha1[20];
Dmitry Potapov8db751a2010-01-14 04:44:19[diff] [blame]2777 enum object_type type;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]2778 const char *v;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2779
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2780 t = pool_alloc(sizeof(struct tag));
Thomas Rasta8ea1b72012-03-05 13:48:49[diff] [blame]2781 memset(t, 0, sizeof(struct tag));
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2782 t->name = pool_strdup(arg);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2783 if (last_tag)
2784 last_tag->next_tag = t;
2785 else
2786 first_tag = t;
2787 last_tag = t;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2788 read_next_command();
2789
2790 /* from ... */
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2791 if (!skip_prefix(command_buf.buf, "from ", &from))
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2792 die("Expected from command, got %s", command_buf.buf);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2793 s = lookup_branch(from);
2794 if (s) {
Dmitry Ivankov2c9c8ee2011-09-22 19:47:04[diff] [blame]2795 if (is_null_sha1(s->sha1))
2796 die("Can't tag an empty branch.");
Shawn O. Pearce445b8592006-08-28 14:46:58[diff] [blame]2797 hashcpy(sha1, s->sha1);
Dmitry Potapov8db751a2010-01-14 04:44:19[diff] [blame]2798 type = OBJ_COMMIT;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2799 } else if (*from == ':') {
Shawn O. Pearce10e8d682007-02-06 05:26:49[diff] [blame]2800 struct object_entry *oe;
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2801 from_mark = parse_mark_ref_eol(from);
Shawn O. Pearce10e8d682007-02-06 05:26:49[diff] [blame]2802 oe = find_mark(from_mark);
Dmitry Potapov8db751a2010-01-14 04:44:19[diff] [blame]2803 type = oe->type;
Nicolas Pitre3fc366b2010-02-17 19:05:51[diff] [blame]2804 hashcpy(sha1, oe->idx.sha1);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2805 } else if (!get_sha1(from, sha1)) {
Dmitry Ivankov6c447f62011-08-22 12:10:19[diff] [blame]2806 struct object_entry *oe = find_object(sha1);
2807 if (!oe) {
2808 type = sha1_object_info(sha1, NULL);
2809 if (type < 0)
2810 die("Not a valid object: %s", from);
2811 } else
2812 type = oe->type;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2813 } else
2814 die("Invalid ref name or SHA1 expression: %s", from);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2815 read_next_command();
2816
2817 /* tagger ... */
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]2818 if (skip_prefix(command_buf.buf, "tagger ", &v)) {
2819 tagger = parse_ident(v);
Junio C Hamano88fbf672008-12-19 22:41:21[diff] [blame]2820 read_next_command();
2821 } else
2822 tagger = NULL;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2823
2824 /* tag payload/message */
Shawn O. Pearce5eef8282010-02-01 17:27:35[diff] [blame]2825 parse_data(&msg, 0, NULL);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2826
2827 /* build the tag object */
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2828 strbuf_reset(&new_data);
Junio C Hamano88fbf672008-12-19 22:41:21[diff] [blame]2829
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2830 strbuf_addf(&new_data,
Junio C Hamano88fbf672008-12-19 22:41:21[diff] [blame]2831 "object %s\n"
2832 "type %s\n"
2833 "tag %s\n",
Dmitry Potapov8db751a2010-01-14 04:44:19[diff] [blame]2834 sha1_to_hex(sha1), typename(type), t->name);
Junio C Hamano88fbf672008-12-19 22:41:21[diff] [blame]2835 if (tagger)
2836 strbuf_addf(&new_data,
2837 "tagger %s\n", tagger);
2838 strbuf_addch(&new_data, '\n');
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2839 strbuf_addbuf(&new_data, &msg);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2840 free(tagger);
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2841
Pierre Habouziteec813c2007-09-17 11:48:17[diff] [blame]2842 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
Shawn O. Pearce69e74e72007-01-17 07:42:43[diff] [blame]2843 t->pack_id = MAX_PACK_ID;
2844 else
2845 t->pack_id = pack_id;
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]2846}
2847
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2848static void parse_reset_branch(const char *arg)
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]2849{
2850 struct branch *b;
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]2851
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2852 b = lookup_branch(arg);
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]2853 if (b) {
Shawn O. Pearceea5e3702007-02-12 09:08:43[diff] [blame]2854 hashclr(b->sha1);
2855 hashclr(b->branch_tree.versions[0].sha1);
2856 hashclr(b->branch_tree.versions[1].sha1);
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]2857 if (b->branch_tree.tree) {
2858 release_tree_content_recursive(b->branch_tree.tree);
2859 b->branch_tree.tree = NULL;
2860 }
2861 }
Shawn O. Pearce9938ffc2007-01-12 03:28:39[diff] [blame]2862 else
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2863 b = new_branch(arg);
Shawn O. Pearce9938ffc2007-01-12 03:28:39[diff] [blame]2864 read_next_command();
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]2865 parse_from(b);
Adeodato Simó655e8512008-03-07 20:22:17[diff] [blame]2866 if (command_buf.len > 0)
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]2867 unread_command_buf = 1;
Shawn O. Pearce5fced8d2006-08-27 10:20:49[diff] [blame]2868}
2869
David Barr85c62392010-11-28 19:45:01[diff] [blame]2870static void cat_blob_write(const char *buf, unsigned long size)
2871{
2872 if (write_in_full(cat_blob_fd, buf, size) != size)
2873 die_errno("Write to frontend failed");
2874}
2875
2876static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
2877{
2878 struct strbuf line = STRBUF_INIT;
2879 unsigned long size;
2880 enum object_type type = 0;
2881 char *buf;
2882
2883 if (!oe || oe->pack_id == MAX_PACK_ID) {
2884 buf = read_sha1_file(sha1, &type, &size);
2885 } else {
2886 type = oe->type;
2887 buf = gfi_unpack_entry(oe, &size);
2888 }
2889
2890 /*
2891 * Output based on batch_one_object() from cat-file.c.
2892 */
2893 if (type <= 0) {
2894 strbuf_reset(&line);
2895 strbuf_addf(&line, "%s missing\n", sha1_to_hex(sha1));
2896 cat_blob_write(line.buf, line.len);
2897 strbuf_release(&line);
2898 free(buf);
2899 return;
2900 }
2901 if (!buf)
2902 die("Can't read object %s", sha1_to_hex(sha1));
2903 if (type != OBJ_BLOB)
2904 die("Object %s is a %s but a blob was expected.",
2905 sha1_to_hex(sha1), typename(type));
2906 strbuf_reset(&line);
2907 strbuf_addf(&line, "%s %s %lu\n", sha1_to_hex(sha1),
2908 typename(type), size);
2909 cat_blob_write(line.buf, line.len);
2910 strbuf_release(&line);
2911 cat_blob_write(buf, size);
2912 cat_blob_write("\n", 1);
Dmitry Ivankova7e9c342011-08-20 19:04:12[diff] [blame]2913 if (oe && oe->pack_id == pack_id) {
2914 last_blob.offset = oe->idx.offset;
2915 strbuf_attach(&last_blob.data, buf, size, size);
2916 last_blob.depth = oe->depth;
2917 } else
2918 free(buf);
David Barr85c62392010-11-28 19:45:01[diff] [blame]2919}
2920
Jeff King97313be2014-06-18 19:49:12[diff] [blame]2921static void parse_cat_blob(const char *p)
David Barr85c62392010-11-28 19:45:01[diff] [blame]2922{
David Barr85c62392010-11-28 19:45:01[diff] [blame]2923 struct object_entry *oe = oe;
2924 unsigned char sha1[20];
2925
2926 /* cat-blob SP <object> LF */
David Barr85c62392010-11-28 19:45:01[diff] [blame]2927 if (*p == ':') {
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2928 oe = find_mark(parse_mark_ref_eol(p));
David Barr85c62392010-11-28 19:45:01[diff] [blame]2929 if (!oe)
2930 die("Unknown mark: %s", command_buf.buf);
David Barr85c62392010-11-28 19:45:01[diff] [blame]2931 hashcpy(sha1, oe->idx.sha1);
2932 } else {
2933 if (get_sha1_hex(p, sha1))
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]2934 die("Invalid dataref: %s", command_buf.buf);
David Barr85c62392010-11-28 19:45:01[diff] [blame]2935 if (p[40])
2936 die("Garbage after SHA1: %s", command_buf.buf);
2937 oe = find_object(sha1);
2938 }
2939
2940 cat_blob(oe, sha1);
2941}
2942
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]2943static struct object_entry *dereference(struct object_entry *oe,
2944 unsigned char sha1[20])
2945{
2946 unsigned long size;
Jonathan Nieder6288e3e2011-02-28 21:16:59[diff] [blame]2947 char *buf = NULL;
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]2948 if (!oe) {
2949 enum object_type type = sha1_object_info(sha1, NULL);
2950 if (type < 0)
2951 die("object not found: %s", sha1_to_hex(sha1));
2952 /* cache it! */
2953 oe = insert_object(sha1);
2954 oe->type = type;
2955 oe->pack_id = MAX_PACK_ID;
2956 oe->idx.offset = 1;
2957 }
2958 switch (oe->type) {
2959 case OBJ_TREE: /* easy case. */
2960 return oe;
2961 case OBJ_COMMIT:
2962 case OBJ_TAG:
2963 break;
2964 default:
Richard Hansenbb8040f2013-09-04 19:04:30[diff] [blame]2965 die("Not a tree-ish: %s", command_buf.buf);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]2966 }
2967
2968 if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
2969 buf = gfi_unpack_entry(oe, &size);
2970 } else {
2971 enum object_type unused;
2972 buf = read_sha1_file(sha1, &unused, &size);
2973 }
2974 if (!buf)
2975 die("Can't load object %s", sha1_to_hex(sha1));
2976
2977 /* Peel one layer. */
2978 switch (oe->type) {
2979 case OBJ_TAG:
2980 if (size < 40 + strlen("object ") ||
2981 get_sha1_hex(buf + strlen("object "), sha1))
2982 die("Invalid SHA1 in tag: %s", command_buf.buf);
2983 break;
2984 case OBJ_COMMIT:
2985 if (size < 40 + strlen("tree ") ||
2986 get_sha1_hex(buf + strlen("tree "), sha1))
2987 die("Invalid SHA1 in commit: %s", command_buf.buf);
2988 }
2989
2990 free(buf);
2991 return find_object(sha1);
2992}
2993
2994static struct object_entry *parse_treeish_dataref(const char **p)
2995{
2996 unsigned char sha1[20];
2997 struct object_entry *e;
2998
2999 if (**p == ':') { /* <mark> */
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]3000 e = find_mark(parse_mark_ref_space(p));
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3001 if (!e)
3002 die("Unknown mark: %s", command_buf.buf);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3003 hashcpy(sha1, e->idx.sha1);
3004 } else { /* <sha1> */
3005 if (get_sha1_hex(*p, sha1))
Pete Wyckoff06454cb2012-04-07 22:59:20[diff] [blame]3006 die("Invalid dataref: %s", command_buf.buf);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3007 e = find_object(sha1);
3008 *p += 40;
Jeff Kinge814c392014-06-18 19:51:57[diff] [blame]3009 if (*(*p)++ != ' ')
3010 die("Missing space after tree-ish: %s", command_buf.buf);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3011 }
3012
3013 while (!e || e->type != OBJ_TREE)
3014 e = dereference(e, sha1);
3015 return e;
3016}
3017
3018static void print_ls(int mode, const unsigned char *sha1, const char *path)
3019{
3020 static struct strbuf line = STRBUF_INIT;
3021
3022 /* See show_tree(). */
3023 const char *type =
3024 S_ISGITLINK(mode) ? commit_type :
3025 S_ISDIR(mode) ? tree_type :
3026 blob_type;
3027
3028 if (!mode) {
3029 /* missing SP path LF */
3030 strbuf_reset(&line);
3031 strbuf_addstr(&line, "missing ");
3032 quote_c_style(path, &line, NULL, 0);
3033 strbuf_addch(&line, '\n');
3034 } else {
3035 /* mode SP type SP object_name TAB path LF */
3036 strbuf_reset(&line);
3037 strbuf_addf(&line, "%06o %s %s\t",
Dmitry Ivankov8fb3ad72011-08-14 18:32:24[diff] [blame]3038 mode & ~NO_DELTA, type, sha1_to_hex(sha1));
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3039 quote_c_style(path, &line, NULL, 0);
3040 strbuf_addch(&line, '\n');
3041 }
3042 cat_blob_write(line.buf, line.len);
3043}
3044
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3045static void parse_ls(const char *p, struct branch *b)
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3046{
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3047 struct tree_entry *root = NULL;
Stephen Boydc2e86ad2011-03-22 07:51:05[diff] [blame]3048 struct tree_entry leaf = {NULL};
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3049
Richard Hansenbb8040f2013-09-04 19:04:30[diff] [blame]3050 /* ls SP (<tree-ish> SP)? <path> */
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3051 if (*p == '"') {
3052 if (!b)
3053 die("Not in a commit: %s", command_buf.buf);
3054 root = &b->branch_tree;
3055 } else {
3056 struct object_entry *e = parse_treeish_dataref(&p);
3057 root = new_tree_entry();
3058 hashcpy(root->versions[1].sha1, e->idx.sha1);
John Keepingadefdba2013-06-23 14:58:20[diff] [blame]3059 if (!is_null_sha1(root->versions[1].sha1))
3060 root->versions[1].mode = S_IFDIR;
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3061 load_tree(root);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3062 }
3063 if (*p == '"') {
3064 static struct strbuf uq = STRBUF_INIT;
3065 const char *endp;
3066 strbuf_reset(&uq);
3067 if (unquote_c_style(&uq, p, &endp))
3068 die("Invalid path: %s", command_buf.buf);
3069 if (*endp)
3070 die("Garbage after path in: %s", command_buf.buf);
3071 p = uq.buf;
3072 }
John Keepinge0eb6b92013-06-23 14:58:21[diff] [blame]3073 tree_content_get(root, p, &leaf, 1);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3074 /*
3075 * A directory in preparation would have a sha1 of zero
3076 * until it is saved. Save, for simplicity.
3077 */
3078 if (S_ISDIR(leaf.versions[1].mode))
3079 store_tree(&leaf);
3080
3081 print_ls(leaf.versions[1].mode, leaf.versions[1].sha1, p);
Jonathan Niederc27e5592012-03-10 03:20:34[diff] [blame]3082 if (leaf.tree)
3083 release_tree_content_recursive(leaf.tree);
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3084 if (!b || root != &b->branch_tree)
3085 release_tree_entry(root);
3086}
3087
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]3088static void checkpoint(void)
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]3089{
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]3090 checkpoint_requested = 0;
Shawn O. Pearce820b9312007-02-07 07:42:44[diff] [blame]3091 if (object_count) {
3092 cycle_packfile();
3093 dump_branches();
3094 dump_tags();
3095 dump_marks();
3096 }
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]3097}
3098
3099static void parse_checkpoint(void)
3100{
3101 checkpoint_requested = 1;
Shawn O. Pearce1fdb6492007-08-01 06:22:53[diff] [blame]3102 skip_optional_lf();
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]3103}
3104
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]3105static void parse_progress(void)
Shawn O. Pearceac053c02007-08-01 14:23:08[diff] [blame]3106{
Pierre Habouzitb449f4c2007-09-06 11:20:05[diff] [blame]3107 fwrite(command_buf.buf, 1, command_buf.len, stdout);
Shawn O. Pearceac053c02007-08-01 14:23:08[diff] [blame]3108 fputc('\n', stdout);
3109 fflush(stdout);
3110 skip_optional_lf();
3111}
3112
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3113static char* make_fast_import_path(const char *path)
Shawn O. Pearcee8438422007-03-07 23:07:26[diff] [blame]3114{
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3115 struct strbuf abs_path = STRBUF_INIT;
Shawn O. Pearcee8438422007-03-07 23:07:26[diff] [blame]3116
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3117 if (!relative_marks_paths || is_absolute_path(path))
3118 return xstrdup(path);
3119 strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
3120 return strbuf_detach(&abs_path, NULL);
3121}
3122
Ramkumar Ramachandradded4f12011-01-15 06:31:46[diff] [blame]3123static void option_import_marks(const char *marks,
3124 int from_stream, int ignore_missing)
Shawn O. Pearcee8438422007-03-07 23:07:26[diff] [blame]3125{
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]3126 if (import_marks_file) {
3127 if (from_stream)
3128 die("Only one import-marks command allowed per stream");
3129
3130 /* read previous mark file */
3131 if(!import_marks_file_from_stream)
3132 read_marks();
Shawn O. Pearcee8438422007-03-07 23:07:26[diff] [blame]3133 }
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]3134
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3135 import_marks_file = make_fast_import_path(marks);
Sverre Rabbelier580d5f82010-03-29 16:48:25[diff] [blame]3136 safe_create_leading_directories_const(import_marks_file);
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]3137 import_marks_file_from_stream = from_stream;
Ramkumar Ramachandradded4f12011-01-15 06:31:46[diff] [blame]3138 import_marks_file_ignore_missing = ignore_missing;
Shawn O. Pearcee8438422007-03-07 23:07:26[diff] [blame]3139}
3140
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3141static void option_date_format(const char *fmt)
3142{
3143 if (!strcmp(fmt, "raw"))
3144 whenspec = WHENSPEC_RAW;
3145 else if (!strcmp(fmt, "rfc2822"))
3146 whenspec = WHENSPEC_RFC2822;
3147 else if (!strcmp(fmt, "now"))
3148 whenspec = WHENSPEC_NOW;
3149 else
3150 die("unknown --date-format argument %s", fmt);
3151}
3152
Jonathan Niedera9ff2772010-11-28 19:42:46[diff] [blame]3153static unsigned long ulong_arg(const char *option, const char *arg)
3154{
3155 char *endptr;
3156 unsigned long rv = strtoul(arg, &endptr, 0);
3157 if (strchr(arg, '-') || endptr == arg || *endptr)
3158 die("%s: argument must be a non-negative integer", option);
3159 return rv;
3160}
3161
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3162static void option_depth(const char *depth)
3163{
Jonathan Niedera9ff2772010-11-28 19:42:46[diff] [blame]3164 max_depth = ulong_arg("--depth", depth);
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3165 if (max_depth > MAX_DEPTH)
3166 die("--depth cannot exceed %u", MAX_DEPTH);
3167}
3168
3169static void option_active_branches(const char *branches)
3170{
Jonathan Niedera9ff2772010-11-28 19:42:46[diff] [blame]3171 max_active_branches = ulong_arg("--active-branches", branches);
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3172}
3173
3174static void option_export_marks(const char *marks)
3175{
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3176 export_marks_file = make_fast_import_path(marks);
Sverre Rabbelier580d5f82010-03-29 16:48:25[diff] [blame]3177 safe_create_leading_directories_const(export_marks_file);
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3178}
3179
David Barr85c62392010-11-28 19:45:01[diff] [blame]3180static void option_cat_blob_fd(const char *fd)
3181{
3182 unsigned long n = ulong_arg("--cat-blob-fd", fd);
3183 if (n > (unsigned long) INT_MAX)
3184 die("--cat-blob-fd cannot exceed %d", INT_MAX);
3185 cat_blob_fd = (int) n;
3186}
3187
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3188static void option_export_pack_edges(const char *edges)
3189{
3190 if (pack_edges)
3191 fclose(pack_edges);
3192 pack_edges = fopen(edges, "a");
3193 if (!pack_edges)
3194 die_errno("Cannot open '%s'", edges);
3195}
3196
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3197static int parse_one_option(const char *option)
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3198{
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3199 if (skip_prefix(option, "max-pack-size=", &option)) {
Junio C Hamano4d0cc222010-02-04 19:10:44[diff] [blame]3200 unsigned long v;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3201 if (!git_parse_ulong(option, &v))
Junio C Hamano4d0cc222010-02-04 19:10:44[diff] [blame]3202 return 0;
3203 if (v < 8192) {
3204 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
3205 v *= 1024 * 1024;
3206 } else if (v < 1024 * 1024) {
3207 warning("minimum max-pack-size is 1 MiB");
3208 v = 1024 * 1024;
3209 }
3210 max_packsize = v;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3211 } else if (skip_prefix(option, "big-file-threshold=", &option)) {
Junio C Hamano76ea93c2010-02-04 02:27:08[diff] [blame]3212 unsigned long v;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3213 if (!git_parse_ulong(option, &v))
Junio C Hamano76ea93c2010-02-04 02:27:08[diff] [blame]3214 return 0;
3215 big_file_threshold = v;
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3216 } else if (skip_prefix(option, "depth=", &option)) {
3217 option_depth(option);
3218 } else if (skip_prefix(option, "active-branches=", &option)) {
3219 option_active_branches(option);
3220 } else if (skip_prefix(option, "export-pack-edges=", &option)) {
3221 option_export_pack_edges(option);
Christian Couder59556542013-11-30 20:55:40[diff] [blame]3222 } else if (starts_with(option, "quiet")) {
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3223 show_stats = 0;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]3224 } else if (starts_with(option, "stats")) {
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3225 show_stats = 1;
3226 } else {
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3227 return 0;
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3228 }
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3229
3230 return 1;
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3231}
3232
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]3233static int parse_one_feature(const char *feature, int from_stream)
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3234{
Jeff Kingae021d82014-06-18 19:47:50[diff] [blame]3235 const char *arg;
3236
3237 if (skip_prefix(feature, "date-format=", &arg)) {
3238 option_date_format(arg);
3239 } else if (skip_prefix(feature, "import-marks=", &arg)) {
3240 option_import_marks(arg, from_stream, 0);
3241 } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
3242 option_import_marks(arg, from_stream, 1);
3243 } else if (skip_prefix(feature, "export-marks=", &arg)) {
3244 option_export_marks(arg);
David Barr85c62392010-11-28 19:45:01[diff] [blame]3245 } else if (!strcmp(feature, "cat-blob")) {
3246 ; /* Don't die - this feature is supported */
Sverre Rabbelier4cce4ef2011-05-05 18:56:00[diff] [blame]3247 } else if (!strcmp(feature, "relative-marks")) {
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3248 relative_marks_paths = 1;
Sverre Rabbelier4cce4ef2011-05-05 18:56:00[diff] [blame]3249 } else if (!strcmp(feature, "no-relative-marks")) {
Sverre Rabbelierbc3c79a2009-12-04 17:07:00[diff] [blame]3250 relative_marks_paths = 0;
Sverre Rabbelierbe568622011-07-16 13:03:32[diff] [blame]3251 } else if (!strcmp(feature, "done")) {
3252 require_explicit_termination = 1;
Sverre Rabbelier4cce4ef2011-05-05 18:56:00[diff] [blame]3253 } else if (!strcmp(feature, "force")) {
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3254 force_update = 1;
David Barr8dc6a372010-12-02 10:40:20[diff] [blame]3255 } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
Jonathan Nieder547e8b92011-02-09 22:43:57[diff] [blame]3256 ; /* do nothing; we have the feature */
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3257 } else {
3258 return 0;
3259 }
3260
3261 return 1;
3262}
3263
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3264static void parse_feature(const char *feature)
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3265{
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3266 if (seen_data_command)
3267 die("Got feature command '%s' after data command", feature);
3268
Sverre Rabbelier081751c2009-12-04 17:06:59[diff] [blame]3269 if (parse_one_feature(feature, 1))
Sverre Rabbelierf963bd52009-12-04 17:06:56[diff] [blame]3270 return;
3271
3272 die("This version of fast-import does not support feature %s.", feature);
3273}
3274
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3275static void parse_option(const char *option)
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3276{
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3277 if (seen_data_command)
3278 die("Got option command '%s' after data command", option);
3279
3280 if (parse_one_option(option))
3281 return;
3282
3283 die("This version of fast-import does not support option: %s", option);
Shawn O. Pearce6bb5b322006-08-08 07:36:45[diff] [blame]3284}
3285
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]3286static int git_pack_config(const char *k, const char *v, void *cb)
Shawn O. Pearcebb23fdf2008-01-21 04:36:54[diff] [blame]3287{
3288 if (!strcmp(k, "pack.depth")) {
3289 max_depth = git_config_int(k, v);
3290 if (max_depth > MAX_DEPTH)
3291 max_depth = MAX_DEPTH;
3292 return 0;
3293 }
3294 if (!strcmp(k, "pack.compression")) {
3295 int level = git_config_int(k, v);
3296 if (level == -1)
3297 level = Z_DEFAULT_COMPRESSION;
3298 else if (level < 0 || level > Z_BEST_COMPRESSION)
3299 die("bad pack compression level %d", level);
3300 pack_compression_level = level;
3301 pack_compression_seen = 1;
3302 return 0;
3303 }
Nicolas Pitre8c2ca8d2010-02-17 19:05:55[diff] [blame]3304 if (!strcmp(k, "pack.indexversion")) {
Junio C Hamanoebcfb372011-02-25 23:43:25[diff] [blame]3305 pack_idx_opts.version = git_config_int(k, v);
3306 if (pack_idx_opts.version > 2)
Nicolas Pitre8c2ca8d2010-02-17 19:05:55[diff] [blame]3307 die("bad pack.indexversion=%"PRIu32,
Junio C Hamanoebcfb372011-02-25 23:43:25[diff] [blame]3308 pack_idx_opts.version);
Nicolas Pitre8c2ca8d2010-02-17 19:05:55[diff] [blame]3309 return 0;
3310 }
3311 if (!strcmp(k, "pack.packsizelimit")) {
3312 max_packsize = git_config_ulong(k, v);
3313 return 0;
3314 }
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]3315 return git_default_config(k, v, cb);
Shawn O. Pearcebb23fdf2008-01-21 04:36:54[diff] [blame]3316}
3317
Shawn O. Pearced5c57b22006-08-23 06:00:31[diff] [blame]3318static const char fast_import_usage[] =
Štěpán Němec62b46982010-10-08 17:31:15[diff] [blame]3319"git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
Shawn O. Pearced5c57b22006-08-23 06:00:31[diff] [blame]3320
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3321static void parse_argv(void)
3322{
3323 unsigned int i;
3324
3325 for (i = 1; i < global_argc; i++) {
3326 const char *a = global_argv[i];
3327
3328 if (*a != '-' || !strcmp(a, "--"))
3329 break;
3330
Jeff Kingff45c0d2014-06-18 19:46:15[diff] [blame]3331 if (!skip_prefix(a, "--", &a))
3332 die("unknown option %s", a);
3333
3334 if (parse_one_option(a))
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3335 continue;
3336
Jeff Kingff45c0d2014-06-18 19:46:15[diff] [blame]3337 if (parse_one_feature(a, 0))
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3338 continue;
3339
Jeff Kingff45c0d2014-06-18 19:46:15[diff] [blame]3340 if (skip_prefix(a, "cat-blob-fd=", &a)) {
3341 option_cat_blob_fd(a);
David Barr85c62392010-11-28 19:45:01[diff] [blame]3342 continue;
3343 }
3344
Jeff Kingff45c0d2014-06-18 19:46:15[diff] [blame]3345 die("unknown option --%s", a);
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3346 }
3347 if (i != global_argc)
3348 usage(fast_import_usage);
3349
3350 seen_data_command = 1;
3351 if (import_marks_file)
3352 read_marks();
3353}
3354
Ramsay Jones84d32bf2013-04-27 19:19:47[diff] [blame]3355int main(int argc, char **argv)
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]3356{
Sverre Rabbelier0f6927c2009-12-04 17:06:54[diff] [blame]3357 unsigned int i;
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]3358
Steffen Prohaska2fb3f6d2009-01-18 12:00:12[diff] [blame]3359 git_extract_argv0_path(argv[0]);
3360
Ævar Arnfjörð Bjarmason5e9637c2011-11-17 23:14:42[diff] [blame]3361 git_setup_gettext();
3362
Jonathan Nieder71a04a82009-11-09 15:04:49[diff] [blame]3363 if (argc == 2 && !strcmp(argv[1], "-h"))
3364 usage(fast_import_usage);
3365
Jean-Luc Herren733ee2b2008-02-28 22:29:54[diff] [blame]3366 setup_git_directory();
Junio C Hamanoebcfb372011-02-25 23:43:25[diff] [blame]3367 reset_pack_idx_option(&pack_idx_opts);
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]3368 git_config(git_pack_config, NULL);
Shawn O. Pearcebb23fdf2008-01-21 04:36:54[diff] [blame]3369 if (!pack_compression_seen && core_compression_seen)
3370 pack_compression_level = core_compression_level;
3371
Shawn O. Pearce93e72d82007-03-07 22:09:21[diff] [blame]3372 alloc_objects(object_entry_alloc);
Pierre Habouzitf1696ee2007-09-10 10:35:04[diff] [blame]3373 strbuf_init(&command_buf, 0);
Shawn O. Pearce93e72d82007-03-07 22:09:21[diff] [blame]3374 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
3375 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
3376 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
3377 marks = pool_calloc(1, sizeof(struct mark_set));
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]3378
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3379 global_argc = argc;
3380 global_argv = argv;
Shawn O. Pearced5c57b22006-08-23 06:00:31[diff] [blame]3381
Shawn O. Pearce904b1942007-08-03 08:47:04[diff] [blame]3382 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
3383 for (i = 0; i < (cmd_save - 1); i++)
3384 rc_free[i].next = &rc_free[i + 1];
3385 rc_free[cmd_save - 1].next = NULL;
3386
Shawn O. Pearcea5c17802007-04-20 15:23:45[diff] [blame]3387 prepare_packed_git();
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]3388 start_packfile();
Shawn O. Pearce8acb3292007-08-03 06:00:37[diff] [blame]3389 set_die_routine(die_nicely);
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]3390 set_checkpoint_signal();
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]3391 while (read_next_command() != EOF) {
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3392 const char *v;
Pierre Habouzite6c019d2007-09-17 09:19:04[diff] [blame]3393 if (!strcmp("blob", command_buf.buf))
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]3394 parse_new_blob();
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3395 else if (skip_prefix(command_buf.buf, "ls ", &v))
3396 parse_ls(v, NULL);
3397 else if (skip_prefix(command_buf.buf, "commit ", &v))
3398 parse_new_commit(v);
3399 else if (skip_prefix(command_buf.buf, "tag ", &v))
3400 parse_new_tag(v);
3401 else if (skip_prefix(command_buf.buf, "reset ", &v))
3402 parse_reset_branch(v);
Shawn O. Pearce7bfe6e22007-01-15 11:35:41[diff] [blame]3403 else if (!strcmp("checkpoint", command_buf.buf))
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]3404 parse_checkpoint();
Sverre Rabbelierbe568622011-07-16 13:03:32[diff] [blame]3405 else if (!strcmp("done", command_buf.buf))
3406 break;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]3407 else if (starts_with(command_buf.buf, "progress "))
Miklos Vajnab3031782008-05-15 22:35:56[diff] [blame]3408 parse_progress();
Jeff King97313be2014-06-18 19:49:12[diff] [blame]3409 else if (skip_prefix(command_buf.buf, "feature ", &v))
3410 parse_feature(v);
3411 else if (skip_prefix(command_buf.buf, "option git ", &v))
3412 parse_option(v);
Christian Couder59556542013-11-30 20:55:40[diff] [blame]3413 else if (starts_with(command_buf.buf, "option "))
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3414 /* ignore non-git options*/;
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]3415 else
3416 die("Unsupported command: %s", command_buf.buf);
Jonathan Niederdc01f592010-11-22 08:16:02[diff] [blame]3417
3418 if (checkpoint_requested)
3419 checkpoint();
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]3420 }
Sverre Rabbelier9c8398f2009-12-04 17:06:57[diff] [blame]3421
3422 /* argv hasn't been parsed yet, do so */
3423 if (!seen_data_command)
3424 parse_argv();
3425
Sverre Rabbelierbe568622011-07-16 13:03:32[diff] [blame]3426 if (require_explicit_termination && feof(stdin))
3427 die("stream ends early");
3428
Shawn O. Pearcef70b6532007-01-15 09:39:05[diff] [blame]3429 end_packfile();
Shawn O. Pearcec44cdc72006-08-15 00:16:28[diff] [blame]3430
Shawn O. Pearce463acbe2006-08-14 04:58:19[diff] [blame]3431 dump_branches();
Shawn O. Pearce72303d42006-08-24 07:12:13[diff] [blame]3432 dump_tags();
Shawn O. Pearce8455e482007-01-16 06:15:31[diff] [blame]3433 unkeep_all_packs();
Shawn O. Pearcea6a1a832006-08-25 20:03:04[diff] [blame]3434 dump_marks();
Shawn O. Pearce8bcce302006-08-06 17:51:39[diff] [blame]3435
Shawn O. Pearcebdf1c062007-02-12 00:45:56[diff] [blame]3436 if (pack_edges)
3437 fclose(pack_edges);
3438
Shawn O. Pearcec499d762007-02-07 07:19:31[diff] [blame]3439 if (show_stats) {
3440 uintmax_t total_count = 0, duplicate_count = 0;
3441 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3442 total_count += object_count_by_type[i];
3443 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3444 duplicate_count += duplicate_count_by_type[i];
Shawn O. Pearce80144722007-01-15 10:03:32[diff] [blame]3445
Shawn O. Pearcec499d762007-02-07 07:19:31[diff] [blame]3446 fprintf(stderr, "%s statistics:\n", argv[0]);
3447 fprintf(stderr, "---------------------------------------------------------------------\n");
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]3448 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3449 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
Dmitry Ivankov94c3b482011-08-20 19:04:11[diff] [blame]3450 fprintf(stderr, " blobs : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB], delta_count_attempts_by_type[OBJ_BLOB]);
3451 fprintf(stderr, " trees : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE], delta_count_attempts_by_type[OBJ_TREE]);
3452 fprintf(stderr, " commits: %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT], delta_count_attempts_by_type[OBJ_COMMIT]);
3453 fprintf(stderr, " tags : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG], delta_count_attempts_by_type[OBJ_TAG]);
Shawn O. Pearcec499d762007-02-07 07:19:31[diff] [blame]3454 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]3455 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
Shawn O. Pearcec499d762007-02-07 07:19:31[diff] [blame]3456 fprintf(stderr, " atoms: %10u\n", atom_cnt);
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]3457 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
Johannes Schindelin40db58b2007-02-07 11:38:21[diff] [blame]3458 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
Jason Riedy3efb1f32007-02-21 01:34:56[diff] [blame]3459 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
Shawn O. Pearcec499d762007-02-07 07:19:31[diff] [blame]3460 fprintf(stderr, "---------------------------------------------------------------------\n");
3461 pack_report();
3462 fprintf(stderr, "---------------------------------------------------------------------\n");
3463 fprintf(stderr, "\n");
3464 }
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]3465
Shawn O. Pearce7073e692007-02-06 21:08:06[diff] [blame]3466 return failure ? 1 : 0;
Shawn O. Pearcedb5e5232006-08-05 06:04:21[diff] [blame]3467}