*/
#include "cache.h"
-static int force = 0, quiet = 0;
+static int force = 0, quiet = 0, not_new = 0;
-static int write_entry(struct cache_entry *ce)
+static void create_directories(const char *path)
+{
+ int len = strlen(path);
+ char *buf = xmalloc(len + 1);
+ const char *slash = path;
+
+ while ((slash = strchr(slash+1, '/')) != NULL) {
+ len = slash - path;
+ memcpy(buf, path, len);
+ buf[len] = 0;
+ mkdir(buf, 0755);
+ }
+}
+
+static int create_file(const char *path, unsigned int mode)
+{
+ int fd;
+
+ mode = (mode & 0100) ? 0777 : 0666;
+ fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ create_directories(path);
+ fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
+ }
+ }
+ return fd;
+}
+
+static int write_entry(struct cache_entry *ce, const char *path)
{
int fd;
void *new;
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;
+ return error("checkout-cache: unable to read sha1 file of %s (%s)",
+ path, sha1_to_hex(ce->sha1));
}
- fd = open(ce->name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ fd = create_file(path, ntohl(ce->ce_mode));
if (fd < 0) {
- fprintf(stderr, "checkout-cache: unable to create %s (%s)\n",
- ce->name, strerror(errno));
free(new);
- return -1;
+ return error("checkout-cache: unable to create %s (%s)",
+ path, strerror(errno));
}
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;
+ if (wrote != size)
+ return error("checkout-cache: unable to write %s", path);
+ return 0;
}
-static int checkout_entry(struct cache_entry *ce)
+static int checkout_entry(struct cache_entry *ce, const char *base_dir)
{
- if (!force) {
- struct stat st;
+ struct stat st;
+ static char path[MAXPATHLEN+1];
+ int len = strlen(base_dir);
+
+ memcpy(path, base_dir, len);
+ strcpy(path + len, ce->name);
- 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);
+ if (!stat(path, &st)) {
+ unsigned changed = cache_match_stat(ce, &st);
+ if (!changed)
+ return 0;
+ if (!force) {
+ if (!quiet)
+ fprintf(stderr, "checkout-cache: %s already exists\n", path);
return 0;
}
- }
- return write_entry(ce);
+
+ /*
+ * We unlink the old file, to get the new one with the
+ * right permissions (including umask, which is nasty
+ * to emulate by hand - much easier to let the system
+ * just do the right thing)
+ */
+ unlink(path);
+ } else if (not_new)
+ return 0;
+ return write_entry(ce, path);
}
-static int checkout_file(const char *name)
+static int checkout_file(const char *name, const char *base_dir)
{
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 (!quiet) {
+ pos = -pos - 1;
+ fprintf(stderr,
+ "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], base_dir);
}
-static int checkout_all(void)
+static int checkout_all(const char *base_dir)
{
int i;
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, base_dir) < 0)
return -1;
}
return 0;
int main(int argc, char **argv)
{
int i, force_filename = 0;
+ const char *base_dir = "";
if (read_cache() < 0) {
- fprintf(stderr, "Invalid cache\n");
- exit(1);
+ die("invalid cache");
}
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!force_filename) {
if (!strcmp(arg, "-a")) {
- checkout_all();
+ checkout_all(base_dir);
continue;
}
if (!strcmp(arg, "--")) {
quiet = 1;
continue;
}
+ if (!strcmp(arg, "-n")) {
+ not_new = 1;
+ continue;
+ }
+ if (!memcmp(arg, "--prefix=", 9)) {
+ base_dir = arg+9;
+ continue;
+ }
}
- checkout_file(arg);
+ checkout_file(arg, base_dir);
}
return 0;
}