*
* Careful: order of argument flags does matter. For example,
*
- * checkout-cache -a -f file.c
+ * git-checkout-cache -a -f file.c
*
* Will first check out all files listed in the cache (but not
* overwrite any old ones), and then force-checkout "file.c" a
* second time (ie that one _will_ overwrite any old contents
* with the same filename).
*
- * Also, just doing "checkout-cache" does nothing. You probably
- * meant "checkout-cache -a". And if you want to force it, you
- * want "checkout-cache -f -a".
+ * Also, just doing "git-checkout-cache" does nothing. You probably
+ * meant "git-checkout-cache -a". And if you want to force it, you
+ * want "git-checkout-cache -f -a".
*
* Intuitiveness is not the goal here. Repeatability is. The
* reason for the "no arguments means no work" thing is that
* from scripts you are supposed to be able to do things like
*
- * find . -name '*.h' -print0 | xargs -0 checkout-cache -f --
+ * find . -name '*.h' -print0 | xargs -0 git-checkout-cache -f --
*
* which will force all existing *.h files to be replaced with
* their cached copies. If an empty command line implied "all",
*/
#include "cache.h"
-static int force = 0, quiet = 0;
-
-static void create_directories(const char *path)
-{
- int len = strlen(path);
- char *buf = malloc(len + 1);
- const char *slash = path;
-
- while ((slash = strchr(slash+1, '/')) != NULL) {
- len = slash - path;
- memcpy(buf, path, len);
- buf[len] = 0;
- mkdir(buf, 0700);
- }
-}
-
-static int create_file(const char *path, unsigned int mode)
-{
- int fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
- if (fd < 0) {
- if (errno == ENOENT) {
- create_directories(path);
- fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
- }
- }
- if (fd >= 0)
- fchmod(fd, mode);
- return fd;
-}
-
-static int write_entry(struct cache_entry *ce)
-{
- int fd;
- void *new;
- unsigned long size;
- long wrote;
- char type[20];
-
- new = read_sha1_file(ce->sha1, type, &size);
- if (!new || strcmp(type, "blob")) {
- fprintf(stderr, "checkout-cache: unable to read sha1 file of %s (%s)\n",
- ce->name, sha1_to_hex(ce->sha1));
- return -1;
- }
- fd = create_file(ce->name, ce->st_mode);
- if (fd < 0) {
- fprintf(stderr, "checkout-cache: unable to create %s (%s)\n",
- ce->name, strerror(errno));
- free(new);
- return -1;
- }
- wrote = write(fd, new, size);
- close(fd);
- free(new);
- if (wrote == size)
- return 0;
- fprintf(stderr, "checkout-cache: unable to write %s\n", ce->name);
- return -1;
-}
-
-static int checkout_entry(struct cache_entry *ce)
-{
- if (!force) {
- struct stat st;
-
- if (!stat(ce->name, &st)) {
- unsigned changed = cache_match_stat(ce, &st);
- if (changed && !quiet)
- fprintf(stderr, "checkout-cache: %s already exists\n", ce->name);
- return 0;
- }
- }
- return write_entry(ce);
-}
+static struct checkout state = {
+ .base_dir = "",
+ .base_dir_len = 0,
+ .force = 0,
+ .quiet = 0,
+ .not_new = 0,
+ .refresh_cache = 0,
+};
static int checkout_file(const char *name)
{
int pos = cache_name_pos(name, strlen(name));
if (pos < 0) {
- if (!quiet)
- fprintf(stderr, "checkout-cache: %s is not in the cache\n", name);
+ if (!state.quiet) {
+ pos = -pos - 1;
+ fprintf(stderr,
+ "git-checkout-cache: %s is %s.\n",
+ name,
+ (pos < active_nr &&
+ !strcmp(active_cache[pos]->name, name)) ?
+ "unmerged" : "not in the cache");
+ }
return -1;
}
- return checkout_entry(active_cache[pos]);
+ return checkout_entry(active_cache[pos], &state);
}
static int checkout_all(void)
for (i = 0; i < active_nr ; i++) {
struct cache_entry *ce = active_cache[i];
- if (checkout_entry(ce) < 0)
+ if (ce_stage(ce))
+ continue;
+ if (checkout_entry(ce, &state) < 0)
return -1;
}
return 0;
int main(int argc, char **argv)
{
int i, force_filename = 0;
+ struct cache_file cache_file;
+ int newfd = -1;
if (read_cache() < 0) {
- fprintf(stderr, "Invalid cache\n");
- exit(1);
+ die("invalid cache");
}
for (i = 1; i < argc; i++) {
continue;
}
if (!strcmp(arg, "-f")) {
- force = 1;
+ state.force = 1;
continue;
}
if (!strcmp(arg, "-q")) {
- quiet = 1;
+ state.quiet = 1;
continue;
}
+ if (!strcmp(arg, "-n")) {
+ state.not_new = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-u")) {
+ state.refresh_cache = 1;
+ if (newfd < 0)
+ newfd = hold_index_file_for_update
+ (&cache_file,
+ get_index_file());
+ if (newfd < 0)
+ die("cannot open index.lock file.");
+ continue;
+ }
+ if (!memcmp(arg, "--prefix=", 9)) {
+ state.base_dir = arg+9;
+ state.base_dir_len = strlen(state.base_dir);
+ continue;
+ }
+ }
+ if (state.base_dir_len) {
+ /* when --prefix is specified we do not
+ * want to update cache.
+ */
+ if (state.refresh_cache) {
+ close(newfd); newfd = -1;
+ rollback_index_file(&cache_file);
+ }
+ state.refresh_cache = 0;
}
checkout_file(arg);
}
+
+ if (0 <= newfd &&
+ (write_cache(newfd, active_cache, active_nr) ||
+ commit_index_file(&cache_file)))
+ die("Unable to write new cachefile");
return 0;
}