From: Junio C Hamano Date: Mon, 2 May 2005 04:09:28 +0000 (-0700) Subject: [PATCH] Add git-local-pull. X-Git-Tag: v0.99~664 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dfcb405799fa620028e492299a60438a7b4a35ff;p=git.git [PATCH] Add git-local-pull. This adds the git-local-pull command as a smaller brother of http-pull and rpull. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff --git a/Makefile b/Makefile index a3028efd8..86aca6126 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-check-files git-ls-tree git-merge-base git-merge-cache \ git-unpack-file git-export git-diff-cache git-convert-cache \ git-http-pull git-rpush git-rpull git-rev-list git-mktag \ - git-diff-tree-helper git-tar-tree + git-diff-tree-helper git-tar-tree git-local-pull all: $(PROG) @@ -87,6 +87,7 @@ git-export: export.c git-diff-cache: diff-cache.c git-convert-cache: convert-cache.c git-http-pull: http-pull.c pull.c +git-local-pull: local-pull.c pull.c git-rpush: rsh.c git-rpull: rsh.c pull.c git-rev-list: rev-list.c diff --git a/local-pull.c b/local-pull.c new file mode 100644 index 000000000..0a9a366e0 --- /dev/null +++ b/local-pull.c @@ -0,0 +1,110 @@ +#include +#include +#include +#include +#include "cache.h" +#include "commit.h" +#include +#include +#include "pull.h" + +static int use_link = 0; +static int use_symlink = 0; +static int verbose = 0; + +static char *path; + +static void say(const char *fmt, const char *hex) { + if (verbose) + fprintf(stderr, fmt, hex); +} + +int fetch(unsigned char *sha1) +{ + static int object_name_start = -1; + 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 */ + strcat(filename, "/objects/"); + object_name_start = strlen(filename); + } + filename[object_name_start+0] = hex[0]; + filename[object_name_start+1] = hex[1]; + filename[object_name_start+2] = '/'; + strcpy(filename + object_name_start + 3, hex + 2); + if (use_link && !link(filename, dest_filename)) { + say("Hardlinked %s.\n", hex); + return 0; + } + if (use_symlink && !symlink(filename, dest_filename)) { + say("Symlinked %s.\n", hex); + return 0; + } + 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); + 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; +} + +static const char *local_pull_usage = +"git-local-pull [-c] [-t] [-a] [-l] [-s] [-v] commit-id path"; + +int main(int argc, char **argv) +{ + char *commit_id; + int arg = 1; + + while (arg < argc && argv[arg][0] == '-') { + if (argv[arg][1] == 't') + get_tree = 1; + else if (argv[arg][1] == 'c') + get_history = 1; + else if (argv[arg][1] == 'a') { + get_all = 1; + get_tree = 1; + get_history = 1; + } + else if (argv[arg][1] == 'l') + use_link = 1; + else if (argv[arg][1] == 's') + use_symlink = 1; + else if (argv[arg][1] == 'v') + verbose = 1; + else + usage(local_pull_usage); + arg++; + } + if (argc < arg + 2) + usage(local_pull_usage); + commit_id = argv[arg]; + path = argv[arg + 1]; + + if (pull(commit_id)) + return 1; + + return 0; +}