[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/local-pull.c b/local-pull.c
index 4f52bca48c390e8113b3695a53ce62e0c23278a8..2f06fbee8b840a7ae642f5a22e2cb993687f3470 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -1,27 +1,15 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
 #include "pull.h"
 
 static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
-static int verbose = 0;
 
-static char *path;
-
-static void say(const char *fmt, const char *hex) {
-       if (verbose)
-               fprintf(stderr, fmt, hex);
-}
+static char *path; /* "Remote" git repository */
 
 int fetch(unsigned char *sha1)
 {
@@ -41,7 +29,7 @@ int fetch(unsigned char *sha1)
        strcpy(filename + object_name_start + 3, hex + 2);
        if (use_link) {
                if (!link(filename, dest_filename)) {
-                       say("link %s\n", hex);
+                       pull_say("link %s\n", hex);
                        return 0;
                }
                /* If we got ENOENT there is no point continuing. */
@@ -51,7 +39,7 @@ int fetch(unsigned char *sha1)
                }
        }
        if (use_symlink && !symlink(filename, dest_filename)) {
-               say("symlink %s\n", hex);
+               pull_say("symlink %s\n", hex);
                return 0;
        }
        if (use_filecopy) {
@@ -76,18 +64,45 @@ int fetch(unsigned char *sha1)
                munmap(map, st.st_size);
                close(ofd);
                if (status)
-                       fprintf(stderr, "cannot write %s (%ld bytes)\n",
-                               dest_filename, st.st_size);
+                       fprintf(stderr, "cannot write %s\n", dest_filename);
                else
-                       say("copy %s\n", hex);
+                       pull_say("copy %s\n", hex);
                return status;
        }
        fprintf(stderr, "failed to copy %s with given copy methods.\n", hex);
        return -1;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       static int ref_name_start = -1;
+       static char filename[PATH_MAX];
+       static char hex[41];
+       int ifd;
+
+       if (ref_name_start < 0) {
+               sprintf(filename, "%s/refs/", path);
+               ref_name_start = strlen(filename);
+       }
+       strcpy(filename + ref_name_start, ref);
+       ifd = open(filename, O_RDONLY);
+       if (ifd < 0) {
+               close(ifd);
+               fprintf(stderr, "cannot open %s\n", filename);
+               return -1;
+       }
+       if (read(ifd, hex, 40) != 40 || get_sha1_hex(hex, sha1)) {
+               close(ifd);
+               fprintf(stderr, "cannot read from %s\n", filename);
+               return -1;
+       }
+       close(ifd);
+       pull_say("ref %s\n", sha1_to_hex(sha1));
+       return 0;
+}
+
 static const char *local_pull_usage = 
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -117,7 +132,9 @@ int main(int argc, char **argv)
                else if (argv[arg][1] == 'n')
                        use_filecopy = 0;
                else if (argv[arg][1] == 'v')
-                       verbose = 1;
+                       get_verbosely = 1;
+               else if (argv[arg][1] == 'w')
+                       write_ref = argv[++arg];
                else
                        usage(local_pull_usage);
                arg++;