Checkout: handle symlinks. Includes unfinished win32 implementation.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
diff --git a/src/checkout.c b/src/checkout.c
index dc4e559..8ba3cf5 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -32,7 +32,30 @@ typedef struct tree_walk_data
} tree_walk_data;
-static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf, const git_oid *id, int mode)
+static int blob_contents_to_link(git_repository *repo, git_buf *fnbuf,
+ const git_oid *id)
+{
+ int retcode = GIT_ERROR;
+ git_blob *blob;
+
+ /* Get the link target */
+ if (!(retcode = git_blob_lookup(&blob, repo, id))) {
+ git_buf linktarget = GIT_BUF_INIT;
+ if (!(retcode = git_blob__getbuf(&linktarget, blob))) {
+ /* Create the link */
+ retcode = p_symlink(git_buf_cstr(&linktarget),
+ git_buf_cstr(fnbuf));
+ }
+ git_buf_free(&linktarget);
+ git_blob_free(blob);
+ }
+
+ return retcode;
+}
+
+
+static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf,
+ const git_oid *id, int mode)
{
int retcode = GIT_ERROR;
@@ -62,30 +85,33 @@ static int checkout_walker(const char *path, git_tree_entry *entry, void *payloa
/* TODO: handle submodules */
- if (S_ISLNK(attr)) {
- printf("It's a link!\n'");
- } else {
- switch(git_tree_entry_type(entry)) {
- case GIT_OBJ_TREE:
- /* Nothing to do; the blob handling creates necessary directories. */
- break;
-
- case GIT_OBJ_BLOB:
- {
- git_buf fnbuf = GIT_BUF_INIT;
- git_buf_join_n(&fnbuf, '/', 3,
- git_repository_workdir(data->repo),
- path,
- git_tree_entry_name(entry));
- retcode = blob_contents_to_file(data->repo, &fnbuf, git_tree_entry_id(entry), attr);
- git_buf_free(&fnbuf);
+ switch(git_tree_entry_type(entry))
+ {
+ case GIT_OBJ_TREE:
+ /* Nothing to do; the blob handling creates necessary directories. */
+ break;
+
+ case GIT_OBJ_BLOB:
+ {
+ git_buf fnbuf = GIT_BUF_INIT;
+ git_buf_join_n(&fnbuf, '/', 3,
+ git_repository_workdir(data->repo),
+ path,
+ git_tree_entry_name(entry));
+ if (S_ISLNK(attr)) {
+ retcode = blob_contents_to_link(data->repo, &fnbuf,
+ git_tree_entry_id(entry));
+ } else {
+ retcode = blob_contents_to_file(data->repo, &fnbuf,
+ git_tree_entry_id(entry), attr);
}
- break;
-
- default:
- retcode = -1;
- break;
+ git_buf_free(&fnbuf);
}
+ break;
+
+ default:
+ retcode = -1;
+ break;
}
data->stats->processed++;
diff --git a/src/unix/posix.h b/src/unix/posix.h
index 48b4929..304dd14 100644
--- a/src/unix/posix.h
+++ b/src/unix/posix.h
@@ -19,6 +19,7 @@
#define p_lstat(p,b) lstat(p,b)
#define p_readlink(a, b, c) readlink(a, b, c)
#define p_link(o,n) link(o, n)
+#define p_symlink(o,n) symlink(o,n)
#define p_unlink(p) unlink(p)
#define p_mkdir(p,m) mkdir(p, m)
#define p_fsync(fd) fsync(fd)
diff --git a/src/win32/posix.h b/src/win32/posix.h
index baa4a3b..14caae4 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -33,6 +33,7 @@ GIT_INLINE(int) p_mkdir(const char *path, mode_t mode)
extern int p_unlink(const char *path);
extern int p_lstat(const char *file_name, struct stat *buf);
extern int p_readlink(const char *link, char *target, size_t target_len);
+extern int p_symlink(const char *old, const char *new);
extern int p_hide_directory__w32(const char *path);
extern char *p_realpath(const char *orig_path, char *buffer);
extern int p_vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
index 37956af..62fbd11 100644
--- a/src/win32/posix_w32.c
+++ b/src/win32/posix_w32.c
@@ -217,6 +217,12 @@ int p_readlink(const char *link, char *target, size_t target_len)
return dwRet;
}
+int p_symlink(const char *old, const char *new)
+{
+ /* TODO */
+ return -1;
+}
+
int p_open(const char *path, int flags, ...)
{
int fd;
diff --git a/tests-clar/checkout/checkout.c b/tests-clar/checkout/checkout.c
index 99de4c9..9ad41d0 100644
--- a/tests-clar/checkout/checkout.c
+++ b/tests-clar/checkout/checkout.c
@@ -66,3 +66,16 @@ void test_checkout_checkout__stats(void)
{
/* TODO */
}
+
+void test_checkout_checkout__links(void)
+{
+ char link_data[1024];
+ size_t link_size = 1024;
+
+ cl_git_pass(git_checkout_force(g_repo, NULL));
+ link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size);
+ cl_assert_equal_i(link_size, strlen("new.txt"));
+ link_data[link_size] = '\0';
+ cl_assert_equal_s(link_data, "new.txt");
+ test_file_contents("./testrepo/link_to_new.txt", "my new file\n");
+}
diff --git a/tests-clar/resources/testrepo/.gitted/objects/09/9fabac3a9ea935598528c27f866e34089c2eff b/tests-clar/resources/testrepo/.gitted/objects/09/9fabac3a9ea935598528c27f866e34089c2eff
new file mode 100644
index 0000000..c60c78f
--- /dev/null
+++ b/tests-clar/resources/testrepo/.gitted/objects/09/9fabac3a9ea935598528c27f866e34089c2eff
@@ -0,0 +1 @@
+xQ P9^@B!1F'J?#7KJhMVE,.3uVsH-;U,MPIɉ&ĔסKO.2µո$8Nݗr!lCTklUgf0sÓG(
\ No newline at end of file
diff --git a/tests-clar/resources/testrepo/.gitted/objects/45/dd856fdd4d89b884c340ba0e047752d9b085d6 b/tests-clar/resources/testrepo/.gitted/objects/45/dd856fdd4d89b884c340ba0e047752d9b085d6
new file mode 100644
index 0000000..a83ed97
Binary files /dev/null and b/tests-clar/resources/testrepo/.gitted/objects/45/dd856fdd4d89b884c340ba0e047752d9b085d6 differ
diff --git a/tests-clar/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80 b/tests-clar/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80
new file mode 100644
index 0000000..3042f57
Binary files /dev/null and b/tests-clar/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80 differ
diff --git a/tests-clar/resources/testrepo/.gitted/objects/c0/528fd6cc988c0a40ce0be11bc192fc8dc5346e b/tests-clar/resources/testrepo/.gitted/objects/c0/528fd6cc988c0a40ce0be11bc192fc8dc5346e
new file mode 100644
index 0000000..0401ab4
Binary files /dev/null and b/tests-clar/resources/testrepo/.gitted/objects/c0/528fd6cc988c0a40ce0be11bc192fc8dc5346e differ
diff --git a/tests-clar/resources/testrepo/.gitted/refs/heads/master b/tests-clar/resources/testrepo/.gitted/refs/heads/master
index 3d8f0a4..f31fe78 100644
--- a/tests-clar/resources/testrepo/.gitted/refs/heads/master
+++ b/tests-clar/resources/testrepo/.gitted/refs/heads/master
@@ -1 +1 @@
-a65fedf39aefe402d3bb6e24df4d4f5fe4547750
+099fabac3a9ea935598528c27f866e34089c2eff