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