2005-04-07 22:16:10 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-07 22:13:13 +00:00
|
|
|
#include "cache.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "tree.h"
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-07-11 03:53:44 +00:00
|
|
|
static int missing_ok = 0;
|
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
static int check_valid_sha1(unsigned char *sha1)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* If we were anal, we'd check that the sha1 of the contents actually matches */
|
2005-06-25 18:23:36 +00:00
|
|
|
ret = has_sha1_file(sha1);
|
|
|
|
if (ret == 0)
|
|
|
|
perror(sha1_file_name(sha1));
|
|
|
|
return ret ? 0 : -1;
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|
|
|
|
|
2005-04-10 00:09:34 +00:00
|
|
|
static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)
|
2005-04-07 22:13:13 +00:00
|
|
|
{
|
2005-04-10 00:09:34 +00:00
|
|
|
unsigned char subdir_sha1[20];
|
2005-04-08 16:59:28 +00:00
|
|
|
unsigned long size, offset;
|
2005-04-07 22:13:13 +00:00
|
|
|
char *buffer;
|
2005-04-25 17:19:53 +00:00
|
|
|
int nr;
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-10 00:09:34 +00:00
|
|
|
/* Guess at some random initial size */
|
|
|
|
size = 8192;
|
2005-04-26 19:00:58 +00:00
|
|
|
buffer = xmalloc(size);
|
2005-04-25 17:19:53 +00:00
|
|
|
offset = 0;
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-10 00:09:34 +00:00
|
|
|
nr = 0;
|
2005-05-08 14:15:59 +00:00
|
|
|
while (nr < maxentries) {
|
2005-04-10 00:09:34 +00:00
|
|
|
struct cache_entry *ce = cachep[nr];
|
|
|
|
const char *pathname = ce->name, *filename, *dirname;
|
2005-04-15 17:44:27 +00:00
|
|
|
int pathlen = ce_namelen(ce), entrylen;
|
2005-04-10 00:09:34 +00:00
|
|
|
unsigned char *sha1;
|
|
|
|
unsigned int mode;
|
|
|
|
|
|
|
|
/* Did we hit the end of the directory? Return how many we wrote */
|
|
|
|
if (baselen >= pathlen || memcmp(base, pathname, baselen))
|
|
|
|
break;
|
|
|
|
|
|
|
|
sha1 = ce->sha1;
|
2005-04-15 17:44:27 +00:00
|
|
|
mode = ntohl(ce->ce_mode);
|
2005-04-10 00:09:34 +00:00
|
|
|
|
|
|
|
/* Do we have _further_ subdirectories? */
|
|
|
|
filename = pathname + baselen;
|
|
|
|
dirname = strchr(filename, '/');
|
|
|
|
if (dirname) {
|
|
|
|
int subdir_written;
|
|
|
|
|
|
|
|
subdir_written = write_tree(cachep + nr, maxentries - nr, pathname, dirname-pathname+1, subdir_sha1);
|
|
|
|
nr += subdir_written;
|
|
|
|
|
|
|
|
/* Now we need to write out the directory entry into this tree.. */
|
|
|
|
mode = S_IFDIR;
|
|
|
|
pathlen = dirname - pathname;
|
|
|
|
|
|
|
|
/* ..but the directory entry doesn't count towards the total count */
|
|
|
|
nr--;
|
|
|
|
sha1 = subdir_sha1;
|
|
|
|
}
|
|
|
|
|
2005-07-11 03:53:44 +00:00
|
|
|
if (!missing_ok && check_valid_sha1(sha1) < 0)
|
2005-04-07 22:13:13 +00:00
|
|
|
exit(1);
|
2005-04-10 00:09:34 +00:00
|
|
|
|
|
|
|
entrylen = pathlen - baselen;
|
|
|
|
if (offset + entrylen + 100 > size) {
|
|
|
|
size = alloc_nr(offset + entrylen + 100);
|
2005-04-26 19:00:58 +00:00
|
|
|
buffer = xrealloc(buffer, size);
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|
2005-04-10 00:09:34 +00:00
|
|
|
offset += sprintf(buffer + offset, "%o %.*s", mode, entrylen, filename);
|
2005-04-07 22:13:13 +00:00
|
|
|
buffer[offset++] = 0;
|
2005-04-10 00:09:34 +00:00
|
|
|
memcpy(buffer + offset, sha1, 20);
|
2005-04-07 22:13:13 +00:00
|
|
|
offset += 20;
|
2005-04-10 00:09:34 +00:00
|
|
|
nr++;
|
2005-05-08 14:15:59 +00:00
|
|
|
}
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2006-04-02 12:44:09 +00:00
|
|
|
write_sha1_file(buffer, offset, tree_type, returnsha1);
|
2005-04-17 17:55:12 +00:00
|
|
|
free(buffer);
|
2005-04-10 00:09:34 +00:00
|
|
|
return nr;
|
|
|
|
}
|
|
|
|
|
2005-12-06 06:30:07 +00:00
|
|
|
static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
|
|
|
|
|
2005-04-10 00:09:34 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
2005-05-07 19:22:02 +00:00
|
|
|
int i, funny;
|
2005-11-26 08:50:02 +00:00
|
|
|
int entries;
|
2005-04-10 00:09:34 +00:00
|
|
|
unsigned char sha1[20];
|
2005-07-11 03:53:44 +00:00
|
|
|
|
2005-11-26 08:50:02 +00:00
|
|
|
setup_git_directory();
|
|
|
|
|
|
|
|
entries = read_cache();
|
2005-07-29 09:00:45 +00:00
|
|
|
if (argc == 2) {
|
2005-07-11 03:53:44 +00:00
|
|
|
if (!strcmp(argv[1], "--missing-ok"))
|
|
|
|
missing_ok = 1;
|
|
|
|
else
|
2005-12-06 06:30:07 +00:00
|
|
|
die(write_tree_usage);
|
2005-07-11 03:53:44 +00:00
|
|
|
}
|
|
|
|
|
2005-07-29 09:00:45 +00:00
|
|
|
if (argc > 2)
|
2005-07-11 03:53:44 +00:00
|
|
|
die("too many options");
|
2005-04-10 00:09:34 +00:00
|
|
|
|
2005-05-08 14:15:59 +00:00
|
|
|
if (entries < 0)
|
2005-05-19 11:17:16 +00:00
|
|
|
die("git-write-tree: error reading cache");
|
2005-04-16 05:04:54 +00:00
|
|
|
|
|
|
|
/* Verify that the tree is merged */
|
2005-05-07 19:22:02 +00:00
|
|
|
funny = 0;
|
2005-04-16 05:04:54 +00:00
|
|
|
for (i = 0; i < entries; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
2006-02-09 05:15:24 +00:00
|
|
|
if (ce_stage(ce)) {
|
2005-05-07 19:22:02 +00:00
|
|
|
if (10 < ++funny) {
|
2005-04-16 05:04:54 +00:00
|
|
|
fprintf(stderr, "...\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "%s: unmerged (%s)\n", ce->name, sha1_to_hex(ce->sha1));
|
|
|
|
}
|
|
|
|
}
|
2005-05-07 19:22:02 +00:00
|
|
|
if (funny)
|
2005-05-19 11:17:16 +00:00
|
|
|
die("git-write-tree: not able to write tree");
|
2005-05-07 19:22:02 +00:00
|
|
|
|
|
|
|
/* Also verify that the cache does not have path and path/file
|
|
|
|
* at the same time. At this point we know the cache has only
|
|
|
|
* stage 0 entries.
|
|
|
|
*/
|
|
|
|
funny = 0;
|
|
|
|
for (i = 0; i < entries - 1; i++) {
|
|
|
|
/* path/file always comes after path because of the way
|
|
|
|
* the cache is sorted. Also path can appear only once,
|
|
|
|
* which means conflicting one would immediately follow.
|
|
|
|
*/
|
|
|
|
const char *this_name = active_cache[i]->name;
|
|
|
|
const char *next_name = active_cache[i+1]->name;
|
|
|
|
int this_len = strlen(this_name);
|
|
|
|
if (this_len < strlen(next_name) &&
|
|
|
|
strncmp(this_name, next_name, this_len) == 0 &&
|
|
|
|
next_name[this_len] == '/') {
|
|
|
|
if (10 < ++funny) {
|
|
|
|
fprintf(stderr, "...\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "You have both %s and %s\n",
|
|
|
|
this_name, next_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (funny)
|
2005-05-19 11:17:16 +00:00
|
|
|
die("git-write-tree: not able to write tree");
|
2005-04-16 05:04:54 +00:00
|
|
|
|
|
|
|
/* Ok, write it out */
|
2005-04-10 00:09:34 +00:00
|
|
|
if (write_tree(active_cache, entries, "", 0, sha1) != entries)
|
2005-05-19 11:17:16 +00:00
|
|
|
die("git-write-tree: internal error");
|
2005-04-10 00:09:34 +00:00
|
|
|
printf("%s\n", sha1_to_hex(sha1));
|
2005-04-07 22:13:13 +00:00
|
|
|
return 0;
|
|
|
|
}
|