Fix merge-one-file for our-side-added/our-side-removed cases
[git/jnareb-git/bp-gitweb.git] / entry.c
blobc540ae13e858685faa8dbbada5b064074235ae6d
1 #include "cache.h"
2 #include "blob.h"
4 static void create_directories(const char *path, const struct checkout *state)
6 int len = strlen(path);
7 char *buf = xmalloc(len + 1);
8 const char *slash = path;
10 while ((slash = strchr(slash+1, '/')) != NULL) {
11 len = slash - path;
12 memcpy(buf, path, len);
13 buf[len] = 0;
14 if (mkdir(buf, 0777)) {
15 if (errno == EEXIST) {
16 struct stat st;
17 if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0777))
18 continue;
19 if (!stat(buf, &st) && S_ISDIR(st.st_mode))
20 continue; /* ok */
22 die("cannot create directory at %s", buf);
25 free(buf);
28 static void remove_subtree(const char *path)
30 DIR *dir = opendir(path);
31 struct dirent *de;
32 char pathbuf[PATH_MAX];
33 char *name;
35 if (!dir)
36 die("cannot opendir %s (%s)", path, strerror(errno));
37 strcpy(pathbuf, path);
38 name = pathbuf + strlen(path);
39 *name++ = '/';
40 while ((de = readdir(dir)) != NULL) {
41 struct stat st;
42 if ((de->d_name[0] == '.') &&
43 ((de->d_name[1] == 0) ||
44 ((de->d_name[1] == '.') && de->d_name[2] == 0)))
45 continue;
46 strcpy(name, de->d_name);
47 if (lstat(pathbuf, &st))
48 die("cannot lstat %s (%s)", pathbuf, strerror(errno));
49 if (S_ISDIR(st.st_mode))
50 remove_subtree(pathbuf);
51 else if (unlink(pathbuf))
52 die("cannot unlink %s (%s)", pathbuf, strerror(errno));
54 closedir(dir);
55 if (rmdir(path))
56 die("cannot rmdir %s (%s)", path, strerror(errno));
59 static int create_file(const char *path, unsigned int mode)
61 mode = (mode & 0100) ? 0777 : 0666;
62 return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
65 static void *read_blob_entry(struct cache_entry *ce, const char *path, unsigned long *size)
67 enum object_type type;
68 void *new = read_sha1_file(ce->sha1, &type, size);
70 if (new) {
71 if (type == OBJ_BLOB)
72 return new;
73 free(new);
75 return NULL;
78 static int write_entry(struct cache_entry *ce, char *path, const struct checkout *state, int to_tempfile)
80 int fd;
81 long wrote;
83 switch (ntohl(ce->ce_mode) & S_IFMT) {
84 char *buf, *new;
85 unsigned long size;
87 case S_IFREG:
88 new = read_blob_entry(ce, path, &size);
89 if (!new)
90 return error("git-checkout-index: unable to read sha1 file of %s (%s)",
91 path, sha1_to_hex(ce->sha1));
92 if (to_tempfile) {
93 strcpy(path, ".merge_file_XXXXXX");
94 fd = mkstemp(path);
95 } else
96 fd = create_file(path, ntohl(ce->ce_mode));
97 if (fd < 0) {
98 free(new);
99 return error("git-checkout-index: unable to create file %s (%s)",
100 path, strerror(errno));
104 * Convert from git internal format to working tree format
106 buf = convert_to_working_tree(ce->name, new, &size);
107 if (buf) {
108 free(new);
109 new = buf;
112 wrote = write_in_full(fd, new, size);
113 close(fd);
114 free(new);
115 if (wrote != size)
116 return error("git-checkout-index: unable to write file %s", path);
117 break;
118 case S_IFLNK:
119 new = read_blob_entry(ce, path, &size);
120 if (!new)
121 return error("git-checkout-index: unable to read sha1 file of %s (%s)",
122 path, sha1_to_hex(ce->sha1));
123 if (to_tempfile || !has_symlinks) {
124 if (to_tempfile) {
125 strcpy(path, ".merge_link_XXXXXX");
126 fd = mkstemp(path);
127 } else
128 fd = create_file(path, 0666);
129 if (fd < 0) {
130 free(new);
131 return error("git-checkout-index: unable to create "
132 "file %s (%s)", path, strerror(errno));
134 wrote = write_in_full(fd, new, size);
135 close(fd);
136 free(new);
137 if (wrote != size)
138 return error("git-checkout-index: unable to write file %s",
139 path);
140 } else {
141 wrote = symlink(new, path);
142 free(new);
143 if (wrote)
144 return error("git-checkout-index: unable to create "
145 "symlink %s (%s)", path, strerror(errno));
147 break;
148 case S_IFGITLINK:
149 if (to_tempfile)
150 return error("git-checkout-index: cannot create temporary subproject %s", path);
151 if (mkdir(path, 0777) < 0)
152 return error("git-checkout-index: cannot create subproject directory %s", path);
153 break;
154 default:
155 return error("git-checkout-index: unknown file mode for %s", path);
158 if (state->refresh_cache) {
159 struct stat st;
160 lstat(ce->name, &st);
161 fill_stat_cache_info(ce, &st);
163 return 0;
166 int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath)
168 static char path[PATH_MAX + 1];
169 struct stat st;
170 int len = state->base_dir_len;
172 if (topath)
173 return write_entry(ce, topath, state, 1);
175 memcpy(path, state->base_dir, len);
176 strcpy(path + len, ce->name);
178 if (!lstat(path, &st)) {
179 unsigned changed = ce_match_stat(ce, &st, 1);
180 if (!changed)
181 return 0;
182 if (!state->force) {
183 if (!state->quiet)
184 fprintf(stderr, "git-checkout-index: %s already exists\n", path);
185 return -1;
189 * We unlink the old file, to get the new one with the
190 * right permissions (including umask, which is nasty
191 * to emulate by hand - much easier to let the system
192 * just do the right thing)
194 unlink(path);
195 if (S_ISDIR(st.st_mode)) {
196 /* If it is a gitlink, leave it alone! */
197 if (S_ISGITLINK(ntohl(ce->ce_mode)))
198 return 0;
199 if (!state->force)
200 return error("%s is a directory", path);
201 remove_subtree(path);
203 } else if (state->not_new)
204 return 0;
205 create_directories(path, state);
206 return write_entry(ce, path, state, 0);