git-convert-cache: fix up mode conversion
[gitweb.git] / checkout-cache.c
index 1c257666e641868ff8a12a4e96a03a1d787c84a6..d6c4ff104259789d1e0ed812a0d90394e3c332dd 100644 (file)
@@ -5,22 +5,22 @@
  *
  * 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, 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)
-{
-       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")) {
-               return error("checkout-cache: unable to read sha1 file of %s (%s)",
-                       ce->name, sha1_to_hex(ce->sha1));
-       }
-       fd = create_file(ce->name, ntohl(ce->ce_mode));
-       if (fd < 0) {
-               free(new);
-               return error("checkout-cache: unable to create %s (%s)",
-                       ce->name, strerror(errno));
-       }
-       wrote = write(fd, new, size);
-       close(fd);
-       free(new);
-       if (wrote != size)
-               return error("checkout-cache: unable to write %s", ce->name);
-       return 0;
-}
-
-static int checkout_entry(struct cache_entry *ce)
-{
-       struct stat st;
-
-       if (!stat(ce->name, &st)) {
-               unsigned changed = cache_match_stat(ce, &st);
-               if (!changed)
-                       return 0;
-               if (!force) {
-                       if (!quiet)
-                               fprintf(stderr, "checkout-cache: %s already exists\n", ce->name);
-                       return 0;
-               }
-
-               /*
-                * 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(ce->name);
-       }
-       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) {
+               if (!state.quiet) {
                        pos = -pos - 1;
                        fprintf(stderr,
-                               "checkout-cache: %s is %s.\n",
+                               "git-checkout-cache: %s is %s.\n",
                                name,
                                (pos < active_nr &&
                                 !strcmp(active_cache[pos]->name, name)) ?
@@ -132,7 +58,7 @@ static int checkout_file(const char *name)
                }
                return -1;
        }
-       return checkout_entry(active_cache[pos]);
+       return checkout_entry(active_cache[pos], &state);
 }
 
 static int checkout_all(void)
@@ -141,15 +67,22 @@ 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;
 }
 
+static const char *checkout_cache_usage =
+"git-checkout-cache [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] [--] <file>...";
+
 int main(int argc, char **argv)
 {
        int i, force_filename = 0;
+       struct cache_file cache_file;
+       int newfd = -1;
 
        if (read_cache() < 0) {
                die("invalid cache");
@@ -167,15 +100,51 @@ int main(int argc, char **argv)
                                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 (arg[0] == '-')
+                               usage(checkout_cache_usage);
+               }
+               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;
 }