2006-08-14 04:58:19 +00:00
|
|
|
/*
|
|
|
|
Format of STDIN stream:
|
|
|
|
|
|
|
|
stream ::= cmd*;
|
|
|
|
|
|
|
|
cmd ::= new_blob
|
2006-08-15 00:16:28 +00:00
|
|
|
| new_commit
|
2006-08-14 04:58:19 +00:00
|
|
|
| new_tag
|
2006-08-27 10:20:49 +00:00
|
|
|
| reset_branch
|
2006-08-14 04:58:19 +00:00
|
|
|
;
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
new_blob ::= 'blob' lf
|
|
|
|
mark?
|
|
|
|
file_content;
|
|
|
|
file_content ::= data;
|
2006-08-14 04:58:19 +00:00
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
new_commit ::= 'commit' sp ref_str lf
|
2006-08-24 22:45:26 +00:00
|
|
|
mark?
|
|
|
|
('author' sp name '<' email '>' ts tz lf)?
|
|
|
|
'committer' sp name '<' email '>' ts tz lf
|
|
|
|
commit_msg
|
2006-08-25 02:38:13 +00:00
|
|
|
('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
|
2006-08-15 00:16:28 +00:00
|
|
|
file_change*
|
|
|
|
lf;
|
|
|
|
commit_msg ::= data;
|
2006-08-14 04:58:19 +00:00
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
file_change ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf
|
|
|
|
| 'D' sp path_str lf
|
2006-08-14 04:58:19 +00:00
|
|
|
;
|
2006-08-15 00:16:28 +00:00
|
|
|
mode ::= '644' | '755';
|
|
|
|
|
|
|
|
new_tag ::= 'tag' sp tag_str lf
|
|
|
|
'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
|
|
|
|
'tagger' sp name '<' email '>' ts tz lf
|
|
|
|
tag_msg;
|
|
|
|
tag_msg ::= data;
|
|
|
|
|
2006-08-27 10:20:49 +00:00
|
|
|
reset_branch ::= 'reset' sp ref_str lf;
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
# note: the first idnum in a stream should be 1 and subsequent
|
|
|
|
# idnums should not have gaps between values as this will cause
|
|
|
|
# the stream parser to reserve space for the gapped values. An
|
|
|
|
# idnum can be updated in the future to a new object by issuing
|
|
|
|
# a new mark directive with the old idnum.
|
|
|
|
#
|
|
|
|
mark ::= 'mark' sp idnum lf;
|
|
|
|
|
|
|
|
# note: declen indicates the length of binary_data in bytes.
|
|
|
|
# declen does not include the lf preceeding or trailing the
|
|
|
|
# binary data.
|
|
|
|
#
|
|
|
|
data ::= 'data' sp declen lf
|
|
|
|
binary_data
|
|
|
|
lf;
|
|
|
|
|
|
|
|
# note: quoted strings are C-style quoting supporting \c for
|
|
|
|
# common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
|
|
|
|
# is the signed byte value in octal. Note that the only
|
|
|
|
# characters which must actually be escaped to protect the
|
|
|
|
# stream formatting is: \, " and LF. Otherwise these values
|
|
|
|
# are UTF8.
|
|
|
|
#
|
|
|
|
ref_str ::= ref | '"' quoted(ref) '"' ;
|
|
|
|
sha1exp_str ::= sha1exp | '"' quoted(sha1exp) '"' ;
|
|
|
|
tag_str ::= tag | '"' quoted(tag) '"' ;
|
|
|
|
path_str ::= path | '"' quoted(path) '"' ;
|
|
|
|
|
|
|
|
declen ::= # unsigned 32 bit value, ascii base10 notation;
|
2006-08-14 04:58:19 +00:00
|
|
|
binary_data ::= # file content, not interpreted;
|
2006-08-15 00:16:28 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
sp ::= # ASCII space character;
|
|
|
|
lf ::= # ASCII newline (LF) character;
|
2006-08-15 00:16:28 +00:00
|
|
|
|
|
|
|
# note: a colon (':') must precede the numerical value assigned to
|
|
|
|
# an idnum. This is to distinguish it from a ref or tag name as
|
|
|
|
# GIT does not permit ':' in ref or tag strings.
|
|
|
|
#
|
|
|
|
idnum ::= ':' declen;
|
|
|
|
path ::= # GIT style file path, e.g. "a/b/c";
|
|
|
|
ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
|
|
|
|
tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
|
2006-08-14 04:58:19 +00:00
|
|
|
sha1exp ::= # Any valid GIT SHA1 expression;
|
|
|
|
hexsha1 ::= # SHA1 in hexadecimal format;
|
2006-08-15 00:16:28 +00:00
|
|
|
|
|
|
|
# note: name and email are UTF8 strings, however name must not
|
|
|
|
# contain '<' or lf and email must not contain any of the
|
|
|
|
# following: '<', '>', lf.
|
|
|
|
#
|
|
|
|
name ::= # valid GIT author/committer name;
|
2006-08-14 04:58:19 +00:00
|
|
|
email ::= # valid GIT author/committer email;
|
2006-08-15 00:16:28 +00:00
|
|
|
ts ::= # time since the epoch in seconds, ascii base10 notation;
|
|
|
|
tz ::= # GIT style timezone;
|
2006-08-14 04:58:19 +00:00
|
|
|
*/
|
|
|
|
|
2006-08-05 06:04:21 +00:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "cache.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "blob.h"
|
2006-08-14 04:58:19 +00:00
|
|
|
#include "tree.h"
|
2006-08-05 06:04:21 +00:00
|
|
|
#include "delta.h"
|
|
|
|
#include "pack.h"
|
2006-08-14 04:58:19 +00:00
|
|
|
#include "refs.h"
|
2006-08-05 06:04:21 +00:00
|
|
|
#include "csum-file.h"
|
2006-08-15 00:16:28 +00:00
|
|
|
#include "strbuf.h"
|
|
|
|
#include "quote.h"
|
2006-08-05 06:04:21 +00:00
|
|
|
|
2006-08-08 04:03:59 +00:00
|
|
|
struct object_entry
|
|
|
|
{
|
|
|
|
struct object_entry *next;
|
2006-08-14 06:50:18 +00:00
|
|
|
enum object_type type;
|
2006-08-08 04:03:59 +00:00
|
|
|
unsigned long offset;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
};
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry_pool
|
2006-08-08 04:03:59 +00:00
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry_pool *next_pool;
|
2006-08-08 04:03:59 +00:00
|
|
|
struct object_entry *next_free;
|
|
|
|
struct object_entry *end;
|
2006-08-08 04:46:13 +00:00
|
|
|
struct object_entry entries[FLEX_ARRAY]; /* more */
|
2006-08-08 04:03:59 +00:00
|
|
|
};
|
|
|
|
|
2006-08-23 08:17:45 +00:00
|
|
|
struct mark_set
|
|
|
|
{
|
|
|
|
int shift;
|
|
|
|
union {
|
|
|
|
struct object_entry *marked[1024];
|
|
|
|
struct mark_set *sets[1024];
|
|
|
|
} data;
|
|
|
|
};
|
|
|
|
|
2006-08-08 04:46:13 +00:00
|
|
|
struct last_object
|
|
|
|
{
|
|
|
|
void *data;
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned long len;
|
2006-08-08 07:36:45 +00:00
|
|
|
unsigned int depth;
|
2006-08-08 04:46:13 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
};
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
struct mem_pool
|
|
|
|
{
|
|
|
|
struct mem_pool *next_pool;
|
|
|
|
char *next_free;
|
|
|
|
char *end;
|
|
|
|
char space[FLEX_ARRAY]; /* more */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct atom_str
|
|
|
|
{
|
|
|
|
struct atom_str *next_atom;
|
|
|
|
int str_len;
|
|
|
|
char str_dat[FLEX_ARRAY]; /* more */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tree_content;
|
2006-08-08 07:36:45 +00:00
|
|
|
struct tree_entry
|
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
struct tree_content *tree;
|
|
|
|
struct atom_str* name;
|
2006-08-28 16:22:50 +00:00
|
|
|
struct tree_entry_ms
|
|
|
|
{
|
|
|
|
unsigned int mode;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
} versions[2];
|
2006-08-08 07:36:45 +00:00
|
|
|
};
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
struct tree_content
|
2006-08-08 07:36:45 +00:00
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned int entry_capacity; /* must match avail_tree_content */
|
|
|
|
unsigned int entry_count;
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned int delta_depth;
|
2006-08-14 04:58:19 +00:00
|
|
|
struct tree_entry *entries[FLEX_ARRAY]; /* more */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct avail_tree_content
|
|
|
|
{
|
|
|
|
unsigned int entry_capacity; /* must match tree_content */
|
|
|
|
struct avail_tree_content *next_avail;
|
2006-08-08 07:36:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct branch
|
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
struct branch *table_next_branch;
|
|
|
|
struct branch *active_next_branch;
|
2006-08-08 07:36:45 +00:00
|
|
|
const char *name;
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned long last_commit;
|
|
|
|
struct tree_entry branch_tree;
|
|
|
|
unsigned char sha1[20];
|
2006-08-08 07:36:45 +00:00
|
|
|
};
|
|
|
|
|
2006-08-24 07:12:13 +00:00
|
|
|
struct tag
|
|
|
|
{
|
|
|
|
struct tag *next_tag;
|
|
|
|
const char *name;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
};
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
|
|
|
|
/* Stats and misc. counters */
|
2006-08-23 06:00:31 +00:00
|
|
|
static unsigned long max_depth = 10;
|
2006-08-08 04:03:59 +00:00
|
|
|
static unsigned long alloc_count;
|
2006-08-08 07:36:45 +00:00
|
|
|
static unsigned long branch_count;
|
2006-08-23 08:31:12 +00:00
|
|
|
static unsigned long branch_load_count;
|
2006-08-24 08:37:35 +00:00
|
|
|
static unsigned long remap_count;
|
2006-08-05 06:04:21 +00:00
|
|
|
static unsigned long object_count;
|
2006-08-06 17:51:39 +00:00
|
|
|
static unsigned long duplicate_count;
|
2006-08-23 08:17:45 +00:00
|
|
|
static unsigned long marks_set_count;
|
2006-08-08 05:14:21 +00:00
|
|
|
static unsigned long object_count_by_type[9];
|
|
|
|
static unsigned long duplicate_count_by_type[9];
|
2006-08-28 16:22:50 +00:00
|
|
|
static unsigned long delta_count_by_type[9];
|
2006-08-08 04:46:13 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
/* Memory pools */
|
|
|
|
static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
|
|
|
|
static size_t total_allocd;
|
|
|
|
static struct mem_pool *mem_pool;
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
/* Atom management */
|
2006-08-14 04:58:19 +00:00
|
|
|
static unsigned int atom_table_sz = 4451;
|
|
|
|
static unsigned int atom_cnt;
|
|
|
|
static struct atom_str **atom_table;
|
|
|
|
|
|
|
|
/* The .pack file being generated */
|
2006-08-08 04:46:13 +00:00
|
|
|
static int pack_fd;
|
2006-08-24 08:37:35 +00:00
|
|
|
static unsigned long pack_size;
|
2006-08-08 04:46:13 +00:00
|
|
|
static unsigned char pack_sha1[20];
|
2006-08-27 09:53:48 +00:00
|
|
|
static unsigned char* pack_base;
|
|
|
|
static unsigned long pack_moff;
|
|
|
|
static unsigned long pack_mlen = 128*1024*1024;
|
|
|
|
static unsigned long page_size;
|
2006-08-08 04:46:13 +00:00
|
|
|
|
|
|
|
/* Table of objects we've written. */
|
2006-08-28 16:22:50 +00:00
|
|
|
static unsigned int object_entry_alloc = 5000;
|
2006-08-14 04:58:19 +00:00
|
|
|
static struct object_entry_pool *blocks;
|
|
|
|
static struct object_entry *object_table[1 << 16];
|
2006-08-23 08:17:45 +00:00
|
|
|
static struct mark_set *marks;
|
2006-08-25 20:03:04 +00:00
|
|
|
static const char* mark_file;
|
2006-08-08 04:46:13 +00:00
|
|
|
|
|
|
|
/* Our last blob */
|
2006-08-14 04:58:19 +00:00
|
|
|
static struct last_object last_blob;
|
|
|
|
|
|
|
|
/* Tree management */
|
|
|
|
static unsigned int tree_entry_alloc = 1000;
|
|
|
|
static void *avail_tree_entry;
|
|
|
|
static unsigned int avail_tree_table_sz = 100;
|
|
|
|
static struct avail_tree_content **avail_tree_table;
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-08 07:36:45 +00:00
|
|
|
/* Branch data */
|
2006-08-23 06:00:31 +00:00
|
|
|
static unsigned long max_active_branches = 5;
|
|
|
|
static unsigned long cur_active_branches;
|
|
|
|
static unsigned long branch_table_sz = 1039;
|
2006-08-14 04:58:19 +00:00
|
|
|
static struct branch **branch_table;
|
|
|
|
static struct branch *active_branches;
|
|
|
|
|
2006-08-24 07:12:13 +00:00
|
|
|
/* Tag data */
|
|
|
|
static struct tag *first_tag;
|
|
|
|
static struct tag *last_tag;
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
/* Input stream parsing */
|
|
|
|
static struct strbuf command_buf;
|
2006-08-23 08:17:45 +00:00
|
|
|
static unsigned long next_mark;
|
2006-08-26 03:07:06 +00:00
|
|
|
static FILE* branch_log;
|
2006-08-15 00:16:28 +00:00
|
|
|
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-08 04:03:59 +00:00
|
|
|
static void alloc_objects(int cnt)
|
2006-08-06 17:51:39 +00:00
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry_pool *b;
|
2006-08-08 04:03:59 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
b = xmalloc(sizeof(struct object_entry_pool)
|
2006-08-08 04:03:59 +00:00
|
|
|
+ cnt * sizeof(struct object_entry));
|
2006-08-14 04:58:19 +00:00
|
|
|
b->next_pool = blocks;
|
2006-08-08 04:03:59 +00:00
|
|
|
b->next_free = b->entries;
|
|
|
|
b->end = b->entries + cnt;
|
|
|
|
blocks = b;
|
|
|
|
alloc_count += cnt;
|
|
|
|
}
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-08 04:03:59 +00:00
|
|
|
static struct object_entry* new_object(unsigned char *sha1)
|
2006-08-06 17:51:39 +00:00
|
|
|
{
|
2006-08-08 04:03:59 +00:00
|
|
|
struct object_entry *e;
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-08 04:03:59 +00:00
|
|
|
if (blocks->next_free == blocks->end)
|
2006-08-14 04:58:19 +00:00
|
|
|
alloc_objects(object_entry_alloc);
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-08 04:03:59 +00:00
|
|
|
e = blocks->next_free++;
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(e->sha1, sha1);
|
2006-08-08 04:03:59 +00:00
|
|
|
return e;
|
2006-08-06 17:51:39 +00:00
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static struct object_entry* find_object(unsigned char *sha1)
|
|
|
|
{
|
|
|
|
unsigned int h = sha1[0] << 8 | sha1[1];
|
|
|
|
struct object_entry *e;
|
|
|
|
for (e = object_table[h]; e; e = e->next)
|
2006-08-28 14:46:58 +00:00
|
|
|
if (!hashcmp(sha1, e->sha1))
|
2006-08-14 04:58:19 +00:00
|
|
|
return e;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
static struct object_entry* insert_object(unsigned char *sha1)
|
|
|
|
{
|
|
|
|
unsigned int h = sha1[0] << 8 | sha1[1];
|
2006-08-08 04:03:59 +00:00
|
|
|
struct object_entry *e = object_table[h];
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry *p = NULL;
|
2006-08-06 17:51:39 +00:00
|
|
|
|
|
|
|
while (e) {
|
2006-08-28 14:46:58 +00:00
|
|
|
if (!hashcmp(sha1, e->sha1))
|
2006-08-06 17:51:39 +00:00
|
|
|
return e;
|
|
|
|
p = e;
|
|
|
|
e = e->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
e = new_object(sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
e->next = NULL;
|
2006-08-06 17:51:39 +00:00
|
|
|
e->offset = 0;
|
|
|
|
if (p)
|
|
|
|
p->next = e;
|
|
|
|
else
|
2006-08-08 04:03:59 +00:00
|
|
|
object_table[h] = e;
|
2006-08-06 17:51:39 +00:00
|
|
|
return e;
|
|
|
|
}
|
2006-08-05 06:04:21 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static unsigned int hc_str(const char *s, size_t len)
|
|
|
|
{
|
|
|
|
unsigned int r = 0;
|
|
|
|
while (len-- > 0)
|
|
|
|
r = r * 31 + *s++;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* pool_alloc(size_t len)
|
|
|
|
{
|
|
|
|
struct mem_pool *p;
|
|
|
|
void *r;
|
|
|
|
|
|
|
|
for (p = mem_pool; p; p = p->next_pool)
|
|
|
|
if ((p->end - p->next_free >= len))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!p) {
|
|
|
|
if (len >= (mem_pool_alloc/2)) {
|
|
|
|
total_allocd += len;
|
|
|
|
return xmalloc(len);
|
|
|
|
}
|
|
|
|
total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
|
|
|
|
p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
|
|
|
|
p->next_pool = mem_pool;
|
|
|
|
p->next_free = p->space;
|
|
|
|
p->end = p->next_free + mem_pool_alloc;
|
|
|
|
mem_pool = p;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = p->next_free;
|
2006-08-24 08:46:29 +00:00
|
|
|
/* round out to a pointer alignment */
|
|
|
|
if (len & (sizeof(void*) - 1))
|
|
|
|
len += sizeof(void*) - (len & (sizeof(void*) - 1));
|
2006-08-14 04:58:19 +00:00
|
|
|
p->next_free += len;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* pool_calloc(size_t count, size_t size)
|
|
|
|
{
|
|
|
|
size_t len = count * size;
|
|
|
|
void *r = pool_alloc(len);
|
|
|
|
memset(r, 0, len);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char* pool_strdup(const char *s)
|
|
|
|
{
|
|
|
|
char *r = pool_alloc(strlen(s) + 1);
|
|
|
|
strcpy(r, s);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2006-08-23 08:17:45 +00:00
|
|
|
static void insert_mark(unsigned long idnum, struct object_entry *oe)
|
|
|
|
{
|
|
|
|
struct mark_set *s = marks;
|
|
|
|
while ((idnum >> s->shift) >= 1024) {
|
|
|
|
s = pool_calloc(1, sizeof(struct mark_set));
|
|
|
|
s->shift = marks->shift + 10;
|
|
|
|
s->data.sets[0] = marks;
|
|
|
|
marks = s;
|
|
|
|
}
|
|
|
|
while (s->shift) {
|
|
|
|
unsigned long i = idnum >> s->shift;
|
|
|
|
idnum -= i << s->shift;
|
|
|
|
if (!s->data.sets[i]) {
|
|
|
|
s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
|
|
|
|
s->data.sets[i]->shift = s->shift - 10;
|
|
|
|
}
|
|
|
|
s = s->data.sets[i];
|
|
|
|
}
|
|
|
|
if (!s->data.marked[idnum])
|
|
|
|
marks_set_count++;
|
|
|
|
s->data.marked[idnum] = oe;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct object_entry* find_mark(unsigned long idnum)
|
|
|
|
{
|
|
|
|
unsigned long orig_idnum = idnum;
|
|
|
|
struct mark_set *s = marks;
|
|
|
|
struct object_entry *oe = NULL;
|
|
|
|
if ((idnum >> s->shift) < 1024) {
|
|
|
|
while (s && s->shift) {
|
|
|
|
unsigned long i = idnum >> s->shift;
|
|
|
|
idnum -= i << s->shift;
|
|
|
|
s = s->data.sets[i];
|
|
|
|
}
|
|
|
|
if (s)
|
|
|
|
oe = s->data.marked[idnum];
|
|
|
|
}
|
|
|
|
if (!oe)
|
|
|
|
die("mark :%lu not declared", orig_idnum);
|
|
|
|
return oe;
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static struct atom_str* to_atom(const char *s, size_t len)
|
|
|
|
{
|
|
|
|
unsigned int hc = hc_str(s, len) % atom_table_sz;
|
|
|
|
struct atom_str *c;
|
|
|
|
|
|
|
|
for (c = atom_table[hc]; c; c = c->next_atom)
|
|
|
|
if (c->str_len == len && !strncmp(s, c->str_dat, len))
|
|
|
|
return c;
|
|
|
|
|
|
|
|
c = pool_alloc(sizeof(struct atom_str) + len + 1);
|
|
|
|
c->str_len = len;
|
|
|
|
strncpy(c->str_dat, s, len);
|
|
|
|
c->str_dat[len] = 0;
|
|
|
|
c->next_atom = atom_table[hc];
|
|
|
|
atom_table[hc] = c;
|
|
|
|
atom_cnt++;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct branch* lookup_branch(const char *name)
|
|
|
|
{
|
|
|
|
unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
|
|
|
|
struct branch *b;
|
|
|
|
|
|
|
|
for (b = branch_table[hc]; b; b = b->table_next_branch)
|
|
|
|
if (!strcmp(name, b->name))
|
|
|
|
return b;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct branch* new_branch(const char *name)
|
|
|
|
{
|
|
|
|
unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
|
|
|
|
struct branch* b = lookup_branch(name);
|
|
|
|
|
|
|
|
if (b)
|
|
|
|
die("Invalid attempt to create duplicate branch: %s", name);
|
2006-08-15 00:16:28 +00:00
|
|
|
if (check_ref_format(name))
|
|
|
|
die("Branch name doesn't conform to GIT standards: %s", name);
|
2006-08-14 04:58:19 +00:00
|
|
|
|
|
|
|
b = pool_calloc(1, sizeof(struct branch));
|
|
|
|
b->name = pool_strdup(name);
|
|
|
|
b->table_next_branch = branch_table[hc];
|
|
|
|
branch_table[hc] = b;
|
|
|
|
branch_count++;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int hc_entries(unsigned int cnt)
|
|
|
|
{
|
|
|
|
cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
|
|
|
|
return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct tree_content* new_tree_content(unsigned int cnt)
|
|
|
|
{
|
|
|
|
struct avail_tree_content *f, *l = NULL;
|
|
|
|
struct tree_content *t;
|
|
|
|
unsigned int hc = hc_entries(cnt);
|
|
|
|
|
|
|
|
for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
|
|
|
|
if (f->entry_capacity >= cnt)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (f) {
|
|
|
|
if (l)
|
|
|
|
l->next_avail = f->next_avail;
|
|
|
|
else
|
|
|
|
avail_tree_table[hc] = f->next_avail;
|
|
|
|
} else {
|
|
|
|
cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
|
|
|
|
f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
|
|
|
|
f->entry_capacity = cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
t = (struct tree_content*)f;
|
|
|
|
t->entry_count = 0;
|
2006-08-28 16:22:50 +00:00
|
|
|
t->delta_depth = 0;
|
2006-08-14 04:58:19 +00:00
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void release_tree_entry(struct tree_entry *e);
|
|
|
|
static void release_tree_content(struct tree_content *t)
|
|
|
|
{
|
|
|
|
struct avail_tree_content *f = (struct avail_tree_content*)t;
|
|
|
|
unsigned int hc = hc_entries(f->entry_capacity);
|
2006-08-23 05:33:47 +00:00
|
|
|
f->next_avail = avail_tree_table[hc];
|
|
|
|
avail_tree_table[hc] = f;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void release_tree_content_recursive(struct tree_content *t)
|
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < t->entry_count; i++)
|
|
|
|
release_tree_entry(t->entries[i]);
|
2006-08-23 05:33:47 +00:00
|
|
|
release_tree_content(t);
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct tree_content* grow_tree_content(
|
|
|
|
struct tree_content *t,
|
|
|
|
int amt)
|
|
|
|
{
|
|
|
|
struct tree_content *r = new_tree_content(t->entry_count + amt);
|
|
|
|
r->entry_count = t->entry_count;
|
2006-08-28 16:22:50 +00:00
|
|
|
r->delta_depth = t->delta_depth;
|
2006-08-14 04:58:19 +00:00
|
|
|
memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
|
|
|
|
release_tree_content(t);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct tree_entry* new_tree_entry()
|
|
|
|
{
|
|
|
|
struct tree_entry *e;
|
|
|
|
|
|
|
|
if (!avail_tree_entry) {
|
|
|
|
unsigned int n = tree_entry_alloc;
|
2006-08-25 18:53:32 +00:00
|
|
|
total_allocd += n * sizeof(struct tree_entry);
|
2006-08-14 04:58:19 +00:00
|
|
|
avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
|
2006-08-27 02:38:02 +00:00
|
|
|
while (n-- > 1) {
|
2006-08-14 04:58:19 +00:00
|
|
|
*((void**)e) = e + 1;
|
|
|
|
e++;
|
|
|
|
}
|
2006-08-27 03:37:31 +00:00
|
|
|
*((void**)e) = NULL;
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
e = avail_tree_entry;
|
|
|
|
avail_tree_entry = *((void**)e);
|
|
|
|
return e;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void release_tree_entry(struct tree_entry *e)
|
|
|
|
{
|
|
|
|
if (e->tree)
|
2006-08-23 05:33:47 +00:00
|
|
|
release_tree_content_recursive(e->tree);
|
2006-08-14 04:58:19 +00:00
|
|
|
*((void**)e) = avail_tree_entry;
|
|
|
|
avail_tree_entry = e;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void yread(int fd, void *buffer, size_t length)
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
|
|
|
ssize_t ret = 0;
|
|
|
|
while (ret < length) {
|
|
|
|
ssize_t size = xread(fd, (char *) buffer + ret, length - ret);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (!size)
|
|
|
|
die("Read from descriptor %i: end of stream", fd);
|
|
|
|
if (size < 0)
|
|
|
|
die("Read from descriptor %i: %s", fd, strerror(errno));
|
|
|
|
ret += size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ywrite(int fd, void *buffer, size_t length)
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
|
|
|
ssize_t ret = 0;
|
|
|
|
while (ret < length) {
|
|
|
|
ssize_t size = xwrite(fd, (char *) buffer + ret, length - ret);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (!size)
|
|
|
|
die("Write to descriptor %i: end of file", fd);
|
|
|
|
if (size < 0)
|
|
|
|
die("Write to descriptor %i: %s", fd, strerror(errno));
|
2006-08-05 06:04:21 +00:00
|
|
|
ret += size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
static size_t encode_header(
|
2006-08-08 04:46:13 +00:00
|
|
|
enum object_type type,
|
2006-08-15 00:16:28 +00:00
|
|
|
size_t size,
|
2006-08-08 04:46:13 +00:00
|
|
|
unsigned char *hdr)
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
|
|
|
int n = 1;
|
|
|
|
unsigned char c;
|
|
|
|
|
|
|
|
if (type < OBJ_COMMIT || type > OBJ_DELTA)
|
|
|
|
die("bad type %d", type);
|
|
|
|
|
|
|
|
c = (type << 4) | (size & 15);
|
|
|
|
size >>= 4;
|
|
|
|
while (size) {
|
|
|
|
*hdr++ = c | 0x80;
|
|
|
|
c = size & 0x7f;
|
|
|
|
size >>= 7;
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
*hdr = c;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2006-08-08 04:46:13 +00:00
|
|
|
static int store_object(
|
|
|
|
enum object_type type,
|
|
|
|
void *dat,
|
2006-08-15 00:16:28 +00:00
|
|
|
size_t datlen,
|
2006-08-08 07:36:45 +00:00
|
|
|
struct last_object *last,
|
2006-08-23 08:17:45 +00:00
|
|
|
unsigned char *sha1out,
|
|
|
|
unsigned long mark)
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
|
|
|
void *out, *delta;
|
2006-08-08 04:46:13 +00:00
|
|
|
struct object_entry *e;
|
|
|
|
unsigned char hdr[96];
|
|
|
|
unsigned char sha1[20];
|
2006-08-05 06:04:21 +00:00
|
|
|
unsigned long hdrlen, deltalen;
|
2006-08-08 04:46:13 +00:00
|
|
|
SHA_CTX c;
|
|
|
|
z_stream s;
|
|
|
|
|
|
|
|
hdrlen = sprintf((char*)hdr,"%s %lu",type_names[type],datlen) + 1;
|
|
|
|
SHA1_Init(&c);
|
|
|
|
SHA1_Update(&c, hdr, hdrlen);
|
|
|
|
SHA1_Update(&c, dat, datlen);
|
|
|
|
SHA1_Final(sha1, &c);
|
2006-08-08 07:36:45 +00:00
|
|
|
if (sha1out)
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(sha1out, sha1);
|
2006-08-08 04:46:13 +00:00
|
|
|
|
|
|
|
e = insert_object(sha1);
|
2006-08-23 08:17:45 +00:00
|
|
|
if (mark)
|
|
|
|
insert_mark(mark, e);
|
2006-08-08 04:46:13 +00:00
|
|
|
if (e->offset) {
|
|
|
|
duplicate_count++;
|
2006-08-08 05:14:21 +00:00
|
|
|
duplicate_count_by_type[type]++;
|
2006-08-14 04:58:19 +00:00
|
|
|
return 1;
|
2006-08-08 04:46:13 +00:00
|
|
|
}
|
2006-08-14 06:50:18 +00:00
|
|
|
e->type = type;
|
2006-08-24 08:37:35 +00:00
|
|
|
e->offset = pack_size;
|
2006-08-08 04:46:13 +00:00
|
|
|
object_count++;
|
2006-08-08 05:14:21 +00:00
|
|
|
object_count_by_type[type]++;
|
2006-08-05 06:04:21 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
if (last && last->data && last->depth < max_depth)
|
2006-08-08 04:46:13 +00:00
|
|
|
delta = diff_delta(last->data, last->len,
|
2006-08-05 06:04:21 +00:00
|
|
|
dat, datlen,
|
|
|
|
&deltalen, 0);
|
2006-08-08 04:46:13 +00:00
|
|
|
else
|
2006-08-05 06:04:21 +00:00
|
|
|
delta = 0;
|
|
|
|
|
|
|
|
memset(&s, 0, sizeof(s));
|
|
|
|
deflateInit(&s, zlib_compression_level);
|
|
|
|
|
|
|
|
if (delta) {
|
2006-08-28 16:22:50 +00:00
|
|
|
delta_count_by_type[type]++;
|
2006-08-08 04:46:13 +00:00
|
|
|
last->depth++;
|
2006-08-05 06:04:21 +00:00
|
|
|
s.next_in = delta;
|
|
|
|
s.avail_in = deltalen;
|
|
|
|
hdrlen = encode_header(OBJ_DELTA, deltalen, hdr);
|
2006-08-14 04:58:19 +00:00
|
|
|
ywrite(pack_fd, hdr, hdrlen);
|
|
|
|
ywrite(pack_fd, last->sha1, sizeof(sha1));
|
2006-08-24 08:37:35 +00:00
|
|
|
pack_size += hdrlen + sizeof(sha1);
|
2006-08-05 06:04:21 +00:00
|
|
|
} else {
|
2006-08-14 04:58:19 +00:00
|
|
|
if (last)
|
|
|
|
last->depth = 0;
|
2006-08-05 06:04:21 +00:00
|
|
|
s.next_in = dat;
|
|
|
|
s.avail_in = datlen;
|
2006-08-08 04:46:13 +00:00
|
|
|
hdrlen = encode_header(type, datlen, hdr);
|
2006-08-14 04:58:19 +00:00
|
|
|
ywrite(pack_fd, hdr, hdrlen);
|
2006-08-24 08:37:35 +00:00
|
|
|
pack_size += hdrlen;
|
2006-08-05 06:04:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
s.avail_out = deflateBound(&s, s.avail_in);
|
|
|
|
s.next_out = out = xmalloc(s.avail_out);
|
|
|
|
while (deflate(&s, Z_FINISH) == Z_OK)
|
|
|
|
/* nothing */;
|
|
|
|
deflateEnd(&s);
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
ywrite(pack_fd, out, s.total_out);
|
2006-08-24 08:37:35 +00:00
|
|
|
pack_size += s.total_out;
|
2006-08-05 06:04:21 +00:00
|
|
|
|
|
|
|
free(out);
|
|
|
|
if (delta)
|
|
|
|
free(delta);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (last) {
|
|
|
|
if (last->data)
|
|
|
|
free(last->data);
|
|
|
|
last->data = dat;
|
|
|
|
last->len = datlen;
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(last->sha1, sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-27 09:53:48 +00:00
|
|
|
static unsigned char* map_pack(unsigned long offset, unsigned int *left)
|
2006-08-24 08:37:35 +00:00
|
|
|
{
|
|
|
|
if (offset >= pack_size)
|
|
|
|
die("object offset outside of pack file");
|
2006-08-27 09:53:48 +00:00
|
|
|
if (!pack_base
|
|
|
|
|| offset < pack_moff
|
|
|
|
|| (offset + 20) >= (pack_moff + pack_mlen)) {
|
2006-08-24 08:37:35 +00:00
|
|
|
if (pack_base)
|
|
|
|
munmap(pack_base, pack_mlen);
|
2006-08-27 09:53:48 +00:00
|
|
|
pack_moff = (offset / page_size) * page_size;
|
|
|
|
pack_base = mmap(NULL,pack_mlen,PROT_READ,MAP_SHARED,
|
|
|
|
pack_fd,pack_moff);
|
2006-08-24 08:37:35 +00:00
|
|
|
if (pack_base == MAP_FAILED)
|
|
|
|
die("Failed to map generated pack: %s", strerror(errno));
|
|
|
|
remap_count++;
|
|
|
|
}
|
2006-08-27 09:53:48 +00:00
|
|
|
offset -= pack_moff;
|
|
|
|
if (left)
|
|
|
|
*left = pack_mlen - offset;
|
|
|
|
return pack_base + offset;
|
2006-08-24 08:37:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long unpack_object_header(unsigned long offset,
|
|
|
|
enum object_type *type,
|
|
|
|
unsigned long *sizep)
|
|
|
|
{
|
|
|
|
unsigned shift;
|
|
|
|
unsigned char c;
|
|
|
|
unsigned long size;
|
|
|
|
|
2006-08-27 09:53:48 +00:00
|
|
|
c = *map_pack(offset++, NULL);
|
2006-08-24 08:37:35 +00:00
|
|
|
*type = (c >> 4) & 7;
|
|
|
|
size = c & 15;
|
|
|
|
shift = 4;
|
|
|
|
while (c & 0x80) {
|
2006-08-27 09:53:48 +00:00
|
|
|
c = *map_pack(offset++, NULL);
|
2006-08-24 08:37:35 +00:00
|
|
|
size += (c & 0x7f) << shift;
|
|
|
|
shift += 7;
|
|
|
|
}
|
|
|
|
*sizep = size;
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *unpack_non_delta_entry(unsigned long o, unsigned long sz)
|
|
|
|
{
|
|
|
|
z_stream stream;
|
|
|
|
unsigned char *result;
|
|
|
|
|
|
|
|
result = xmalloc(sz + 1);
|
|
|
|
result[sz] = 0;
|
|
|
|
|
|
|
|
memset(&stream, 0, sizeof(stream));
|
2006-08-27 09:53:48 +00:00
|
|
|
stream.next_in = map_pack(o, &stream.avail_in);
|
2006-08-24 08:37:35 +00:00
|
|
|
stream.next_out = result;
|
|
|
|
stream.avail_out = sz;
|
|
|
|
|
|
|
|
inflateInit(&stream);
|
|
|
|
for (;;) {
|
|
|
|
int st = inflate(&stream, Z_FINISH);
|
|
|
|
if (st == Z_STREAM_END)
|
|
|
|
break;
|
2006-08-27 09:53:48 +00:00
|
|
|
if (st == Z_OK || st == Z_BUF_ERROR) {
|
|
|
|
o = stream.next_in - pack_base + pack_moff;
|
|
|
|
stream.next_in = map_pack(o, &stream.avail_in);
|
2006-08-24 08:37:35 +00:00
|
|
|
continue;
|
|
|
|
}
|
2006-08-27 09:53:48 +00:00
|
|
|
die("Error %i from zlib during inflate.", st);
|
2006-08-24 08:37:35 +00:00
|
|
|
}
|
|
|
|
inflateEnd(&stream);
|
|
|
|
if (stream.total_out != sz)
|
|
|
|
die("Error after inflate: sizes mismatch");
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
static void *unpack_entry(unsigned long offset,
|
|
|
|
unsigned long *sizep,
|
|
|
|
unsigned int *delta_depth);
|
2006-08-24 08:37:35 +00:00
|
|
|
|
|
|
|
static void *unpack_delta_entry(unsigned long offset,
|
|
|
|
unsigned long delta_size,
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned long *sizep,
|
|
|
|
unsigned int *delta_depth)
|
2006-08-24 08:37:35 +00:00
|
|
|
{
|
|
|
|
struct object_entry *base_oe;
|
|
|
|
unsigned char *base_sha1;
|
|
|
|
void *delta_data, *base, *result;
|
|
|
|
unsigned long base_size, result_size;
|
|
|
|
|
2006-08-27 09:53:48 +00:00
|
|
|
base_sha1 = map_pack(offset, NULL);
|
2006-08-24 08:37:35 +00:00
|
|
|
base_oe = find_object(base_sha1);
|
|
|
|
if (!base_oe)
|
|
|
|
die("I'm broken; I can't find a base I know must be here.");
|
2006-08-28 16:22:50 +00:00
|
|
|
base = unpack_entry(base_oe->offset, &base_size, delta_depth);
|
2006-08-24 08:37:35 +00:00
|
|
|
delta_data = unpack_non_delta_entry(offset + 20, delta_size);
|
|
|
|
result = patch_delta(base, base_size,
|
|
|
|
delta_data, delta_size,
|
|
|
|
&result_size);
|
|
|
|
if (!result)
|
|
|
|
die("failed to apply delta");
|
|
|
|
free(delta_data);
|
|
|
|
free(base);
|
|
|
|
*sizep = result_size;
|
2006-08-28 16:22:50 +00:00
|
|
|
(*delta_depth)++;
|
2006-08-24 08:37:35 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
static void *unpack_entry(unsigned long offset,
|
|
|
|
unsigned long *sizep,
|
|
|
|
unsigned int *delta_depth)
|
2006-08-24 08:37:35 +00:00
|
|
|
{
|
|
|
|
unsigned long size;
|
|
|
|
enum object_type kind;
|
|
|
|
|
|
|
|
offset = unpack_object_header(offset, &kind, &size);
|
|
|
|
switch (kind) {
|
|
|
|
case OBJ_DELTA:
|
2006-08-28 16:22:50 +00:00
|
|
|
return unpack_delta_entry(offset, size, sizep, delta_depth);
|
2006-08-24 08:37:35 +00:00
|
|
|
case OBJ_COMMIT:
|
|
|
|
case OBJ_TREE:
|
|
|
|
case OBJ_BLOB:
|
|
|
|
case OBJ_TAG:
|
|
|
|
*sizep = size;
|
2006-08-28 16:22:50 +00:00
|
|
|
*delta_depth = 0;
|
2006-08-24 08:37:35 +00:00
|
|
|
return unpack_non_delta_entry(offset, size);
|
|
|
|
default:
|
|
|
|
die("I created an object I can't read!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static const char *get_mode(const char *str, unsigned int *modep)
|
|
|
|
{
|
|
|
|
unsigned char c;
|
|
|
|
unsigned int mode = 0;
|
|
|
|
|
|
|
|
while ((c = *str++) != ' ') {
|
|
|
|
if (c < '0' || c > '7')
|
|
|
|
return NULL;
|
|
|
|
mode = (mode << 3) + (c - '0');
|
|
|
|
}
|
|
|
|
*modep = mode;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void load_tree(struct tree_entry *root)
|
|
|
|
{
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned char* sha1 = root->versions[1].sha1;
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry *myoe;
|
|
|
|
struct tree_content *t;
|
|
|
|
unsigned long size;
|
|
|
|
char *buf;
|
|
|
|
const char *c;
|
|
|
|
|
|
|
|
root->tree = t = new_tree_content(8);
|
2006-08-28 16:22:50 +00:00
|
|
|
if (is_null_sha1(sha1))
|
2006-08-14 04:58:19 +00:00
|
|
|
return;
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
myoe = find_object(sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (myoe) {
|
2006-08-24 08:37:35 +00:00
|
|
|
if (myoe->type != OBJ_TREE)
|
2006-08-28 16:22:50 +00:00
|
|
|
die("Not a tree: %s", sha1_to_hex(sha1));
|
|
|
|
buf = unpack_entry(myoe->offset, &size, &t->delta_depth);
|
2006-08-14 04:58:19 +00:00
|
|
|
} else {
|
2006-08-24 08:37:35 +00:00
|
|
|
char type[20];
|
2006-08-28 16:22:50 +00:00
|
|
|
buf = read_sha1_file(sha1, type, &size);
|
2006-08-24 22:45:26 +00:00
|
|
|
if (!buf || strcmp(type, tree_type))
|
2006-08-28 16:22:50 +00:00
|
|
|
die("Can't load tree %s", sha1_to_hex(sha1));
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
c = buf;
|
|
|
|
while (c != (buf + size)) {
|
|
|
|
struct tree_entry *e = new_tree_entry();
|
|
|
|
|
|
|
|
if (t->entry_count == t->entry_capacity)
|
|
|
|
root->tree = t = grow_tree_content(t, 8);
|
|
|
|
t->entries[t->entry_count++] = e;
|
|
|
|
|
|
|
|
e->tree = NULL;
|
2006-08-28 16:22:50 +00:00
|
|
|
c = get_mode(c, &e->versions[1].mode);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (!c)
|
2006-08-28 16:22:50 +00:00
|
|
|
die("Corrupt mode in %s", sha1_to_hex(sha1));
|
|
|
|
e->versions[0].mode = e->versions[1].mode;
|
2006-08-14 04:58:19 +00:00
|
|
|
e->name = to_atom(c, strlen(c));
|
|
|
|
c += e->name->str_len + 1;
|
2006-08-28 16:22:50 +00:00
|
|
|
hashcpy(e->versions[0].sha1, (unsigned char*)c);
|
|
|
|
hashcpy(e->versions[1].sha1, (unsigned char*)c);
|
2006-08-14 04:58:19 +00:00
|
|
|
c += 20;
|
|
|
|
}
|
|
|
|
free(buf);
|
|
|
|
}
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
static int tecmp0 (const void *_a, const void *_b)
|
2006-08-14 04:58:19 +00:00
|
|
|
{
|
|
|
|
struct tree_entry *a = *((struct tree_entry**)_a);
|
|
|
|
struct tree_entry *b = *((struct tree_entry**)_b);
|
|
|
|
return base_name_compare(
|
2006-08-28 16:22:50 +00:00
|
|
|
a->name->str_dat, a->name->str_len, a->versions[0].mode,
|
|
|
|
b->name->str_dat, b->name->str_len, b->versions[0].mode);
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
static int tecmp1 (const void *_a, const void *_b)
|
2006-08-14 04:58:19 +00:00
|
|
|
{
|
2006-08-28 16:22:50 +00:00
|
|
|
struct tree_entry *a = *((struct tree_entry**)_a);
|
|
|
|
struct tree_entry *b = *((struct tree_entry**)_b);
|
|
|
|
return base_name_compare(
|
|
|
|
a->name->str_dat, a->name->str_len, a->versions[1].mode,
|
|
|
|
b->name->str_dat, b->name->str_len, b->versions[1].mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* mktree(struct tree_content *t, int v, unsigned long *szp)
|
|
|
|
{
|
|
|
|
size_t maxlen = 0;
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned int i;
|
|
|
|
char *buf, *c;
|
|
|
|
|
2006-08-28 16:22:50 +00:00
|
|
|
if (!v)
|
|
|
|
qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
|
|
|
|
else
|
|
|
|
qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
|
2006-08-14 04:58:19 +00:00
|
|
|
|
|
|
|
for (i = 0; i < t->entry_count; i++) {
|
2006-08-28 16:22:50 +00:00
|
|
|
if (t->entries[i]->versions[v].mode)
|
|
|
|
maxlen += t->entries[i]->name->str_len + 34;
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
buf = c = xmalloc(maxlen);
|
|
|
|
for (i = 0; i < t->entry_count; i++) {
|
|
|
|
struct tree_entry *e = t->entries[i];
|
2006-08-28 16:22:50 +00:00
|
|
|
if (!e->versions[v].mode)
|
|
|
|
continue;
|
|
|
|
c += sprintf(c, "%o", e->versions[v].mode);
|
2006-08-14 04:58:19 +00:00
|
|
|
*c++ = ' ';
|
|
|
|
strcpy(c, e->name->str_dat);
|
|
|
|
c += e->name->str_len + 1;
|
2006-08-28 16:22:50 +00:00
|
|
|
hashcpy((unsigned char*)c, e->versions[v].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
c += 20;
|
|
|
|
}
|
2006-08-28 16:22:50 +00:00
|
|
|
|
|
|
|
*szp = c - buf;
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void store_tree(struct tree_entry *root)
|
|
|
|
{
|
|
|
|
struct tree_content *t = root->tree;
|
|
|
|
unsigned int i, j, del;
|
|
|
|
unsigned long vers1len;
|
|
|
|
void **vers1dat;
|
|
|
|
struct last_object lo;
|
|
|
|
|
|
|
|
if (!is_null_sha1(root->versions[1].sha1))
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < t->entry_count; i++) {
|
|
|
|
if (t->entries[i]->tree)
|
|
|
|
store_tree(t->entries[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_null_sha1(root->versions[0].sha1)
|
|
|
|
|| !find_object(root->versions[0].sha1)) {
|
|
|
|
lo.data = NULL;
|
|
|
|
lo.depth = 0;
|
|
|
|
} else {
|
|
|
|
lo.data = mktree(t, 0, &lo.len);
|
|
|
|
lo.depth = t->delta_depth;
|
|
|
|
hashcpy(lo.sha1, root->versions[0].sha1);
|
|
|
|
}
|
|
|
|
vers1dat = mktree(t, 1, &vers1len);
|
|
|
|
|
|
|
|
store_object(OBJ_TREE, vers1dat, vers1len,
|
|
|
|
&lo, root->versions[1].sha1, 0);
|
|
|
|
/* note: lo.dat (if created) was freed by store_object */
|
|
|
|
free(vers1dat);
|
|
|
|
|
|
|
|
t->delta_depth = lo.depth;
|
|
|
|
hashcpy(root->versions[0].sha1, root->versions[1].sha1);
|
|
|
|
for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
|
|
|
|
struct tree_entry *e = t->entries[i];
|
|
|
|
if (e->versions[1].mode) {
|
|
|
|
e->versions[0].mode = e->versions[1].mode;
|
|
|
|
hashcpy(e->versions[0].sha1, e->versions[1].sha1);
|
|
|
|
t->entries[j++] = e;
|
|
|
|
} else {
|
|
|
|
release_tree_entry(e);
|
|
|
|
del++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
t->entry_count -= del;
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int tree_content_set(
|
|
|
|
struct tree_entry *root,
|
|
|
|
const char *p,
|
|
|
|
const unsigned char *sha1,
|
|
|
|
const unsigned int mode)
|
|
|
|
{
|
|
|
|
struct tree_content *t = root->tree;
|
|
|
|
const char *slash1;
|
|
|
|
unsigned int i, n;
|
|
|
|
struct tree_entry *e;
|
|
|
|
|
|
|
|
slash1 = strchr(p, '/');
|
|
|
|
if (slash1)
|
|
|
|
n = slash1 - p;
|
|
|
|
else
|
|
|
|
n = strlen(p);
|
|
|
|
|
|
|
|
for (i = 0; i < t->entry_count; i++) {
|
|
|
|
e = t->entries[i];
|
|
|
|
if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
|
|
|
|
if (!slash1) {
|
2006-08-28 16:22:50 +00:00
|
|
|
if (e->versions[1].mode == mode
|
|
|
|
&& !hashcmp(e->versions[1].sha1, sha1))
|
2006-08-14 04:58:19 +00:00
|
|
|
return 0;
|
2006-08-28 16:22:50 +00:00
|
|
|
e->versions[1].mode = mode;
|
|
|
|
hashcpy(e->versions[1].sha1, sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (e->tree) {
|
2006-08-23 05:33:47 +00:00
|
|
|
release_tree_content_recursive(e->tree);
|
2006-08-14 04:58:19 +00:00
|
|
|
e->tree = NULL;
|
|
|
|
}
|
2006-08-28 16:22:50 +00:00
|
|
|
hashclr(root->versions[1].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2006-08-28 16:22:50 +00:00
|
|
|
if (!S_ISDIR(e->versions[1].mode)) {
|
2006-08-14 04:58:19 +00:00
|
|
|
e->tree = new_tree_content(8);
|
2006-08-28 16:22:50 +00:00
|
|
|
e->versions[1].mode = S_IFDIR;
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
|
|
|
if (!e->tree)
|
|
|
|
load_tree(e);
|
|
|
|
if (tree_content_set(e, slash1 + 1, sha1, mode)) {
|
2006-08-28 16:22:50 +00:00
|
|
|
hashclr(root->versions[1].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (t->entry_count == t->entry_capacity)
|
|
|
|
root->tree = t = grow_tree_content(t, 8);
|
|
|
|
e = new_tree_entry();
|
|
|
|
e->name = to_atom(p, n);
|
2006-08-28 16:22:50 +00:00
|
|
|
e->versions[0].mode = 0;
|
|
|
|
hashclr(e->versions[0].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
t->entries[t->entry_count++] = e;
|
|
|
|
if (slash1) {
|
|
|
|
e->tree = new_tree_content(8);
|
2006-08-28 16:22:50 +00:00
|
|
|
e->versions[1].mode = S_IFDIR;
|
2006-08-14 04:58:19 +00:00
|
|
|
tree_content_set(e, slash1 + 1, sha1, mode);
|
|
|
|
} else {
|
|
|
|
e->tree = NULL;
|
2006-08-28 16:22:50 +00:00
|
|
|
e->versions[1].mode = mode;
|
|
|
|
hashcpy(e->versions[1].sha1, sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
2006-08-28 16:22:50 +00:00
|
|
|
hashclr(root->versions[1].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tree_content_remove(struct tree_entry *root, const char *p)
|
|
|
|
{
|
|
|
|
struct tree_content *t = root->tree;
|
|
|
|
const char *slash1;
|
|
|
|
unsigned int i, n;
|
|
|
|
struct tree_entry *e;
|
|
|
|
|
|
|
|
slash1 = strchr(p, '/');
|
|
|
|
if (slash1)
|
|
|
|
n = slash1 - p;
|
|
|
|
else
|
|
|
|
n = strlen(p);
|
|
|
|
|
|
|
|
for (i = 0; i < t->entry_count; i++) {
|
|
|
|
e = t->entries[i];
|
|
|
|
if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
|
2006-08-28 16:22:50 +00:00
|
|
|
if (!slash1 || !S_ISDIR(e->versions[1].mode))
|
2006-08-14 04:58:19 +00:00
|
|
|
goto del_entry;
|
|
|
|
if (!e->tree)
|
|
|
|
load_tree(e);
|
|
|
|
if (tree_content_remove(e, slash1 + 1)) {
|
|
|
|
if (!e->tree->entry_count)
|
|
|
|
goto del_entry;
|
2006-08-28 16:22:50 +00:00
|
|
|
hashclr(root->versions[1].sha1);
|
2006-08-14 04:58:19 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
del_entry:
|
2006-08-28 16:22:50 +00:00
|
|
|
if (e->tree) {
|
|
|
|
release_tree_content_recursive(e->tree);
|
|
|
|
e->tree = NULL;
|
|
|
|
}
|
|
|
|
e->versions[1].mode = 0;
|
|
|
|
hashclr(e->versions[1].sha1);
|
|
|
|
hashclr(root->versions[1].sha1);
|
2006-08-08 04:46:13 +00:00
|
|
|
return 1;
|
2006-08-05 06:04:21 +00:00
|
|
|
}
|
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
static void init_pack_header()
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
2006-08-16 05:57:57 +00:00
|
|
|
struct pack_header hdr;
|
|
|
|
|
|
|
|
hdr.hdr_signature = htonl(PACK_SIGNATURE);
|
|
|
|
hdr.hdr_version = htonl(2);
|
|
|
|
hdr.hdr_entries = 0;
|
|
|
|
|
|
|
|
ywrite(pack_fd, &hdr, sizeof(hdr));
|
2006-08-24 08:37:35 +00:00
|
|
|
pack_size = sizeof(hdr);
|
2006-08-05 06:04:21 +00:00
|
|
|
}
|
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
static void fixup_header_footer()
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
|
|
|
SHA_CTX c;
|
|
|
|
char hdr[8];
|
|
|
|
unsigned long cnt;
|
|
|
|
char *buf;
|
|
|
|
size_t n;
|
|
|
|
|
2006-08-08 04:46:13 +00:00
|
|
|
if (lseek(pack_fd, 0, SEEK_SET) != 0)
|
2006-08-05 06:04:21 +00:00
|
|
|
die("Failed seeking to start: %s", strerror(errno));
|
|
|
|
|
|
|
|
SHA1_Init(&c);
|
2006-08-14 04:58:19 +00:00
|
|
|
yread(pack_fd, hdr, 8);
|
2006-08-05 06:04:21 +00:00
|
|
|
SHA1_Update(&c, hdr, 8);
|
|
|
|
|
|
|
|
cnt = htonl(object_count);
|
|
|
|
SHA1_Update(&c, &cnt, 4);
|
2006-08-14 04:58:19 +00:00
|
|
|
ywrite(pack_fd, &cnt, 4);
|
2006-08-05 06:04:21 +00:00
|
|
|
|
|
|
|
buf = xmalloc(128 * 1024);
|
|
|
|
for (;;) {
|
2006-08-08 04:46:13 +00:00
|
|
|
n = xread(pack_fd, buf, 128 * 1024);
|
2006-08-05 06:04:21 +00:00
|
|
|
if (n <= 0)
|
|
|
|
break;
|
|
|
|
SHA1_Update(&c, buf, n);
|
|
|
|
}
|
|
|
|
free(buf);
|
|
|
|
|
2006-08-08 04:46:13 +00:00
|
|
|
SHA1_Final(pack_sha1, &c);
|
2006-08-14 04:58:19 +00:00
|
|
|
ywrite(pack_fd, pack_sha1, sizeof(pack_sha1));
|
2006-08-05 06:04:21 +00:00
|
|
|
}
|
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
static int oecmp (const void *_a, const void *_b)
|
2006-08-05 06:04:21 +00:00
|
|
|
{
|
2006-08-06 17:51:39 +00:00
|
|
|
struct object_entry *a = *((struct object_entry**)_a);
|
|
|
|
struct object_entry *b = *((struct object_entry**)_b);
|
2006-08-28 14:46:58 +00:00
|
|
|
return hashcmp(a->sha1, b->sha1);
|
2006-08-06 17:51:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void write_index(const char *idx_name)
|
|
|
|
{
|
|
|
|
struct sha1file *f;
|
|
|
|
struct object_entry **idx, **c, **last;
|
|
|
|
struct object_entry *e;
|
2006-08-14 04:58:19 +00:00
|
|
|
struct object_entry_pool *o;
|
2006-08-06 17:51:39 +00:00
|
|
|
unsigned int array[256];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Build the sorted table of object IDs. */
|
|
|
|
idx = xmalloc(object_count * sizeof(struct object_entry*));
|
|
|
|
c = idx;
|
2006-08-14 04:58:19 +00:00
|
|
|
for (o = blocks; o; o = o->next_pool)
|
2006-08-08 04:03:59 +00:00
|
|
|
for (e = o->entries; e != o->next_free; e++)
|
|
|
|
*c++ = e;
|
2006-08-06 17:51:39 +00:00
|
|
|
last = idx + object_count;
|
|
|
|
qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
|
|
|
|
|
|
|
|
/* Generate the fan-out array. */
|
|
|
|
c = idx;
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
struct object_entry **next = c;;
|
|
|
|
while (next < last) {
|
|
|
|
if ((*next)->sha1[0] != i)
|
|
|
|
break;
|
|
|
|
next++;
|
|
|
|
}
|
|
|
|
array[i] = htonl(next - idx);
|
|
|
|
c = next;
|
|
|
|
}
|
|
|
|
|
|
|
|
f = sha1create("%s", idx_name);
|
|
|
|
sha1write(f, array, 256 * sizeof(int));
|
|
|
|
for (c = idx; c != last; c++) {
|
|
|
|
unsigned int offset = htonl((*c)->offset);
|
|
|
|
sha1write(f, &offset, 4);
|
|
|
|
sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
|
|
|
|
}
|
2006-08-08 04:46:13 +00:00
|
|
|
sha1write(f, pack_sha1, sizeof(pack_sha1));
|
2006-08-06 17:51:39 +00:00
|
|
|
sha1close(f, NULL, 1);
|
|
|
|
free(idx);
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void dump_branches()
|
|
|
|
{
|
|
|
|
static const char *msg = "fast-import";
|
|
|
|
unsigned int i;
|
|
|
|
struct branch *b;
|
|
|
|
struct ref_lock *lock;
|
|
|
|
|
|
|
|
for (i = 0; i < branch_table_sz; i++) {
|
|
|
|
for (b = branch_table[i]; b; b = b->table_next_branch) {
|
|
|
|
lock = lock_any_ref_for_update(b->name, NULL, 0);
|
|
|
|
if (!lock || write_ref_sha1(lock, b->sha1, msg) < 0)
|
|
|
|
die("Can't write %s", b->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-24 07:12:13 +00:00
|
|
|
static void dump_tags()
|
|
|
|
{
|
|
|
|
static const char *msg = "fast-import";
|
|
|
|
struct tag *t;
|
|
|
|
struct ref_lock *lock;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
|
|
|
|
for (t = first_tag; t; t = t->next_tag) {
|
|
|
|
sprintf(path, "refs/tags/%s", t->name);
|
|
|
|
lock = lock_any_ref_for_update(path, NULL, 0);
|
|
|
|
if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
|
|
|
|
die("Can't write %s", path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-25 20:03:04 +00:00
|
|
|
static void dump_marks_helper(FILE *f,
|
|
|
|
unsigned long base,
|
|
|
|
struct mark_set *m)
|
|
|
|
{
|
|
|
|
int k;
|
|
|
|
if (m->shift) {
|
|
|
|
for (k = 0; k < 1024; k++) {
|
|
|
|
if (m->data.sets[k])
|
|
|
|
dump_marks_helper(f, (base + k) << m->shift,
|
|
|
|
m->data.sets[k]);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (k = 0; k < 1024; k++) {
|
|
|
|
if (m->data.marked[k])
|
2006-08-26 03:07:06 +00:00
|
|
|
fprintf(f, ":%lu %s\n", base + k,
|
2006-08-25 20:03:04 +00:00
|
|
|
sha1_to_hex(m->data.marked[k]->sha1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dump_marks()
|
|
|
|
{
|
|
|
|
if (mark_file)
|
|
|
|
{
|
|
|
|
FILE *f = fopen(mark_file, "w");
|
|
|
|
dump_marks_helper(f, 0, marks);
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
static void read_next_command()
|
|
|
|
{
|
|
|
|
read_line(&command_buf, stdin, '\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cmd_mark()
|
|
|
|
{
|
|
|
|
if (!strncmp("mark :", command_buf.buf, 6)) {
|
2006-08-23 08:17:45 +00:00
|
|
|
next_mark = strtoul(command_buf.buf + 6, NULL, 10);
|
2006-08-15 00:16:28 +00:00
|
|
|
read_next_command();
|
|
|
|
}
|
|
|
|
else
|
2006-08-23 08:17:45 +00:00
|
|
|
next_mark = 0;
|
2006-08-15 00:16:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void* cmd_data (size_t *size)
|
|
|
|
{
|
|
|
|
size_t n = 0;
|
|
|
|
void *buffer;
|
|
|
|
size_t length;
|
|
|
|
|
|
|
|
if (strncmp("data ", command_buf.buf, 5))
|
|
|
|
die("Expected 'data n' command, found: %s", command_buf.buf);
|
|
|
|
|
|
|
|
length = strtoul(command_buf.buf + 5, NULL, 10);
|
|
|
|
buffer = xmalloc(length);
|
|
|
|
|
|
|
|
while (n < length) {
|
|
|
|
size_t s = fread((char*)buffer + n, 1, length - n, stdin);
|
|
|
|
if (!s && feof(stdin))
|
|
|
|
die("EOF in data (%lu bytes remaining)", length - n);
|
|
|
|
n += s;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fgetc(stdin) != '\n')
|
|
|
|
die("An lf did not trail the binary data as expected.");
|
|
|
|
|
|
|
|
*size = length;
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void cmd_new_blob()
|
2006-08-08 05:14:21 +00:00
|
|
|
{
|
2006-08-23 08:17:45 +00:00
|
|
|
size_t l;
|
|
|
|
void *d;
|
2006-08-15 00:16:28 +00:00
|
|
|
|
|
|
|
read_next_command();
|
|
|
|
cmd_mark();
|
2006-08-23 08:17:45 +00:00
|
|
|
d = cmd_data(&l);
|
2006-08-08 05:14:21 +00:00
|
|
|
|
2006-08-23 08:17:45 +00:00
|
|
|
if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
|
|
|
|
free(d);
|
2006-08-08 05:14:21 +00:00
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void unload_one_branch()
|
2006-08-08 07:36:45 +00:00
|
|
|
{
|
2006-08-24 08:37:35 +00:00
|
|
|
while (cur_active_branches
|
|
|
|
&& cur_active_branches >= max_active_branches) {
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned long min_commit = ULONG_MAX;
|
|
|
|
struct branch *e, *l = NULL, *p = NULL;
|
|
|
|
|
|
|
|
for (e = active_branches; e; e = e->active_next_branch) {
|
|
|
|
if (e->last_commit < min_commit) {
|
|
|
|
p = l;
|
|
|
|
min_commit = e->last_commit;
|
|
|
|
}
|
|
|
|
l = e;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p) {
|
|
|
|
e = p->active_next_branch;
|
|
|
|
p->active_next_branch = e->active_next_branch;
|
|
|
|
} else {
|
|
|
|
e = active_branches;
|
|
|
|
active_branches = e->active_next_branch;
|
|
|
|
}
|
|
|
|
e->active_next_branch = NULL;
|
|
|
|
if (e->branch_tree.tree) {
|
2006-08-23 05:33:47 +00:00
|
|
|
release_tree_content_recursive(e->branch_tree.tree);
|
2006-08-14 04:58:19 +00:00
|
|
|
e->branch_tree.tree = NULL;
|
|
|
|
}
|
|
|
|
cur_active_branches--;
|
2006-08-08 07:36:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void load_branch(struct branch *b)
|
2006-08-08 07:36:45 +00:00
|
|
|
{
|
2006-08-14 04:58:19 +00:00
|
|
|
load_tree(&b->branch_tree);
|
|
|
|
b->active_next_branch = active_branches;
|
|
|
|
active_branches = b;
|
|
|
|
cur_active_branches++;
|
2006-08-23 08:31:12 +00:00
|
|
|
branch_load_count++;
|
2006-08-08 07:36:45 +00:00
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void file_change_m(struct branch *b)
|
2006-08-08 07:36:45 +00:00
|
|
|
{
|
2006-08-15 00:16:28 +00:00
|
|
|
const char *p = command_buf.buf + 2;
|
|
|
|
char *p_uq;
|
|
|
|
const char *endp;
|
2006-08-14 06:50:18 +00:00
|
|
|
struct object_entry *oe;
|
2006-08-14 04:58:19 +00:00
|
|
|
unsigned char sha1[20];
|
2006-08-15 00:16:28 +00:00
|
|
|
unsigned int mode;
|
2006-08-14 06:50:18 +00:00
|
|
|
char type[20];
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
p = get_mode(p, &mode);
|
|
|
|
if (!p)
|
|
|
|
die("Corrupt mode: %s", command_buf.buf);
|
|
|
|
switch (mode) {
|
|
|
|
case S_IFREG | 0644:
|
|
|
|
case S_IFREG | 0755:
|
2006-08-21 07:29:13 +00:00
|
|
|
case S_IFLNK:
|
2006-08-15 00:16:28 +00:00
|
|
|
case 0644:
|
|
|
|
case 0755:
|
|
|
|
/* ok */
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
die("Corrupt mode: %s", command_buf.buf);
|
|
|
|
}
|
|
|
|
|
2006-08-23 08:17:45 +00:00
|
|
|
if (*p == ':') {
|
|
|
|
char *x;
|
|
|
|
oe = find_mark(strtoul(p + 1, &x, 10));
|
|
|
|
p = x;
|
|
|
|
} else {
|
|
|
|
if (get_sha1_hex(p, sha1))
|
|
|
|
die("Invalid SHA1: %s", command_buf.buf);
|
|
|
|
oe = find_object(sha1);
|
|
|
|
p += 40;
|
|
|
|
}
|
2006-08-15 00:16:28 +00:00
|
|
|
if (*p++ != ' ')
|
|
|
|
die("Missing space after SHA1: %s", command_buf.buf);
|
|
|
|
|
|
|
|
p_uq = unquote_c_style(p, &endp);
|
|
|
|
if (p_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after path in: %s", command_buf.buf);
|
|
|
|
p = p_uq;
|
|
|
|
}
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-14 06:50:18 +00:00
|
|
|
if (oe) {
|
|
|
|
if (oe->type != OBJ_BLOB)
|
2006-08-15 00:16:28 +00:00
|
|
|
die("Not a blob (actually a %s): %s",
|
|
|
|
command_buf.buf, type_names[oe->type]);
|
2006-08-14 06:50:18 +00:00
|
|
|
} else {
|
|
|
|
if (sha1_object_info(sha1, type, NULL))
|
2006-08-15 00:16:28 +00:00
|
|
|
die("Blob not found: %s", command_buf.buf);
|
2006-08-14 06:50:18 +00:00
|
|
|
if (strcmp(blob_type, type))
|
2006-08-15 00:16:28 +00:00
|
|
|
die("Not a blob (actually a %s): %s",
|
|
|
|
command_buf.buf, type);
|
2006-08-14 06:50:18 +00:00
|
|
|
}
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);
|
|
|
|
|
|
|
|
if (p_uq)
|
|
|
|
free(p_uq);
|
2006-08-14 04:58:19 +00:00
|
|
|
}
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void file_change_d(struct branch *b)
|
|
|
|
{
|
2006-08-15 00:16:28 +00:00
|
|
|
const char *p = command_buf.buf + 2;
|
|
|
|
char *p_uq;
|
|
|
|
const char *endp;
|
|
|
|
|
|
|
|
p_uq = unquote_c_style(p, &endp);
|
|
|
|
if (p_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after path in: %s", command_buf.buf);
|
|
|
|
p = p_uq;
|
|
|
|
}
|
|
|
|
tree_content_remove(&b->branch_tree, p);
|
|
|
|
if (p_uq)
|
|
|
|
free(p_uq);
|
2006-08-08 07:36:45 +00:00
|
|
|
}
|
|
|
|
|
2006-08-24 22:45:26 +00:00
|
|
|
static void cmd_from(struct branch *b)
|
|
|
|
{
|
|
|
|
const char *from, *endp;
|
|
|
|
char *str_uq;
|
|
|
|
struct branch *s;
|
|
|
|
|
|
|
|
if (strncmp("from ", command_buf.buf, 5))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (b->last_commit)
|
|
|
|
die("Can't reinitailize branch %s", b->name);
|
|
|
|
|
|
|
|
from = strchr(command_buf.buf, ' ') + 1;
|
|
|
|
str_uq = unquote_c_style(from, &endp);
|
|
|
|
if (str_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after string in: %s", command_buf.buf);
|
|
|
|
from = str_uq;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = lookup_branch(from);
|
|
|
|
if (b == s)
|
|
|
|
die("Can't create a branch from itself: %s", b->name);
|
|
|
|
else if (s) {
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned char *t = s->branch_tree.versions[1].sha1;
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(b->sha1, s->sha1);
|
2006-08-28 16:22:50 +00:00
|
|
|
hashcpy(b->branch_tree.versions[0].sha1, t);
|
|
|
|
hashcpy(b->branch_tree.versions[1].sha1, t);
|
2006-08-24 22:45:26 +00:00
|
|
|
} else if (*from == ':') {
|
|
|
|
unsigned long idnum = strtoul(from + 1, NULL, 10);
|
|
|
|
struct object_entry *oe = find_mark(idnum);
|
|
|
|
unsigned long size;
|
2006-08-28 16:22:50 +00:00
|
|
|
unsigned int depth;
|
2006-08-24 22:45:26 +00:00
|
|
|
char *buf;
|
|
|
|
if (oe->type != OBJ_COMMIT)
|
|
|
|
die("Mark :%lu not a commit", idnum);
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(b->sha1, oe->sha1);
|
2006-08-28 16:22:50 +00:00
|
|
|
buf = unpack_entry(oe->offset, &size, &depth);
|
2006-08-24 22:45:26 +00:00
|
|
|
if (!buf || size < 46)
|
|
|
|
die("Not a valid commit: %s", from);
|
|
|
|
if (memcmp("tree ", buf, 5)
|
2006-08-28 16:22:50 +00:00
|
|
|
|| get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
|
2006-08-24 22:45:26 +00:00
|
|
|
die("The commit %s is corrupt", sha1_to_hex(b->sha1));
|
|
|
|
free(buf);
|
2006-08-28 16:22:50 +00:00
|
|
|
hashcpy(b->branch_tree.versions[0].sha1,
|
|
|
|
b->branch_tree.versions[1].sha1);
|
2006-08-24 22:45:26 +00:00
|
|
|
} else if (!get_sha1(from, b->sha1)) {
|
2006-08-28 16:22:50 +00:00
|
|
|
if (is_null_sha1(b->sha1)) {
|
|
|
|
hashclr(b->branch_tree.versions[0].sha1);
|
|
|
|
hashclr(b->branch_tree.versions[1].sha1);
|
|
|
|
} else {
|
2006-08-24 22:45:26 +00:00
|
|
|
unsigned long size;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
buf = read_object_with_reference(b->sha1,
|
|
|
|
type_names[OBJ_COMMIT], &size, b->sha1);
|
|
|
|
if (!buf || size < 46)
|
|
|
|
die("Not a valid commit: %s", from);
|
|
|
|
if (memcmp("tree ", buf, 5)
|
2006-08-28 16:22:50 +00:00
|
|
|
|| get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
|
2006-08-24 22:45:26 +00:00
|
|
|
die("The commit %s is corrupt", sha1_to_hex(b->sha1));
|
|
|
|
free(buf);
|
2006-08-28 16:22:50 +00:00
|
|
|
hashcpy(b->branch_tree.versions[0].sha1,
|
|
|
|
b->branch_tree.versions[1].sha1);
|
2006-08-24 22:45:26 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
die("Invalid ref name or SHA1 expression: %s", from);
|
|
|
|
|
|
|
|
read_next_command();
|
|
|
|
}
|
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
static void cmd_new_commit()
|
2006-08-08 07:36:45 +00:00
|
|
|
{
|
2006-08-15 00:16:28 +00:00
|
|
|
struct branch *b;
|
|
|
|
void *msg;
|
|
|
|
size_t msglen;
|
|
|
|
char *str_uq;
|
|
|
|
const char *endp;
|
|
|
|
char *sp;
|
|
|
|
char *author = NULL;
|
|
|
|
char *committer = NULL;
|
|
|
|
char *body;
|
|
|
|
|
|
|
|
/* Obtain the branch name from the rest of our command */
|
|
|
|
sp = strchr(command_buf.buf, ' ') + 1;
|
|
|
|
str_uq = unquote_c_style(sp, &endp);
|
|
|
|
if (str_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after ref in: %s", command_buf.buf);
|
|
|
|
sp = str_uq;
|
|
|
|
}
|
|
|
|
b = lookup_branch(sp);
|
2006-08-14 04:58:19 +00:00
|
|
|
if (!b)
|
2006-08-24 22:45:26 +00:00
|
|
|
b = new_branch(sp);
|
2006-08-15 00:16:28 +00:00
|
|
|
if (str_uq)
|
|
|
|
free(str_uq);
|
|
|
|
|
|
|
|
read_next_command();
|
|
|
|
cmd_mark();
|
|
|
|
if (!strncmp("author ", command_buf.buf, 7)) {
|
|
|
|
author = strdup(command_buf.buf);
|
|
|
|
read_next_command();
|
|
|
|
}
|
|
|
|
if (!strncmp("committer ", command_buf.buf, 10)) {
|
|
|
|
committer = strdup(command_buf.buf);
|
|
|
|
read_next_command();
|
|
|
|
}
|
|
|
|
if (!committer)
|
|
|
|
die("Expected committer but didn't get one");
|
|
|
|
msg = cmd_data(&msglen);
|
2006-08-25 02:38:13 +00:00
|
|
|
read_next_command();
|
|
|
|
cmd_from(b);
|
2006-08-15 00:16:28 +00:00
|
|
|
|
|
|
|
/* ensure the branch is active/loaded */
|
2006-08-24 08:37:35 +00:00
|
|
|
if (!b->branch_tree.tree || !max_active_branches) {
|
2006-08-14 04:58:19 +00:00
|
|
|
unload_one_branch();
|
|
|
|
load_branch(b);
|
|
|
|
}
|
2006-08-08 07:36:45 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
/* file_change* */
|
|
|
|
for (;;) {
|
2006-08-15 00:16:28 +00:00
|
|
|
if (1 == command_buf.len)
|
2006-08-14 04:58:19 +00:00
|
|
|
break;
|
2006-08-15 00:16:28 +00:00
|
|
|
else if (!strncmp("M ", command_buf.buf, 2))
|
2006-08-14 04:58:19 +00:00
|
|
|
file_change_m(b);
|
2006-08-15 00:16:28 +00:00
|
|
|
else if (!strncmp("D ", command_buf.buf, 2))
|
2006-08-14 04:58:19 +00:00
|
|
|
file_change_d(b);
|
|
|
|
else
|
2006-08-15 00:16:28 +00:00
|
|
|
die("Unsupported file_change: %s", command_buf.buf);
|
2006-08-25 02:38:13 +00:00
|
|
|
read_next_command();
|
2006-08-08 07:36:45 +00:00
|
|
|
}
|
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
/* build the tree and the commit */
|
2006-08-14 04:58:19 +00:00
|
|
|
store_tree(&b->branch_tree);
|
2006-08-15 00:16:28 +00:00
|
|
|
body = xmalloc(97 + msglen
|
|
|
|
+ (author
|
|
|
|
? strlen(author) + strlen(committer)
|
|
|
|
: 2 * strlen(committer)));
|
|
|
|
sp = body;
|
2006-08-28 16:22:50 +00:00
|
|
|
sp += sprintf(sp, "tree %s\n",
|
|
|
|
sha1_to_hex(b->branch_tree.versions[1].sha1));
|
2006-08-28 14:46:58 +00:00
|
|
|
if (!is_null_sha1(b->sha1))
|
2006-08-15 00:16:28 +00:00
|
|
|
sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
|
|
|
|
if (author)
|
|
|
|
sp += sprintf(sp, "%s\n", author);
|
|
|
|
else
|
|
|
|
sp += sprintf(sp, "author %s\n", committer + 10);
|
|
|
|
sp += sprintf(sp, "%s\n\n", committer);
|
|
|
|
memcpy(sp, msg, msglen);
|
|
|
|
sp += msglen;
|
|
|
|
if (author)
|
|
|
|
free(author);
|
|
|
|
free(committer);
|
|
|
|
free(msg);
|
|
|
|
|
2006-08-23 08:17:45 +00:00
|
|
|
store_object(OBJ_COMMIT, body, sp - body, NULL, b->sha1, next_mark);
|
2006-08-14 04:58:19 +00:00
|
|
|
free(body);
|
|
|
|
b->last_commit = object_count_by_type[OBJ_COMMIT];
|
2006-08-26 03:07:06 +00:00
|
|
|
|
|
|
|
if (branch_log) {
|
|
|
|
int need_dq = quote_c_style(b->name, NULL, NULL, 0);
|
|
|
|
fprintf(branch_log, "commit ");
|
|
|
|
if (need_dq) {
|
|
|
|
fputc('"', branch_log);
|
|
|
|
quote_c_style(b->name, NULL, branch_log, 0);
|
|
|
|
fputc('"', branch_log);
|
|
|
|
} else
|
|
|
|
fprintf(branch_log, "%s", b->name);
|
|
|
|
fprintf(branch_log," :%lu %s\n",next_mark,sha1_to_hex(b->sha1));
|
|
|
|
}
|
2006-08-08 07:36:45 +00:00
|
|
|
}
|
|
|
|
|
2006-08-24 07:12:13 +00:00
|
|
|
static void cmd_new_tag()
|
|
|
|
{
|
|
|
|
char *str_uq;
|
|
|
|
const char *endp;
|
|
|
|
char *sp;
|
|
|
|
const char *from;
|
|
|
|
char *tagger;
|
|
|
|
struct branch *s;
|
|
|
|
void *msg;
|
|
|
|
size_t msglen;
|
|
|
|
char *body;
|
|
|
|
struct tag *t;
|
2006-08-26 03:07:06 +00:00
|
|
|
unsigned long from_mark = 0;
|
2006-08-24 07:12:13 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
/* Obtain the new tag name from the rest of our command */
|
|
|
|
sp = strchr(command_buf.buf, ' ') + 1;
|
|
|
|
str_uq = unquote_c_style(sp, &endp);
|
|
|
|
if (str_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after tag name in: %s", command_buf.buf);
|
|
|
|
sp = str_uq;
|
|
|
|
}
|
|
|
|
t = pool_alloc(sizeof(struct tag));
|
|
|
|
t->next_tag = NULL;
|
|
|
|
t->name = pool_strdup(sp);
|
|
|
|
if (last_tag)
|
|
|
|
last_tag->next_tag = t;
|
|
|
|
else
|
|
|
|
first_tag = t;
|
|
|
|
last_tag = t;
|
|
|
|
if (str_uq)
|
|
|
|
free(str_uq);
|
|
|
|
read_next_command();
|
|
|
|
|
|
|
|
/* from ... */
|
|
|
|
if (strncmp("from ", command_buf.buf, 5))
|
|
|
|
die("Expected from command, got %s", command_buf.buf);
|
|
|
|
|
|
|
|
from = strchr(command_buf.buf, ' ') + 1;
|
|
|
|
str_uq = unquote_c_style(from, &endp);
|
|
|
|
if (str_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after string in: %s", command_buf.buf);
|
|
|
|
from = str_uq;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = lookup_branch(from);
|
|
|
|
if (s) {
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(sha1, s->sha1);
|
2006-08-24 07:12:13 +00:00
|
|
|
} else if (*from == ':') {
|
2006-08-26 03:07:06 +00:00
|
|
|
from_mark = strtoul(from + 1, NULL, 10);
|
|
|
|
struct object_entry *oe = find_mark(from_mark);
|
2006-08-24 07:12:13 +00:00
|
|
|
if (oe->type != OBJ_COMMIT)
|
2006-08-26 03:07:06 +00:00
|
|
|
die("Mark :%lu not a commit", from_mark);
|
2006-08-28 14:46:58 +00:00
|
|
|
hashcpy(sha1, oe->sha1);
|
2006-08-24 07:12:13 +00:00
|
|
|
} else if (!get_sha1(from, sha1)) {
|
|
|
|
unsigned long size;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
buf = read_object_with_reference(sha1,
|
|
|
|
type_names[OBJ_COMMIT], &size, sha1);
|
|
|
|
if (!buf || size < 46)
|
|
|
|
die("Not a valid commit: %s", from);
|
|
|
|
free(buf);
|
|
|
|
} else
|
|
|
|
die("Invalid ref name or SHA1 expression: %s", from);
|
|
|
|
|
|
|
|
if (str_uq)
|
|
|
|
free(str_uq);
|
|
|
|
read_next_command();
|
|
|
|
|
|
|
|
/* tagger ... */
|
|
|
|
if (strncmp("tagger ", command_buf.buf, 7))
|
|
|
|
die("Expected tagger command, got %s", command_buf.buf);
|
|
|
|
tagger = strdup(command_buf.buf);
|
|
|
|
|
|
|
|
/* tag payload/message */
|
|
|
|
read_next_command();
|
|
|
|
msg = cmd_data(&msglen);
|
|
|
|
|
|
|
|
/* build the tag object */
|
|
|
|
body = xmalloc(67 + strlen(t->name) + strlen(tagger) + msglen);
|
|
|
|
sp = body;
|
|
|
|
sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
|
|
|
|
sp += sprintf(sp, "type %s\n", type_names[OBJ_COMMIT]);
|
|
|
|
sp += sprintf(sp, "tag %s\n", t->name);
|
|
|
|
sp += sprintf(sp, "%s\n\n", tagger);
|
|
|
|
memcpy(sp, msg, msglen);
|
|
|
|
sp += msglen;
|
|
|
|
free(tagger);
|
|
|
|
free(msg);
|
|
|
|
|
|
|
|
store_object(OBJ_TAG, body, sp - body, NULL, t->sha1, 0);
|
|
|
|
free(body);
|
2006-08-26 03:07:06 +00:00
|
|
|
|
|
|
|
if (branch_log) {
|
|
|
|
int need_dq = quote_c_style(t->name, NULL, NULL, 0);
|
|
|
|
fprintf(branch_log, "tag ");
|
|
|
|
if (need_dq) {
|
|
|
|
fputc('"', branch_log);
|
|
|
|
quote_c_style(t->name, NULL, branch_log, 0);
|
|
|
|
fputc('"', branch_log);
|
|
|
|
} else
|
|
|
|
fprintf(branch_log, "%s", t->name);
|
|
|
|
fprintf(branch_log," :%lu %s\n",from_mark,sha1_to_hex(t->sha1));
|
|
|
|
}
|
2006-08-24 07:12:13 +00:00
|
|
|
}
|
|
|
|
|
2006-08-27 10:20:49 +00:00
|
|
|
static void cmd_reset_branch()
|
|
|
|
{
|
|
|
|
struct branch *b;
|
|
|
|
char *str_uq;
|
|
|
|
const char *endp;
|
|
|
|
char *sp;
|
|
|
|
|
|
|
|
/* Obtain the branch name from the rest of our command */
|
|
|
|
sp = strchr(command_buf.buf, ' ') + 1;
|
|
|
|
str_uq = unquote_c_style(sp, &endp);
|
|
|
|
if (str_uq) {
|
|
|
|
if (*endp)
|
|
|
|
die("Garbage after ref in: %s", command_buf.buf);
|
|
|
|
sp = str_uq;
|
|
|
|
}
|
|
|
|
b = lookup_branch(sp);
|
|
|
|
if (b) {
|
|
|
|
b->last_commit = 0;
|
|
|
|
if (b->branch_tree.tree) {
|
|
|
|
release_tree_content_recursive(b->branch_tree.tree);
|
|
|
|
b->branch_tree.tree = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (str_uq)
|
|
|
|
free(str_uq);
|
|
|
|
}
|
|
|
|
|
2006-08-23 06:00:31 +00:00
|
|
|
static const char fast_import_usage[] =
|
2006-08-26 03:07:06 +00:00
|
|
|
"git-fast-import [--objects=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file] [--branch-log=log] temp.pack";
|
2006-08-23 06:00:31 +00:00
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
int main(int argc, const char **argv)
|
|
|
|
{
|
2006-08-23 06:00:31 +00:00
|
|
|
const char *base_name;
|
|
|
|
int i;
|
|
|
|
unsigned long est_obj_cnt = 1000;
|
2006-08-06 17:51:39 +00:00
|
|
|
char *pack_name;
|
|
|
|
char *idx_name;
|
2006-08-08 05:14:21 +00:00
|
|
|
struct stat sb;
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-14 04:58:19 +00:00
|
|
|
setup_ident();
|
|
|
|
git_config(git_default_config);
|
2006-08-27 09:53:48 +00:00
|
|
|
page_size = getpagesize();
|
2006-08-14 04:58:19 +00:00
|
|
|
|
2006-08-23 06:00:31 +00:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *a = argv[i];
|
|
|
|
|
|
|
|
if (*a != '-' || !strcmp(a, "--"))
|
|
|
|
break;
|
|
|
|
else if (!strncmp(a, "--objects=", 10))
|
|
|
|
est_obj_cnt = strtoul(a + 10, NULL, 0);
|
|
|
|
else if (!strncmp(a, "--depth=", 8))
|
|
|
|
max_depth = strtoul(a + 8, NULL, 0);
|
|
|
|
else if (!strncmp(a, "--active-branches=", 18))
|
|
|
|
max_active_branches = strtoul(a + 18, NULL, 0);
|
2006-08-25 20:03:04 +00:00
|
|
|
else if (!strncmp(a, "--export-marks=", 15))
|
|
|
|
mark_file = a + 15;
|
2006-08-26 03:07:06 +00:00
|
|
|
else if (!strncmp(a, "--branch-log=", 13)) {
|
|
|
|
branch_log = fopen(a + 13, "w");
|
|
|
|
if (!branch_log)
|
|
|
|
die("Can't create %s: %s", a + 13, strerror(errno));
|
|
|
|
}
|
2006-08-23 06:00:31 +00:00
|
|
|
else
|
|
|
|
die("unknown option %s", a);
|
|
|
|
}
|
|
|
|
if ((i+1) != argc)
|
|
|
|
usage(fast_import_usage);
|
|
|
|
base_name = argv[i];
|
|
|
|
|
2006-08-06 17:51:39 +00:00
|
|
|
pack_name = xmalloc(strlen(base_name) + 6);
|
|
|
|
sprintf(pack_name, "%s.pack", base_name);
|
|
|
|
idx_name = xmalloc(strlen(base_name) + 5);
|
|
|
|
sprintf(idx_name, "%s.idx", base_name);
|
|
|
|
|
2006-08-08 04:46:13 +00:00
|
|
|
pack_fd = open(pack_name, O_RDWR|O_CREAT|O_EXCL, 0666);
|
|
|
|
if (pack_fd < 0)
|
2006-08-08 05:14:21 +00:00
|
|
|
die("Can't create %s: %s", pack_name, strerror(errno));
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-15 00:16:28 +00:00
|
|
|
init_pack_header();
|
2006-08-08 04:03:59 +00:00
|
|
|
alloc_objects(est_obj_cnt);
|
2006-08-15 00:16:28 +00:00
|
|
|
strbuf_init(&command_buf);
|
2006-08-14 04:58:19 +00:00
|
|
|
|
|
|
|
atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
|
|
|
|
branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
|
|
|
|
avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
|
2006-08-23 08:17:45 +00:00
|
|
|
marks = pool_calloc(1, sizeof(struct mark_set));
|
2006-08-14 04:58:19 +00:00
|
|
|
|
2006-08-05 06:04:21 +00:00
|
|
|
for (;;) {
|
2006-08-15 00:16:28 +00:00
|
|
|
read_next_command();
|
|
|
|
if (command_buf.eof)
|
2006-08-05 06:04:21 +00:00
|
|
|
break;
|
2006-08-15 00:16:28 +00:00
|
|
|
else if (!strcmp("blob", command_buf.buf))
|
|
|
|
cmd_new_blob();
|
|
|
|
else if (!strncmp("commit ", command_buf.buf, 7))
|
|
|
|
cmd_new_commit();
|
2006-08-24 07:12:13 +00:00
|
|
|
else if (!strncmp("tag ", command_buf.buf, 4))
|
|
|
|
cmd_new_tag();
|
2006-08-27 10:20:49 +00:00
|
|
|
else if (!strncmp("reset ", command_buf.buf, 6))
|
|
|
|
cmd_reset_branch();
|
2006-08-15 00:16:28 +00:00
|
|
|
else
|
|
|
|
die("Unsupported command: %s", command_buf.buf);
|
2006-08-05 06:04:21 +00:00
|
|
|
}
|
2006-08-15 00:16:28 +00:00
|
|
|
|
2006-08-05 06:04:21 +00:00
|
|
|
fixup_header_footer();
|
2006-08-08 04:46:13 +00:00
|
|
|
close(pack_fd);
|
2006-08-06 17:51:39 +00:00
|
|
|
write_index(idx_name);
|
2006-08-14 04:58:19 +00:00
|
|
|
dump_branches();
|
2006-08-24 07:12:13 +00:00
|
|
|
dump_tags();
|
2006-08-25 20:03:04 +00:00
|
|
|
dump_marks();
|
2006-08-28 00:13:44 +00:00
|
|
|
if (branch_log)
|
|
|
|
fclose(branch_log);
|
2006-08-06 17:51:39 +00:00
|
|
|
|
2006-08-08 05:14:21 +00:00
|
|
|
fprintf(stderr, "%s statistics:\n", argv[0]);
|
|
|
|
fprintf(stderr, "---------------------------------------------------\n");
|
|
|
|
fprintf(stderr, "Alloc'd objects: %10lu (%10lu overflow )\n", alloc_count, alloc_count - est_obj_cnt);
|
|
|
|
fprintf(stderr, "Total objects: %10lu (%10lu duplicates)\n", object_count, duplicate_count);
|
2006-08-28 16:22:50 +00:00
|
|
|
fprintf(stderr, " blobs : %10lu (%10lu duplicates %10lu deltas)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB]);
|
|
|
|
fprintf(stderr, " trees : %10lu (%10lu duplicates %10lu deltas)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE]);
|
|
|
|
fprintf(stderr, " commits: %10lu (%10lu duplicates %10lu deltas)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT]);
|
|
|
|
fprintf(stderr, " tags : %10lu (%10lu duplicates %10lu deltas)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG]);
|
2006-08-23 08:31:12 +00:00
|
|
|
fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
|
2006-08-23 08:17:45 +00:00
|
|
|
fprintf(stderr, " marks: %10u (%10lu unique )\n", (1 << marks->shift) * 1024, marks_set_count);
|
2006-08-23 08:31:12 +00:00
|
|
|
fprintf(stderr, " atoms: %10u\n", atom_cnt);
|
2006-08-14 06:50:18 +00:00
|
|
|
fprintf(stderr, "Memory total: %10lu KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
|
|
|
|
fprintf(stderr, " pools: %10lu KiB\n", total_allocd/1024);
|
|
|
|
fprintf(stderr, " objects: %10lu KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
|
2006-08-24 08:37:35 +00:00
|
|
|
fprintf(stderr, "Pack remaps: %10lu\n", remap_count);
|
2006-08-08 05:14:21 +00:00
|
|
|
fprintf(stderr, "---------------------------------------------------\n");
|
|
|
|
|
|
|
|
stat(pack_name, &sb);
|
|
|
|
fprintf(stderr, "Pack size: %10lu KiB\n", (unsigned long)(sb.st_size/1024));
|
|
|
|
stat(idx_name, &sb);
|
|
|
|
fprintf(stderr, "Index size: %10lu KiB\n", (unsigned long)(sb.st_size/1024));
|
|
|
|
|
|
|
|
fprintf(stderr, "\n");
|
2006-08-05 06:04:21 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|