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