summaryrefslogtreecommitdiff
path: root/local-pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-02 04:10:04 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-02 04:10:04 (GMT)
commitb02a26cb877319f0367725ce87aead42488714cb (patch)
tree30a0fb44e580dbd41d0ec3e0c299a32d3920d5f1 /local-pull.c
parent7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd (diff)
downloadgit-b02a26cb877319f0367725ce87aead42488714cb.zip
git-b02a26cb877319f0367725ce87aead42488714cb.tar.gz
git-b02a26cb877319f0367725ce87aead42488714cb.tar.bz2
[PATCH] git-local-pull updates
This is to be applied on top of the previous patch to add git-local-pull command. In addition to the '-l' (attempt hardlink before anything else) and the '-s' (then attempt symlink) flags, it adds '-n' (do not fall back to file copy) flag. Also it updates the comments. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'local-pull.c')
-rw-r--r--local-pull.c65
1 files changed, 41 insertions, 24 deletions
diff --git a/local-pull.c b/local-pull.c
index 0a9a366..ea38d87 100644
--- a/local-pull.c
+++ b/local-pull.c
@@ -1,3 +1,6 @@
+/*
+ * Copyright (C) 2005 Junio C Hamano
+ */
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
@@ -10,6 +13,7 @@
static int use_link = 0;
static int use_symlink = 0;
+static int use_filecopy = 1;
static int verbose = 0;
static char *path;
@@ -25,9 +29,6 @@ int fetch(unsigned char *sha1)
static char filename[PATH_MAX];
char *hex = sha1_to_hex(sha1);
const char *dest_filename = sha1_file_name(sha1);
- int ifd, ofd, status;
- struct stat st;
- void *map;
if (object_name_start < 0) {
strcpy(filename, path); /* e.g. git.git */
@@ -46,33 +47,47 @@ int fetch(unsigned char *sha1)
say("Symlinked %s.\n", hex);
return 0;
}
- ifd = open(filename, O_RDONLY);
- if (ifd < 0 || fstat(ifd, &st) < 0) {
+ if (use_filecopy) {
+ int ifd, ofd, status;
+ struct stat st;
+ void *map;
+ ifd = open(filename, O_RDONLY);
+ if (ifd < 0 || fstat(ifd, &st) < 0) {
+ close(ifd);
+ fprintf(stderr, "Cannot open %s\n", filename);
+ return -1;
+ }
+ map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, ifd, 0);
close(ifd);
- fprintf(stderr, "Cannot open %s\n", filename);
- return -1;
- }
- map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, ifd, 0);
- close(ifd);
- if (-1 == (int)(long)map) {
- fprintf(stderr, "Cannot mmap %s\n", filename);
- return -1;
+ if (-1 == (int)(long)map) {
+ fprintf(stderr, "Cannot mmap %s\n", filename);
+ return -1;
+ }
+ ofd = open(dest_filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
+ status = ((ofd < 0) ||
+ (write(ofd, map, st.st_size) != st.st_size));
+ munmap(map, st.st_size);
+ close(ofd);
+ if (status)
+ fprintf(stderr, "Cannot write %s (%ld bytes)\n",
+ dest_filename, st.st_size);
+ else
+ say("Copied %s.\n", hex);
+ return status;
}
- ofd = open(dest_filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
- status = ((ofd < 0) || (write(ofd, map, st.st_size) != st.st_size));
- munmap(map, st.st_size);
- close(ofd);
- if (status)
- fprintf(stderr, "Cannot write %s (%ld bytes)\n",
- dest_filename, st.st_size);
- else
- say("Copied %s.\n", hex);
- return status;
+ fprintf(stderr, "No copy method was provided to copy %s.\n", hex);
+ return -1;
}
static const char *local_pull_usage =
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-v] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] commit-id path";
+/*
+ * By default we only use file copy.
+ * If -l is specified, a hard link is attempted.
+ * If -s is specified, then a symlink is attempted.
+ * If -n is _not_ specified, then a regular file-to-file copy is done.
+ */
int main(int argc, char **argv)
{
char *commit_id;
@@ -92,6 +107,8 @@ int main(int argc, char **argv)
use_link = 1;
else if (argv[arg][1] == 's')
use_symlink = 1;
+ else if (argv[arg][1] == 'n')
+ use_filecopy = 0;
else if (argv[arg][1] == 'v')
verbose = 1;
else