2005-04-08 00:16:10 +02:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2006-06-13 22:21:42 +02:00
|
|
|
#include "builtin.h"
|
2005-04-08 00:13:13 +02:00
|
|
|
#include "cache.h"
|
2006-04-02 14:44:09 +02:00
|
|
|
#include "tree.h"
|
2006-04-24 01:52:35 +02:00
|
|
|
#include "cache-tree.h"
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2006-04-26 10:20:50 +02:00
|
|
|
static const char write_tree_usage[] =
|
|
|
|
"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
|
2005-12-06 07:30:07 +01:00
|
|
|
|
2006-06-13 22:21:42 +02:00
|
|
|
int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
|
2005-04-10 02:09:34 +02:00
|
|
|
{
|
2006-04-25 06:18:58 +02:00
|
|
|
int entries, was_valid, newfd;
|
2006-04-24 01:52:35 +02:00
|
|
|
|
2006-06-13 22:21:42 +02:00
|
|
|
/* We can't free this memory, it becomes part of a linked list parsed atexit() */
|
2006-06-20 00:55:20 +02:00
|
|
|
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
|
2005-11-26 09:50:02 +01:00
|
|
|
|
2006-08-12 10:03:47 +02:00
|
|
|
newfd = hold_lock_file_for_update(lock_file, get_index_file(), 0);
|
2005-04-10 02:09:34 +02:00
|
|
|
|
2006-06-13 22:21:42 +02:00
|
|
|
entries = read_cache();
|
2005-05-08 16:15:59 +02:00
|
|
|
if (entries < 0)
|
2005-05-19 13:17:16 +02:00
|
|
|
die("git-write-tree: error reading cache");
|
2005-04-16 07:04:54 +02:00
|
|
|
|
2006-04-25 06:18:58 +02:00
|
|
|
if (!active_cache_tree)
|
|
|
|
active_cache_tree = cache_tree();
|
|
|
|
|
|
|
|
was_valid = cache_tree_fully_valid(active_cache_tree);
|
2006-06-13 22:21:42 +02:00
|
|
|
|
2006-04-25 06:18:58 +02:00
|
|
|
if (!was_valid) {
|
|
|
|
if (cache_tree_update(active_cache_tree,
|
|
|
|
active_cache, active_nr,
|
2006-04-28 01:21:54 +02:00
|
|
|
missing_ok, 0) < 0)
|
2006-04-25 06:18:58 +02:00
|
|
|
die("git-write-tree: error building trees");
|
|
|
|
if (0 <= newfd) {
|
2006-07-08 10:56:28 +02:00
|
|
|
if (!write_cache(newfd, active_cache, active_nr)
|
|
|
|
&& !close(newfd))
|
2006-06-13 22:21:42 +02:00
|
|
|
commit_lock_file(lock_file);
|
2006-04-25 06:18:58 +02:00
|
|
|
}
|
|
|
|
/* Not being able to write is fine -- we are only interested
|
|
|
|
* in updating the cache-tree part, and if the next caller
|
|
|
|
* ends up using the old index with unupdated cache-tree part
|
|
|
|
* it misses the work we did here, but that is just a
|
|
|
|
* performance penalty and not a big deal.
|
|
|
|
*/
|
|
|
|
}
|
2006-06-13 22:21:42 +02:00
|
|
|
|
2006-04-26 10:20:50 +02:00
|
|
|
if (prefix) {
|
|
|
|
struct cache_tree *subtree =
|
|
|
|
cache_tree_find(active_cache_tree, prefix);
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(sha1, subtree->sha1);
|
2006-04-26 10:20:50 +02:00
|
|
|
}
|
|
|
|
else
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(sha1, active_cache_tree->sha1);
|
2006-06-13 22:21:42 +02:00
|
|
|
|
|
|
|
rollback_lock_file(lock_file);
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2006-06-13 22:21:42 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
|
2006-06-13 22:21:42 +02:00
|
|
|
{
|
|
|
|
int missing_ok = 0, ret;
|
|
|
|
const char *prefix = NULL;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
while (1 < argc) {
|
|
|
|
const char *arg = argv[1];
|
|
|
|
if (!strcmp(arg, "--missing-ok"))
|
|
|
|
missing_ok = 1;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 10:53:29 +01:00
|
|
|
else if (!prefixcmp(arg, "--prefix="))
|
2006-06-13 22:21:42 +02:00
|
|
|
prefix = arg + 9;
|
|
|
|
else
|
2006-08-03 17:48:41 +02:00
|
|
|
usage(write_tree_usage);
|
2006-06-13 22:21:42 +02:00
|
|
|
argc--; argv++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 2)
|
|
|
|
die("too many options");
|
|
|
|
|
|
|
|
ret = write_tree(sha1, missing_ok, prefix);
|
|
|
|
printf("%s\n", sha1_to_hex(sha1));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|