[PATCH v2 1/1] clone: replace relative paths in the alternates

From

HWHui Wang <jason77.wang@gmail.com>

Date

Aug 22, 2011, 09:05 UTC

Message-ID

<1314003957-9455-2-git-send-email-jason77.wang@gmail.com>

In-Reply-To

<1314003957-9455-1-git-send-email-jason77.wang@gmail.com>

Signed-off-by: Hui Wang <jason77.wang@gmail.com>
---
 builtin/clone.c |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 cache.h         |    1 +
 sha1_file.c     |   11 +++++++++++
 3 files changed, 58 insertions(+), 1 deletions(-)

diff --git a/builtin/clone.c b/builtin/clone.c
index 7663bc2..7b5e603 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -286,6 +286,50 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest)
 	closedir(dir);
 }
 
+/*
+ * This function is called by clone_local() of clone.c
+ * If alternates in the src_repo (source repository) has relative path,
+ * call this function will replace the relative path to absolute path
+ * in the des_repo (destination repository) alternates.
+ */
+static void update_alt_rel_path(const char *src_repo)
+{
+	int need_update = 0;
+	FILE *ifp;
+	struct strbuf istr = STRBUF_INIT;
+	struct strbuf ostr = STRBUF_INIT;
+
+	ifp = fopen(git_path("objects/info/alternates"), "r");
+	if (!ifp)
+		return;
+
+	while (strbuf_getline(&istr, ifp, '\n') != EOF) {
+		/* comment line, empty line or absolute path line */
+		if (istr.buf[0] == '#' || istr.len == 0 || is_absolute_path(istr.buf)) {
+			strbuf_add(&ostr, istr.buf, istr.len);
+			strbuf_add(&ostr, "\n", 1);
+		} else {
+			char *abs_path, abs_buf[PATH_MAX];
+			int len;
+
+			abs_path = mkpath("%s/objects/%s", src_repo, istr.buf);
+			normalize_path_copy(abs_buf, abs_path);
+			len = strlen(abs_buf);
+			strbuf_add(&ostr, abs_buf, len);
+			strbuf_add(&ostr, "\n", 1);
+			need_update = 1;
+		}
+	}
+
+	fclose(ifp);
+
+	if (need_update)
+		update_alternates_file_content(ostr.buf);
+
+	strbuf_release(&istr);
+	strbuf_release(&ostr);
+}
+
 static const struct ref *clone_local(const char *src_repo,
 				     const char *dest_repo)
 {
@@ -303,8 +347,9 @@ static const struct ref *clone_local(const char *src_repo,
 		copy_or_link_directory(&src, &dest);
 		strbuf_release(&src);
 		strbuf_release(&dest);
-	}
 
+		update_alt_rel_path(src_repo);
+	}
 	remote = remote_get(src_repo);
 	transport = transport_get(remote, src_repo);
 	ret = transport_get_remote_refs(transport);
diff --git a/cache.h b/cache.h
index fcf4501..d81c0f0 100644
--- a/cache.h
+++ b/cache.h
@@ -913,6 +913,7 @@ extern struct alternate_object_database {
 } *alt_odb_list;
 extern void prepare_alt_odb(void);
 extern void add_to_alternates_file(const char *reference);
+extern void update_alternates_file_content(const char *content);
 typedef int alt_odb_fn(struct alternate_object_database *, void *);
 extern void foreach_alt_odb(alt_odb_fn, void*);
 
diff --git a/sha1_file.c b/sha1_file.c
index d5616dc..dae7bf6 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -388,6 +388,17 @@ void add_to_alternates_file(const char *reference)
 		link_alt_odb_entries(alt, alt + strlen(alt), '\n', NULL, 0);
 }
 
+void update_alternates_file_content(const char *content)
+{
+	struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
+	int fd = hold_lock_file_for_update(lock, git_path("objects/info/alternates"), LOCK_DIE_ON_ERROR);
+	write_or_die(fd, content, strlen(content));
+	if (commit_lock_file(lock))
+		die("could not close alternates file");
+	if (alt_odb_tail)
+		link_alt_odb_entries(content, content + strlen(content), '\n', NULL, 0);
+}
+
 void foreach_alt_odb(alt_odb_fn fn, void *cb)
 {
 	struct alternate_object_database *ent;

-- 
1.7.6