2005-06-06 04:59:54 +00:00
|
|
|
#include "cache.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "blob.h"
|
2005-06-06 04:59:54 +00:00
|
|
|
|
|
|
|
static void create_directories(const char *path, struct checkout *state)
|
|
|
|
{
|
|
|
|
int len = strlen(path);
|
|
|
|
char *buf = xmalloc(len + 1);
|
|
|
|
const char *slash = path;
|
|
|
|
|
|
|
|
while ((slash = strchr(slash+1, '/')) != NULL) {
|
|
|
|
len = slash - path;
|
|
|
|
memcpy(buf, path, len);
|
|
|
|
buf[len] = 0;
|
2005-07-06 08:21:46 +00:00
|
|
|
if (mkdir(buf, 0777)) {
|
2005-06-06 04:59:54 +00:00
|
|
|
if (errno == EEXIST) {
|
|
|
|
struct stat st;
|
2005-07-06 08:21:46 +00:00
|
|
|
if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0777))
|
2005-06-06 04:59:54 +00:00
|
|
|
continue;
|
|
|
|
if (!stat(buf, &st) && S_ISDIR(st.st_mode))
|
|
|
|
continue; /* ok */
|
|
|
|
}
|
|
|
|
die("cannot create directory at %s", buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void remove_subtree(const char *path)
|
|
|
|
{
|
|
|
|
DIR *dir = opendir(path);
|
|
|
|
struct dirent *de;
|
|
|
|
char pathbuf[PATH_MAX];
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
if (!dir)
|
|
|
|
die("cannot opendir %s", path);
|
|
|
|
strcpy(pathbuf, path);
|
|
|
|
name = pathbuf + strlen(path);
|
|
|
|
*name++ = '/';
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
struct stat st;
|
|
|
|
if ((de->d_name[0] == '.') &&
|
|
|
|
((de->d_name[1] == 0) ||
|
|
|
|
((de->d_name[1] == '.') && de->d_name[2] == 0)))
|
|
|
|
continue;
|
|
|
|
strcpy(name, de->d_name);
|
|
|
|
if (lstat(pathbuf, &st))
|
|
|
|
die("cannot lstat %s", pathbuf);
|
|
|
|
if (S_ISDIR(st.st_mode))
|
|
|
|
remove_subtree(pathbuf);
|
|
|
|
else if (unlink(pathbuf))
|
|
|
|
die("cannot unlink %s", pathbuf);
|
|
|
|
}
|
|
|
|
closedir(dir);
|
|
|
|
if (rmdir(path))
|
|
|
|
die("cannot rmdir %s", path);
|
|
|
|
}
|
|
|
|
|
2005-07-14 16:58:45 +00:00
|
|
|
static int create_file(const char *path, unsigned int mode)
|
2005-06-06 04:59:54 +00:00
|
|
|
{
|
|
|
|
mode = (mode & 0100) ? 0777 : 0666;
|
2006-01-05 08:58:06 +00:00
|
|
|
return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
|
2005-06-06 04:59:54 +00:00
|
|
|
}
|
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
static int write_entry(struct cache_entry *ce, char *path, struct checkout *state, int to_tempfile)
|
2005-06-06 04:59:54 +00:00
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
void *new;
|
|
|
|
unsigned long size;
|
|
|
|
long wrote;
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2005-06-06 04:59:54 +00:00
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
new = read_sha1_file(ce->sha1, &type, &size);
|
|
|
|
if (!new || type != OBJ_BLOB) {
|
2005-06-06 04:59:54 +00:00
|
|
|
if (new)
|
|
|
|
free(new);
|
2005-09-08 00:26:23 +00:00
|
|
|
return error("git-checkout-index: unable to read sha1 file of %s (%s)",
|
2005-06-06 04:59:54 +00:00
|
|
|
path, sha1_to_hex(ce->sha1));
|
|
|
|
}
|
|
|
|
switch (ntohl(ce->ce_mode) & S_IFMT) {
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 19:07:23 +00:00
|
|
|
char *buf;
|
|
|
|
unsigned long nsize;
|
|
|
|
|
2005-06-06 04:59:54 +00:00
|
|
|
case S_IFREG:
|
2006-03-05 08:24:15 +00:00
|
|
|
if (to_tempfile) {
|
|
|
|
strcpy(path, ".merge_file_XXXXXX");
|
|
|
|
fd = mkstemp(path);
|
|
|
|
} else
|
|
|
|
fd = create_file(path, ntohl(ce->ce_mode));
|
2005-06-06 04:59:54 +00:00
|
|
|
if (fd < 0) {
|
|
|
|
free(new);
|
2005-09-08 00:26:23 +00:00
|
|
|
return error("git-checkout-index: unable to create file %s (%s)",
|
2005-06-06 04:59:54 +00:00
|
|
|
path, strerror(errno));
|
|
|
|
}
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 19:07:23 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert from git internal format to working tree format
|
|
|
|
*/
|
|
|
|
buf = new;
|
|
|
|
nsize = size;
|
|
|
|
if (convert_to_working_tree(ce->name, &buf, &nsize)) {
|
|
|
|
free(new);
|
|
|
|
new = buf;
|
|
|
|
size = nsize;
|
|
|
|
}
|
|
|
|
|
2007-01-08 15:58:23 +00:00
|
|
|
wrote = write_in_full(fd, new, size);
|
2005-06-06 04:59:54 +00:00
|
|
|
close(fd);
|
|
|
|
free(new);
|
|
|
|
if (wrote != size)
|
2005-09-08 00:26:23 +00:00
|
|
|
return error("git-checkout-index: unable to write file %s", path);
|
2005-06-06 04:59:54 +00:00
|
|
|
break;
|
|
|
|
case S_IFLNK:
|
2006-03-05 08:24:15 +00:00
|
|
|
if (to_tempfile) {
|
|
|
|
strcpy(path, ".merge_link_XXXXXX");
|
|
|
|
fd = mkstemp(path);
|
|
|
|
if (fd < 0) {
|
|
|
|
free(new);
|
|
|
|
return error("git-checkout-index: unable to create "
|
|
|
|
"file %s (%s)", path, strerror(errno));
|
|
|
|
}
|
2007-01-08 15:58:23 +00:00
|
|
|
wrote = write_in_full(fd, new, size);
|
2006-03-05 08:24:15 +00:00
|
|
|
close(fd);
|
|
|
|
free(new);
|
|
|
|
if (wrote != size)
|
|
|
|
return error("git-checkout-index: unable to write file %s",
|
|
|
|
path);
|
|
|
|
} else {
|
|
|
|
wrote = symlink(new, path);
|
2005-06-06 04:59:54 +00:00
|
|
|
free(new);
|
2006-03-05 08:24:15 +00:00
|
|
|
if (wrote)
|
|
|
|
return error("git-checkout-index: unable to create "
|
|
|
|
"symlink %s (%s)", path, strerror(errno));
|
2005-06-06 04:59:54 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
free(new);
|
2005-09-08 00:26:23 +00:00
|
|
|
return error("git-checkout-index: unknown file mode for %s", path);
|
2005-06-06 04:59:54 +00:00
|
|
|
}
|
|
|
|
|
2005-06-06 06:15:40 +00:00
|
|
|
if (state->refresh_cache) {
|
2005-06-06 04:59:54 +00:00
|
|
|
struct stat st;
|
|
|
|
lstat(ce->name, &st);
|
|
|
|
fill_stat_cache_info(ce, &st);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath)
|
2005-06-06 04:59:54 +00:00
|
|
|
{
|
2006-08-26 14:09:17 +00:00
|
|
|
static char path[PATH_MAX + 1];
|
2006-03-05 08:24:15 +00:00
|
|
|
struct stat st;
|
2005-06-06 04:59:54 +00:00
|
|
|
int len = state->base_dir_len;
|
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
if (topath)
|
|
|
|
return write_entry(ce, topath, state, 1);
|
|
|
|
|
2005-06-06 04:59:54 +00:00
|
|
|
memcpy(path, state->base_dir, len);
|
|
|
|
strcpy(path + len, ce->name);
|
|
|
|
|
|
|
|
if (!lstat(path, &st)) {
|
2006-02-09 05:15:24 +00:00
|
|
|
unsigned changed = ce_match_stat(ce, &st, 1);
|
2005-06-06 04:59:54 +00:00
|
|
|
if (!changed)
|
|
|
|
return 0;
|
|
|
|
if (!state->force) {
|
|
|
|
if (!state->quiet)
|
2005-09-08 00:26:23 +00:00
|
|
|
fprintf(stderr, "git-checkout-index: %s already exists\n", path);
|
2005-10-03 19:44:48 +00:00
|
|
|
return -1;
|
2005-06-06 04:59:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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(path);
|
2005-07-14 16:58:45 +00:00
|
|
|
if (S_ISDIR(st.st_mode)) {
|
|
|
|
if (!state->force)
|
|
|
|
return error("%s is a directory", path);
|
|
|
|
remove_subtree(path);
|
|
|
|
}
|
2006-03-05 08:24:15 +00:00
|
|
|
} else if (state->not_new)
|
2005-06-06 04:59:54 +00:00
|
|
|
return 0;
|
|
|
|
create_directories(path, state);
|
2006-03-05 08:24:15 +00:00
|
|
|
return write_entry(ce, path, state, 0);
|
2005-06-06 04:59:54 +00:00
|
|
|
}
|