2005-04-08 06:16:10 +08:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-09-07 03:53:56 +08:00
|
|
|
|
2005-04-08 06:13:13 +08:00
|
|
|
#include "cache.h"
|
2005-09-05 14:04:48 +08:00
|
|
|
#include "object.h"
|
|
|
|
#include "tree.h"
|
2006-05-30 03:18:00 +08:00
|
|
|
#include "tree-walk.h"
|
2006-04-25 12:18:58 +08:00
|
|
|
#include "cache-tree.h"
|
2006-07-31 02:25:18 +08:00
|
|
|
#include "unpack-trees.h"
|
2006-05-23 20:15:32 +08:00
|
|
|
#include "builtin.h"
|
2005-09-05 14:04:48 +08:00
|
|
|
|
2006-08-16 01:23:48 +08:00
|
|
|
static struct object_list *trees;
|
2005-09-05 14:04:48 +08:00
|
|
|
|
|
|
|
static int list_tree(unsigned char *sha1)
|
|
|
|
{
|
|
|
|
struct tree *tree = parse_tree_indirect(sha1);
|
|
|
|
if (!tree)
|
|
|
|
return -1;
|
|
|
|
object_list_append(&tree->object, &trees);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-10 03:51:01 +08:00
|
|
|
static int read_cache_unmerged(void)
|
|
|
|
{
|
2006-06-03 16:49:31 +08:00
|
|
|
int i;
|
2005-06-10 03:51:01 +08:00
|
|
|
struct cache_entry **dst;
|
2006-06-03 16:49:31 +08:00
|
|
|
struct cache_entry *last = NULL;
|
2005-06-10 03:51:01 +08:00
|
|
|
|
|
|
|
read_cache();
|
|
|
|
dst = active_cache;
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
if (ce_stage(ce)) {
|
2006-06-03 16:49:31 +08:00
|
|
|
if (last && !strcmp(ce->name, last->name))
|
|
|
|
continue;
|
2006-07-31 02:26:15 +08:00
|
|
|
cache_tree_invalidate_path(active_cache_tree, ce->name);
|
2006-06-03 16:49:31 +08:00
|
|
|
last = ce;
|
|
|
|
ce->ce_mode = 0;
|
|
|
|
ce->ce_flags &= ~htons(CE_STAGEMASK);
|
2005-06-10 03:51:01 +08:00
|
|
|
}
|
2006-06-03 16:49:31 +08:00
|
|
|
*dst++ = ce;
|
2005-06-10 03:51:01 +08:00
|
|
|
}
|
2006-06-03 16:49:31 +08:00
|
|
|
active_nr = dst - active_cache;
|
|
|
|
return !!last;
|
2005-06-10 03:51:01 +08:00
|
|
|
}
|
|
|
|
|
2006-04-27 16:33:07 +08:00
|
|
|
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
|
|
|
|
{
|
2006-05-30 03:18:00 +08:00
|
|
|
struct tree_desc desc;
|
tree_entry(): new tree-walking helper function
This adds a "tree_entry()" function that combines the common operation of
doing a "tree_entry_extract()" + "update_tree_entry()".
It also has a simplified calling convention, designed for simple loops
that traverse over a whole tree: the arguments are pointers to the tree
descriptor and a name_entry structure to fill in, and it returns a boolean
"true" if there was an entry left to be gotten in the tree.
This allows tree traversal with
struct tree_desc desc;
struct name_entry entry;
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry) {
... use "entry.{path, sha1, mode, pathlen}" ...
}
which is not only shorter than writing it out in full, it's hopefully less
error prone too.
[ It's actually a tad faster too - we don't need to recalculate the entry
pathlength in both extract and update, but need to do it only once.
Also, some callers can avoid doing a "strlen()" on the result, since
it's returned as part of the name_entry structure.
However, by now we're talking just 1% speedup on "git-rev-list --objects
--all", and we're definitely at the point where tree walking is no
longer the issue any more. ]
NOTE! Not everybody wants to use this new helper function, since some of
the tree walkers very much on purpose do the descriptor update separately
from the entry extraction. So the "extract + update" sequence still
remains as the core sequence, this is just a simplified interface.
We should probably add a silly two-line inline helper function for
initializing the descriptor from the "struct tree" too, just to cut down
on the noise from that common "desc" initializer.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31 00:45:45 +08:00
|
|
|
struct name_entry entry;
|
2006-04-27 16:33:07 +08:00
|
|
|
int cnt;
|
2006-05-20 15:56:11 +08:00
|
|
|
|
2006-08-23 14:49:00 +08:00
|
|
|
hashcpy(it->sha1, tree->object.sha1);
|
2006-05-30 03:18:00 +08:00
|
|
|
desc.buf = tree->buffer;
|
|
|
|
desc.size = tree->size;
|
|
|
|
cnt = 0;
|
tree_entry(): new tree-walking helper function
This adds a "tree_entry()" function that combines the common operation of
doing a "tree_entry_extract()" + "update_tree_entry()".
It also has a simplified calling convention, designed for simple loops
that traverse over a whole tree: the arguments are pointers to the tree
descriptor and a name_entry structure to fill in, and it returns a boolean
"true" if there was an entry left to be gotten in the tree.
This allows tree traversal with
struct tree_desc desc;
struct name_entry entry;
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry) {
... use "entry.{path, sha1, mode, pathlen}" ...
}
which is not only shorter than writing it out in full, it's hopefully less
error prone too.
[ It's actually a tad faster too - we don't need to recalculate the entry
pathlength in both extract and update, but need to do it only once.
Also, some callers can avoid doing a "strlen()" on the result, since
it's returned as part of the name_entry structure.
However, by now we're talking just 1% speedup on "git-rev-list --objects
--all", and we're definitely at the point where tree walking is no
longer the issue any more. ]
NOTE! Not everybody wants to use this new helper function, since some of
the tree walkers very much on purpose do the descriptor update separately
from the entry extraction. So the "extract + update" sequence still
remains as the core sequence, this is just a simplified interface.
We should probably add a silly two-line inline helper function for
initializing the descriptor from the "struct tree" too, just to cut down
on the noise from that common "desc" initializer.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31 00:45:45 +08:00
|
|
|
while (tree_entry(&desc, &entry)) {
|
|
|
|
if (!S_ISDIR(entry.mode))
|
2006-04-27 16:33:07 +08:00
|
|
|
cnt++;
|
|
|
|
else {
|
|
|
|
struct cache_tree_sub *sub;
|
tree_entry(): new tree-walking helper function
This adds a "tree_entry()" function that combines the common operation of
doing a "tree_entry_extract()" + "update_tree_entry()".
It also has a simplified calling convention, designed for simple loops
that traverse over a whole tree: the arguments are pointers to the tree
descriptor and a name_entry structure to fill in, and it returns a boolean
"true" if there was an entry left to be gotten in the tree.
This allows tree traversal with
struct tree_desc desc;
struct name_entry entry;
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry) {
... use "entry.{path, sha1, mode, pathlen}" ...
}
which is not only shorter than writing it out in full, it's hopefully less
error prone too.
[ It's actually a tad faster too - we don't need to recalculate the entry
pathlength in both extract and update, but need to do it only once.
Also, some callers can avoid doing a "strlen()" on the result, since
it's returned as part of the name_entry structure.
However, by now we're talking just 1% speedup on "git-rev-list --objects
--all", and we're definitely at the point where tree walking is no
longer the issue any more. ]
NOTE! Not everybody wants to use this new helper function, since some of
the tree walkers very much on purpose do the descriptor update separately
from the entry extraction. So the "extract + update" sequence still
remains as the core sequence, this is just a simplified interface.
We should probably add a silly two-line inline helper function for
initializing the descriptor from the "struct tree" too, just to cut down
on the noise from that common "desc" initializer.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31 00:45:45 +08:00
|
|
|
struct tree *subtree = lookup_tree(entry.sha1);
|
2006-04-27 16:33:07 +08:00
|
|
|
if (!subtree->object.parsed)
|
|
|
|
parse_tree(subtree);
|
tree_entry(): new tree-walking helper function
This adds a "tree_entry()" function that combines the common operation of
doing a "tree_entry_extract()" + "update_tree_entry()".
It also has a simplified calling convention, designed for simple loops
that traverse over a whole tree: the arguments are pointers to the tree
descriptor and a name_entry structure to fill in, and it returns a boolean
"true" if there was an entry left to be gotten in the tree.
This allows tree traversal with
struct tree_desc desc;
struct name_entry entry;
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry) {
... use "entry.{path, sha1, mode, pathlen}" ...
}
which is not only shorter than writing it out in full, it's hopefully less
error prone too.
[ It's actually a tad faster too - we don't need to recalculate the entry
pathlength in both extract and update, but need to do it only once.
Also, some callers can avoid doing a "strlen()" on the result, since
it's returned as part of the name_entry structure.
However, by now we're talking just 1% speedup on "git-rev-list --objects
--all", and we're definitely at the point where tree walking is no
longer the issue any more. ]
NOTE! Not everybody wants to use this new helper function, since some of
the tree walkers very much on purpose do the descriptor update separately
from the entry extraction. So the "extract + update" sequence still
remains as the core sequence, this is just a simplified interface.
We should probably add a silly two-line inline helper function for
initializing the descriptor from the "struct tree" too, just to cut down
on the noise from that common "desc" initializer.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31 00:45:45 +08:00
|
|
|
sub = cache_tree_sub(it, entry.path);
|
2006-04-27 16:33:07 +08:00
|
|
|
sub->cache_tree = cache_tree();
|
|
|
|
prime_cache_tree_rec(sub->cache_tree, subtree);
|
|
|
|
cnt += sub->cache_tree->entry_count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
it->entry_count = cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void prime_cache_tree(void)
|
|
|
|
{
|
|
|
|
struct tree *tree = (struct tree *)trees->item;
|
|
|
|
if (!tree)
|
|
|
|
return;
|
|
|
|
active_cache_tree = cache_tree();
|
|
|
|
prime_cache_tree_rec(active_cache_tree, tree);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2006-01-15 13:46:58 +08:00
|
|
|
static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <sha1> [<sha2> [<sha3>]])";
|
2005-04-21 10:49:16 +08:00
|
|
|
|
2006-06-07 03:51:49 +08:00
|
|
|
static struct lock_file lock_file;
|
2005-06-07 03:20:55 +08:00
|
|
|
|
2006-08-04 04:44:09 +08:00
|
|
|
int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
|
2005-04-08 06:13:13 +08:00
|
|
|
{
|
2006-05-15 23:09:31 +08:00
|
|
|
int i, newfd, stage = 0;
|
2005-04-08 06:13:13 +08:00
|
|
|
unsigned char sha1[20];
|
2006-07-31 02:25:18 +08:00
|
|
|
struct unpack_trees_options opts;
|
2005-04-22 01:55:18 +08:00
|
|
|
|
2006-07-31 02:25:18 +08:00
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
opts.head_idx = -1;
|
2006-07-09 02:34:02 +08:00
|
|
|
|
2006-07-31 02:25:18 +08:00
|
|
|
setup_git_directory();
|
2006-03-24 15:41:18 +08:00
|
|
|
git_config(git_default_config);
|
2005-11-26 16:50:02 +08:00
|
|
|
|
2006-08-12 16:03:47 +08:00
|
|
|
newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
|
2005-04-10 03:11:25 +08:00
|
|
|
|
2005-11-08 16:23:37 +08:00
|
|
|
git_config(git_default_config);
|
|
|
|
|
2005-04-10 03:11:25 +08:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
2005-09-11 08:46:27 +08:00
|
|
|
/* "-u" means "update", meaning that a merge will update
|
|
|
|
* the working tree.
|
|
|
|
*/
|
2005-06-06 13:07:31 +08:00
|
|
|
if (!strcmp(arg, "-u")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.update = 1;
|
2005-06-06 13:07:31 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-02-23 11:02:39 +08:00
|
|
|
if (!strcmp(arg, "-v")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.verbose_update = 1;
|
2006-02-23 11:02:39 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-09-11 08:46:27 +08:00
|
|
|
/* "-i" means "index only", meaning that a merge will
|
|
|
|
* not even look at the working tree.
|
|
|
|
*/
|
|
|
|
if (!strcmp(arg, "-i")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.index_only = 1;
|
2005-09-11 08:46:27 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-01-15 13:46:58 +08:00
|
|
|
/* "--prefix=<subdirectory>/" means keep the current index
|
|
|
|
* entries and put the entries from the tree under the
|
|
|
|
* given subdirectory.
|
|
|
|
*/
|
|
|
|
if (!strncmp(arg, "--prefix=", 9)) {
|
2006-07-31 02:25:18 +08:00
|
|
|
if (stage || opts.merge || opts.prefix)
|
2006-01-15 13:46:58 +08:00
|
|
|
usage(read_tree_usage);
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.prefix = arg + 9;
|
|
|
|
opts.merge = 1;
|
2006-01-15 13:46:58 +08:00
|
|
|
stage = 1;
|
|
|
|
if (read_cache_unmerged())
|
|
|
|
die("you need to resolve your current index first");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-06-03 16:49:31 +08:00
|
|
|
/* This differs from "-m" in that we'll silently ignore
|
|
|
|
* unmerged entries and overwrite working tree files that
|
|
|
|
* correspond to them.
|
|
|
|
*/
|
2005-06-10 03:51:01 +08:00
|
|
|
if (!strcmp(arg, "--reset")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
if (stage || opts.merge || opts.prefix)
|
2005-06-10 03:51:01 +08:00
|
|
|
usage(read_tree_usage);
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.reset = 1;
|
|
|
|
opts.merge = 1;
|
2005-06-10 03:51:01 +08:00
|
|
|
stage = 1;
|
|
|
|
read_cache_unmerged();
|
2005-06-16 01:25:46 +08:00
|
|
|
continue;
|
2005-06-10 03:51:01 +08:00
|
|
|
}
|
|
|
|
|
2005-09-29 23:16:12 +08:00
|
|
|
if (!strcmp(arg, "--trivial")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.trivial_merges_only = 1;
|
2005-09-29 23:16:12 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-02-04 14:04:14 +08:00
|
|
|
if (!strcmp(arg, "--aggressive")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.aggressive = 1;
|
2006-02-04 14:04:14 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-04-16 13:53:45 +08:00
|
|
|
/* "-m" stands for "merge", meaning we start in stage 1 */
|
2005-04-10 03:11:25 +08:00
|
|
|
if (!strcmp(arg, "-m")) {
|
2006-07-31 02:25:18 +08:00
|
|
|
if (stage || opts.merge || opts.prefix)
|
2005-06-10 03:51:01 +08:00
|
|
|
usage(read_tree_usage);
|
|
|
|
if (read_cache_unmerged())
|
|
|
|
die("you need to resolve your current index first");
|
2005-04-16 13:53:45 +08:00
|
|
|
stage = 1;
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.merge = 1;
|
2005-04-10 03:11:25 +08:00
|
|
|
continue;
|
|
|
|
}
|
2005-06-11 09:36:08 +08:00
|
|
|
|
2005-09-11 08:46:27 +08:00
|
|
|
/* using -u and -i at the same time makes no sense */
|
2006-07-31 02:25:18 +08:00
|
|
|
if (1 < opts.index_only + opts.update)
|
2005-09-11 08:46:27 +08:00
|
|
|
usage(read_tree_usage);
|
|
|
|
|
2006-05-09 05:43:38 +08:00
|
|
|
if (get_sha1(arg, sha1))
|
|
|
|
die("Not a valid object name %s", arg);
|
2005-09-05 14:04:48 +08:00
|
|
|
if (list_tree(sha1) < 0)
|
2005-04-13 17:28:48 +08:00
|
|
|
die("failed to unpack tree object %s", arg);
|
2005-04-16 13:53:45 +08:00
|
|
|
stage++;
|
2005-04-10 03:11:25 +08:00
|
|
|
}
|
2006-07-31 02:25:18 +08:00
|
|
|
if ((opts.update||opts.index_only) && !opts.merge)
|
2005-06-08 06:20:39 +08:00
|
|
|
usage(read_tree_usage);
|
2005-10-02 15:50:16 +08:00
|
|
|
|
2006-07-31 02:25:18 +08:00
|
|
|
if (opts.prefix) {
|
|
|
|
int pfxlen = strlen(opts.prefix);
|
2006-01-15 13:46:58 +08:00
|
|
|
int pos;
|
2006-07-31 02:25:18 +08:00
|
|
|
if (opts.prefix[pfxlen-1] != '/')
|
2006-01-15 13:46:58 +08:00
|
|
|
die("prefix must end with /");
|
|
|
|
if (stage != 2)
|
|
|
|
die("binding merge takes only one tree");
|
2006-07-31 02:25:18 +08:00
|
|
|
pos = cache_name_pos(opts.prefix, pfxlen);
|
2006-01-15 13:46:58 +08:00
|
|
|
if (0 <= pos)
|
|
|
|
die("corrupt index file");
|
|
|
|
pos = -pos-1;
|
|
|
|
if (pos < active_nr &&
|
2006-07-31 02:25:18 +08:00
|
|
|
!strncmp(active_cache[pos]->name, opts.prefix, pfxlen))
|
|
|
|
die("subdirectory '%s' already exists.", opts.prefix);
|
|
|
|
pos = cache_name_pos(opts.prefix, pfxlen-1);
|
2006-01-15 13:46:58 +08:00
|
|
|
if (0 <= pos)
|
2006-07-31 02:25:18 +08:00
|
|
|
die("file '%.*s' already exists.",
|
|
|
|
pfxlen-1, opts.prefix);
|
2006-01-15 13:46:58 +08:00
|
|
|
}
|
|
|
|
|
2006-07-31 02:25:18 +08:00
|
|
|
if (opts.merge) {
|
2005-09-05 14:04:48 +08:00
|
|
|
if (stage < 2)
|
2005-04-20 02:41:18 +08:00
|
|
|
die("just how do you expect me to merge %d trees?", stage-1);
|
2005-09-05 14:04:48 +08:00
|
|
|
switch (stage - 1) {
|
|
|
|
case 1:
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.fn = opts.prefix ? bind_merge : oneway_merge;
|
2005-09-05 14:04:48 +08:00
|
|
|
break;
|
|
|
|
case 2:
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.fn = twoway_merge;
|
2005-09-05 14:04:48 +08:00
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
default:
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.fn = threeway_merge;
|
2006-04-27 15:13:34 +08:00
|
|
|
cache_tree_free(&active_cache_tree);
|
2005-09-05 14:04:48 +08:00
|
|
|
break;
|
2005-06-11 09:36:08 +08:00
|
|
|
}
|
2005-09-05 14:04:48 +08:00
|
|
|
|
|
|
|
if (stage - 1 >= 3)
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.head_idx = stage - 2;
|
2005-09-05 14:04:48 +08:00
|
|
|
else
|
2006-07-31 02:25:18 +08:00
|
|
|
opts.head_idx = 1;
|
2005-09-05 14:04:48 +08:00
|
|
|
}
|
|
|
|
|
2006-07-31 02:25:18 +08:00
|
|
|
unpack_trees(trees, &opts);
|
2006-04-27 16:33:07 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* When reading only one tree (either the most basic form,
|
|
|
|
* "-m ent" or "--reset ent" form), we can obtain a fully
|
|
|
|
* valid cache-tree because the index must match exactly
|
|
|
|
* what came from the tree.
|
|
|
|
*/
|
2006-07-31 02:25:18 +08:00
|
|
|
if (trees && trees->item && !opts.prefix && (!opts.merge || (stage == 2))) {
|
2006-05-07 23:42:37 +08:00
|
|
|
cache_tree_free(&active_cache_tree);
|
2006-04-27 16:33:07 +08:00
|
|
|
prime_cache_tree();
|
|
|
|
}
|
|
|
|
|
2005-06-07 03:20:55 +08:00
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
2006-07-08 16:56:28 +08:00
|
|
|
close(newfd) || commit_lock_file(&lock_file))
|
2005-04-13 17:28:48 +08:00
|
|
|
die("unable to write new index file");
|
2005-04-12 06:39:26 +08:00
|
|
|
return 0;
|
2005-04-08 06:13:13 +08:00
|
|
|
}
|