2005-04-09 16:53:05 +00:00
|
|
|
/*
|
|
|
|
* Check-out files from the "current cache directory"
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Linus Torvalds
|
|
|
|
*
|
|
|
|
*/
|
2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2005-04-09 16:53:05 +00:00
|
|
|
#include "cache.h"
|
2006-03-01 02:43:33 +00:00
|
|
|
#include "quote.h"
|
2006-04-25 04:18:58 +00:00
|
|
|
#include "cache-tree.h"
|
2008-10-18 01:17:23 +00:00
|
|
|
#include "parse-options.h"
|
2005-04-09 16:53:05 +00:00
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
#define CHECKOUT_ALL 4
|
|
|
|
static int line_termination = '\n';
|
2005-12-07 08:29:51 +00:00
|
|
|
static int checkout_stage; /* default to checkout stage0 */
|
2006-03-05 08:24:15 +00:00
|
|
|
static int to_tempfile;
|
2006-08-26 14:09:17 +00:00
|
|
|
static char topath[4][PATH_MAX + 1];
|
2005-11-26 08:22:48 +00:00
|
|
|
|
2006-07-08 18:34:02 +00:00
|
|
|
static struct checkout state;
|
2005-04-09 16:53:05 +00:00
|
|
|
|
2006-08-04 08:23:19 +00:00
|
|
|
static void write_tempfile_record(const char *name, int prefix_length)
|
2006-03-05 08:24:15 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (CHECKOUT_ALL == checkout_stage) {
|
|
|
|
for (i = 1; i < 4; i++) {
|
|
|
|
if (i > 1)
|
|
|
|
putchar(' ');
|
|
|
|
if (topath[i][0])
|
|
|
|
fputs(topath[i], stdout);
|
|
|
|
else
|
|
|
|
putchar('.');
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
fputs(topath[checkout_stage], stdout);
|
|
|
|
|
|
|
|
putchar('\t');
|
Full rework of quote_c_style and write_name_quoted.
* quote_c_style works on a strbuf instead of a wild buffer.
* quote_c_style is now clever enough to not add double quotes if not needed.
* write_name_quoted inherits those advantages, but also take a different
set of arguments. Now instead of asking for quotes or not, you pass a
"terminator". If it's \0 then we assume you don't want to escape, else C
escaping is performed. In any case, the terminator is also appended to the
stream. It also no longer takes the prefix/prefix_len arguments, as it's
seldomly used, and makes some optimizations harder.
* write_name_quotedpfx is created to work like write_name_quoted and take
the prefix/prefix_len arguments.
Thanks to those API changes, diff.c has somehow lost weight, thanks to the
removal of functions that were wrappers around the old write_name_quoted
trying to give it a semantics like the new one, but performing a lot of
allocations for this goal. Now we always write directly to the stream, no
intermediate allocation is performed.
As a side effect of the refactor in builtin-apply.c, the length of the bar
graphs in diffstats are not affected anymore by the fact that the path was
clipped.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
2007-09-19 22:42:15 +00:00
|
|
|
write_name_quoted(name + prefix_length, stdout, line_termination);
|
2006-03-05 08:24:15 +00:00
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
topath[i][0] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-04 08:23:19 +00:00
|
|
|
static int checkout_file(const char *name, int prefix_length)
|
2005-04-09 16:53:05 +00:00
|
|
|
{
|
2005-12-07 08:29:51 +00:00
|
|
|
int namelen = strlen(name);
|
|
|
|
int pos = cache_name_pos(name, namelen);
|
|
|
|
int has_same_name = 0;
|
2006-03-05 08:24:15 +00:00
|
|
|
int did_checkout = 0;
|
|
|
|
int errs = 0;
|
2005-12-07 08:29:51 +00:00
|
|
|
|
|
|
|
if (pos < 0)
|
|
|
|
pos = -pos - 1;
|
|
|
|
|
|
|
|
while (pos < active_nr) {
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
2005-12-14 05:39:56 +00:00
|
|
|
if (ce_namelen(ce) != namelen ||
|
2005-12-07 08:29:51 +00:00
|
|
|
memcmp(ce->name, name, namelen))
|
|
|
|
break;
|
|
|
|
has_same_name = 1;
|
|
|
|
pos++;
|
2006-03-05 08:24:15 +00:00
|
|
|
if (ce_stage(ce) != checkout_stage
|
|
|
|
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
|
|
|
|
continue;
|
|
|
|
did_checkout = 1;
|
|
|
|
if (checkout_entry(ce, &state,
|
|
|
|
to_tempfile ? topath[ce_stage(ce)] : NULL) < 0)
|
|
|
|
errs++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (did_checkout) {
|
|
|
|
if (to_tempfile)
|
2006-08-04 08:23:19 +00:00
|
|
|
write_tempfile_record(name, prefix_length);
|
2006-03-05 08:24:15 +00:00
|
|
|
return errs > 0 ? -1 : 0;
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
2005-12-07 08:29:51 +00:00
|
|
|
|
|
|
|
if (!state.quiet) {
|
2008-09-09 10:28:30 +00:00
|
|
|
fprintf(stderr, "git checkout-index: %s ", name);
|
2005-12-07 08:29:51 +00:00
|
|
|
if (!has_same_name)
|
|
|
|
fprintf(stderr, "is not in the cache");
|
|
|
|
else if (checkout_stage)
|
|
|
|
fprintf(stderr, "does not exist at stage %d",
|
|
|
|
checkout_stage);
|
|
|
|
else
|
|
|
|
fprintf(stderr, "is unmerged");
|
|
|
|
fputc('\n', stderr);
|
|
|
|
}
|
|
|
|
return -1;
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
|
|
|
|
2006-08-14 20:20:12 +00:00
|
|
|
static void checkout_all(const char *prefix, int prefix_length)
|
2005-04-09 16:53:05 +00:00
|
|
|
{
|
2005-10-03 19:44:48 +00:00
|
|
|
int i, errs = 0;
|
2009-05-01 09:06:36 +00:00
|
|
|
struct cache_entry *last_ce = NULL;
|
2005-04-09 16:53:05 +00:00
|
|
|
|
|
|
|
for (i = 0; i < active_nr ; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
2006-03-05 08:24:15 +00:00
|
|
|
if (ce_stage(ce) != checkout_stage
|
|
|
|
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
|
2005-04-18 01:39:14 +00:00
|
|
|
continue;
|
2005-11-26 08:22:48 +00:00
|
|
|
if (prefix && *prefix &&
|
2005-12-07 08:29:51 +00:00
|
|
|
(ce_namelen(ce) <= prefix_length ||
|
|
|
|
memcmp(prefix, ce->name, prefix_length)))
|
2005-11-26 08:22:48 +00:00
|
|
|
continue;
|
2006-03-05 08:24:15 +00:00
|
|
|
if (last_ce && to_tempfile) {
|
|
|
|
if (ce_namelen(last_ce) != ce_namelen(ce)
|
|
|
|
|| memcmp(last_ce->name, ce->name, ce_namelen(ce)))
|
2006-08-04 08:23:19 +00:00
|
|
|
write_tempfile_record(last_ce->name, prefix_length);
|
2006-03-05 08:24:15 +00:00
|
|
|
}
|
|
|
|
if (checkout_entry(ce, &state,
|
|
|
|
to_tempfile ? topath[ce_stage(ce)] : NULL) < 0)
|
2005-10-03 19:44:48 +00:00
|
|
|
errs++;
|
2006-03-05 08:24:15 +00:00
|
|
|
last_ce = ce;
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
2006-03-05 08:24:15 +00:00
|
|
|
if (last_ce && to_tempfile)
|
2006-08-04 08:23:19 +00:00
|
|
|
write_tempfile_record(last_ce->name, prefix_length);
|
2005-10-03 19:44:48 +00:00
|
|
|
if (errs)
|
|
|
|
/* we have already done our error reporting.
|
|
|
|
* exit with the same code as die().
|
|
|
|
*/
|
|
|
|
exit(128);
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
|
|
|
|
2008-10-18 01:17:23 +00:00
|
|
|
static const char * const builtin_checkout_index_usage[] = {
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("git checkout-index [options] [--] [<file>...]"),
|
2008-10-18 01:17:23 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-07-14 03:25:07 +00:00
|
|
|
|
2006-06-06 19:51:49 +00:00
|
|
|
static struct lock_file lock_file;
|
2005-08-13 15:29:32 +00:00
|
|
|
|
2008-10-18 01:17:23 +00:00
|
|
|
static int option_parse_u(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
int *newfd = opt->value;
|
|
|
|
|
|
|
|
state.refresh_cache = 1;
|
|
|
|
if (*newfd < 0)
|
|
|
|
*newfd = hold_locked_index(&lock_file, 1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int option_parse_z(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
if (unset)
|
|
|
|
line_termination = '\n';
|
|
|
|
else
|
|
|
|
line_termination = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int option_parse_prefix(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
state.base_dir = arg;
|
|
|
|
state.base_dir_len = strlen(arg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int option_parse_stage(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
if (!strcmp(arg, "all")) {
|
|
|
|
to_tempfile = 1;
|
|
|
|
checkout_stage = CHECKOUT_ALL;
|
|
|
|
} else {
|
|
|
|
int ch = arg[0];
|
|
|
|
if ('1' <= ch && ch <= '3')
|
|
|
|
checkout_stage = arg[0] - '0';
|
|
|
|
else
|
|
|
|
die("stage should be between 1 and 3 or all");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-04 08:23:19 +00:00
|
|
|
int cmd_checkout_index(int argc, const char **argv, const char *prefix)
|
2005-04-09 16:53:05 +00:00
|
|
|
{
|
2005-10-18 00:32:12 +00:00
|
|
|
int i;
|
2005-05-15 21:23:12 +00:00
|
|
|
int newfd = -1;
|
2005-10-18 00:32:12 +00:00
|
|
|
int all = 0;
|
2006-03-01 02:43:33 +00:00
|
|
|
int read_from_stdin = 0;
|
2006-08-04 08:23:19 +00:00
|
|
|
int prefix_length;
|
2008-10-18 01:17:23 +00:00
|
|
|
int force = 0, quiet = 0, not_new = 0;
|
|
|
|
struct option builtin_checkout_index_options[] = {
|
|
|
|
OPT_BOOLEAN('a', "all", &all,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("checks out all files in the index")),
|
|
|
|
OPT__FORCE(&force, N_("forces overwrite of existing files")),
|
2010-11-08 19:54:48 +00:00
|
|
|
OPT__QUIET(&quiet,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("no warning for existing files and files not in index")),
|
2008-10-18 01:17:23 +00:00
|
|
|
OPT_BOOLEAN('n', "no-create", ¬_new,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("don't checkout new files")),
|
2008-10-18 01:17:23 +00:00
|
|
|
{ OPTION_CALLBACK, 'u', "index", &newfd, NULL,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("update stat information in the index file"),
|
2008-10-18 01:17:23 +00:00
|
|
|
PARSE_OPT_NOARG, option_parse_u },
|
|
|
|
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("paths are separated with NUL character"),
|
2008-10-18 01:17:23 +00:00
|
|
|
PARSE_OPT_NOARG, option_parse_z },
|
|
|
|
OPT_BOOLEAN(0, "stdin", &read_from_stdin,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("read list of paths from the standard input")),
|
2008-10-18 01:17:23 +00:00
|
|
|
OPT_BOOLEAN(0, "temp", &to_tempfile,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("write the content to temporary files")),
|
|
|
|
OPT_CALLBACK(0, "prefix", NULL, N_("string"),
|
|
|
|
N_("when creating files, prepend <string>"),
|
2008-10-18 01:17:23 +00:00
|
|
|
option_parse_prefix),
|
|
|
|
OPT_CALLBACK(0, "stage", NULL, NULL,
|
2012-08-20 12:31:58 +00:00
|
|
|
N_("copy out the files from named stage"),
|
2008-10-18 01:17:23 +00:00
|
|
|
option_parse_stage),
|
|
|
|
OPT_END()
|
|
|
|
};
|
2005-04-09 16:53:05 +00:00
|
|
|
|
2010-10-22 06:44:01 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage_with_options(builtin_checkout_index_usage,
|
|
|
|
builtin_checkout_index_options);
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2006-08-04 08:23:19 +00:00
|
|
|
state.base_dir = "";
|
2005-11-26 08:22:48 +00:00
|
|
|
prefix_length = prefix ? strlen(prefix) : 0;
|
|
|
|
|
2005-04-09 16:53:05 +00:00
|
|
|
if (read_cache() < 0) {
|
2005-04-13 09:28:48 +00:00
|
|
|
die("invalid cache");
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_checkout_index_options,
|
2008-10-18 01:17:23 +00:00
|
|
|
builtin_checkout_index_usage, 0);
|
|
|
|
state.force = force;
|
|
|
|
state.quiet = quiet;
|
|
|
|
state.not_new = not_new;
|
2005-10-18 00:32:12 +00:00
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
if (state.base_dir_len || to_tempfile) {
|
2005-10-18 00:32:12 +00:00
|
|
|
/* when --prefix is specified we do not
|
|
|
|
* want to update cache.
|
|
|
|
*/
|
|
|
|
if (state.refresh_cache) {
|
2006-06-06 19:51:49 +00:00
|
|
|
rollback_lock_file(&lock_file);
|
2008-01-16 19:12:46 +00:00
|
|
|
newfd = -1;
|
2005-10-18 00:32:12 +00:00
|
|
|
}
|
|
|
|
state.refresh_cache = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check out named files first */
|
2008-10-18 01:17:23 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
2005-10-18 00:32:12 +00:00
|
|
|
const char *arg = argv[i];
|
2006-05-06 05:38:06 +00:00
|
|
|
const char *p;
|
2005-10-18 00:32:12 +00:00
|
|
|
|
|
|
|
if (all)
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git checkout-index: don't mix '--all' and explicit filenames");
|
2006-03-01 02:43:33 +00:00
|
|
|
if (read_from_stdin)
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git checkout-index: don't mix '--stdin' and explicit filenames");
|
2006-05-06 05:38:06 +00:00
|
|
|
p = prefix_path(prefix, prefix_length, arg);
|
2006-08-04 08:23:19 +00:00
|
|
|
checkout_file(p, prefix_length);
|
2006-05-06 22:02:53 +00:00
|
|
|
if (p < arg || p > arg + strlen(arg))
|
2009-05-01 09:06:36 +00:00
|
|
|
free((char *)p);
|
2005-04-09 16:53:05 +00:00
|
|
|
}
|
2005-05-15 21:23:12 +00:00
|
|
|
|
2006-03-01 02:43:33 +00:00
|
|
|
if (read_from_stdin) {
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
2007-09-19 22:42:14 +00:00
|
|
|
|
2006-03-01 02:43:33 +00:00
|
|
|
if (all)
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git checkout-index: don't mix '--all' and '--stdin'");
|
2007-09-19 22:42:14 +00:00
|
|
|
|
|
|
|
while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
|
2006-05-06 05:38:06 +00:00
|
|
|
const char *p;
|
2007-09-19 22:42:14 +00:00
|
|
|
if (line_termination && buf.buf[0] == '"') {
|
|
|
|
strbuf_reset(&nbuf);
|
|
|
|
if (unquote_c_style(&nbuf, buf.buf, NULL))
|
|
|
|
die("line is badly quoted");
|
|
|
|
strbuf_swap(&buf, &nbuf);
|
|
|
|
}
|
|
|
|
p = prefix_path(prefix, prefix_length, buf.buf);
|
2006-08-04 08:23:19 +00:00
|
|
|
checkout_file(p, prefix_length);
|
2007-09-19 22:42:14 +00:00
|
|
|
if (p < buf.buf || p > buf.buf + buf.len)
|
2006-05-06 05:38:06 +00:00
|
|
|
free((char *)p);
|
2006-03-01 02:43:33 +00:00
|
|
|
}
|
2007-09-19 22:42:14 +00:00
|
|
|
strbuf_release(&nbuf);
|
2007-09-17 09:19:04 +00:00
|
|
|
strbuf_release(&buf);
|
2006-03-01 02:43:33 +00:00
|
|
|
}
|
|
|
|
|
2005-10-18 00:32:12 +00:00
|
|
|
if (all)
|
2006-08-04 08:23:19 +00:00
|
|
|
checkout_all(prefix, prefix_length);
|
2005-10-18 00:32:12 +00:00
|
|
|
|
2005-05-15 21:23:12 +00:00
|
|
|
if (0 <= newfd &&
|
|
|
|
(write_cache(newfd, active_cache, active_nr) ||
|
2008-01-16 19:12:46 +00:00
|
|
|
commit_locked_index(&lock_file)))
|
2006-06-06 19:51:49 +00:00
|
|
|
die("Unable to write new index file");
|
2005-04-09 16:53:05 +00:00
|
|
|
return 0;
|
|
|
|
}
|