X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=checkout-cache.c;h=9cd289c35a8707feaa8c2c5ea1e6591c00fb0a12;hb=d6db01075b65da2b8584a0450619390893aae103;hp=18729374fc5da8a6c7b568fe571bac58e705545d;hpb=1126b419d6835f6b8c45ccfffc0ada9b09e32d87;p=git.git

diff --git a/checkout-cache.c b/checkout-cache.c
index 18729374..9cd289c3 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -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",
@@ -36,7 +36,7 @@
 #include <dirent.h>
 #include "cache.h"
 
-static int force = 0, quiet = 0, not_new = 0;
+static int force = 0, quiet = 0, not_new = 0, refresh_cache = 0;
 
 static void create_directories(const char *path)
 {
@@ -122,7 +122,7 @@ static int write_entry(struct cache_entry *ce, const char *path)
 	if (!new || strcmp(type, "blob")) {
 		if (new)
 			free(new);
-		return error("checkout-cache: unable to read sha1 file of %s (%s)",
+		return error("git-checkout-cache: unable to read sha1 file of %s (%s)",
 			path, sha1_to_hex(ce->sha1));
 	}
 	switch (ntohl(ce->ce_mode) & S_IFMT) {
@@ -130,14 +130,14 @@ static int write_entry(struct cache_entry *ce, const char *path)
 		fd = create_file(path, ntohl(ce->ce_mode));
 		if (fd < 0) {
 			free(new);
-			return error("checkout-cache: unable to create file %s (%s)",
+			return error("git-checkout-cache: unable to create file %s (%s)",
 				path, strerror(errno));
 		}
 		wrote = write(fd, new, size);
 		close(fd);
 		free(new);
 		if (wrote != size)
-			return error("checkout-cache: unable to write file %s", path);
+			return error("git-checkout-cache: unable to write file %s", path);
 		break;
 	case S_IFLNK:
 		memcpy(target, new, size);
@@ -145,14 +145,20 @@ static int write_entry(struct cache_entry *ce, const char *path)
 		create_directories(path);
 		if (symlink(target, path)) {
 			free(new);
-			return error("checkout-cache: unable to create symlink %s (%s)",
+			return error("git-checkout-cache: unable to create symlink %s (%s)",
 				path, strerror(errno));
 		}
 		free(new);
 		break;
 	default:
 		free(new);
-		return error("checkout-cache: unknown file mode for %s", path);
+		return error("git-checkout-cache: unknown file mode for %s", path);
+	}
+
+	if (refresh_cache) {
+		struct stat st;
+		lstat(ce->name, &st);
+		fill_stat_cache_info(ce, &st);
 	}
 	return 0;
 }
@@ -167,12 +173,12 @@ static int checkout_entry(struct cache_entry *ce, const char *base_dir)
 	strcpy(path + len, ce->name);
 
 	if (!lstat(path, &st)) {
-		unsigned changed = cache_match_stat(ce, &st);
+		unsigned changed = ce_match_stat(ce, &st);
 		if (!changed)
 			return 0;
 		if (!force) {
 			if (!quiet)
-				fprintf(stderr, "checkout-cache: %s already exists\n", path);
+				fprintf(stderr, "git-checkout-cache: %s already exists\n", path);
 			return 0;
 		}
 
@@ -195,7 +201,7 @@ static int checkout_file(const char *name, const char *base_dir)
 		if (!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)) ?
@@ -224,6 +230,8 @@ int main(int argc, char **argv)
 {
 	int i, force_filename = 0;
 	const char *base_dir = "";
+	struct cache_file cache_file;
+	int newfd = -1;
 
 	if (read_cache() < 0) {
 		die("invalid cache");
@@ -252,12 +260,37 @@ int main(int argc, char **argv)
 				not_new = 1;
 				continue;
 			}
+			if (!strcmp(arg, "-u")) {
+				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)) {
 				base_dir = arg+9;
 				continue;
 			}
 		}
+		if (base_dir[0]) {
+			/* when --prefix is specified we do not
+			 * want to update cache.
+			 */
+			if (refresh_cache) {
+				close(newfd); newfd = -1;
+				rollback_index_file(&cache_file);
+			}
+			refresh_cache = 0;
+		}
 		checkout_file(arg, base_dir);
 	}
+
+	if (0 <= newfd &&
+	    (write_cache(newfd, active_cache, active_nr) ||
+	     commit_index_file(&cache_file)))
+		die("Unable to write new cachefile");
 	return 0;
 }