Re: [PATCH 5/8] fetch-pack.c: send "skip" line to pack-objects

[Eric Sunshine]

On Fri, Feb 5, 2016 at 3:57 AM, Nguyễn Thái Ngọc Duy  wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy 
> ---
> diff --git a/fetch-pack.c b/fetch-pack.c
> @@ -856,6 +864,8 @@ static struct ref *do_fetch_pack(struct fetch_pack_args 
> *args,
> fprintf(stderr, "Server supports ofs-delta\n");
> } else
> prefer_ofs_delta = 0;
> +   if (args->resume_path && !server_supports("partial"))
> +   die(_("Server does not support resume capability\n"));

Drop "\n" from die() message.

> if ((agent_feature = server_feature_value("agent", _len))) {
> agent_supported = 1;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 5/8] fetch-pack.c: send "skip" line to pack-objects

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy 
---
 fetch-pack.c | 40 
 fetch-pack.h |  3 +++
 2 files changed, 43 insertions(+)

diff --git a/fetch-pack.c b/fetch-pack.c
index 01e34b6..ffb5254 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -15,6 +15,7 @@
 #include "version.h"
 #include "prio-queue.h"
 #include "sha1-array.h"
+#include "dir.h"
 
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
@@ -330,6 +331,10 @@ static int find_common(struct fetch_pack_args *args,
write_shallow_commits(_buf, 1, NULL);
if (args->depth > 0)
packet_buf_write(_buf, "deepen %d", args->depth);
+   if (args->resume_path)
+   packet_buf_write(_buf, "skip %s %d",
+sha1_to_hex(args->skip_hash),
+args->skip_offset);
packet_buf_flush(_buf);
state_len = req_buf.len;
 
@@ -730,6 +735,9 @@ static int get_pack(struct fetch_pack_args *args,
argv_array_push(, "-v");
if (args->use_thin_pack)
argv_array_push(, "--fix-thin");
+   if (args->resume_path && args->skip_offset)
+   argv_array_pushf(, "--append-pack=%s",
+args->resume_path);
if (args->lock_pack || unpack_limit) {
char hostname[256];
if (gethostname(hostname, sizeof(hostname)))
@@ -856,6 +864,8 @@ static struct ref *do_fetch_pack(struct fetch_pack_args 
*args,
fprintf(stderr, "Server supports ofs-delta\n");
} else
prefer_ofs_delta = 0;
+   if (args->resume_path && !server_supports("partial"))
+   die(_("Server does not support resume capability\n"));
 
if ((agent_feature = server_feature_value("agent", _len))) {
agent_supported = 1;
@@ -1030,6 +1040,35 @@ static void update_shallow(struct fetch_pack_args *args,
sha1_array_clear();
 }
 
+static void prepare_resume_fetch(struct fetch_pack_args *args)
+{
+   git_SHA_CTX c;
+   char buf[8192];
+   int fd, len;
+
+   if (!args->resume_path)
+   return;
+
+   args->skip_offset = 0;
+   args->keep_pack = 1;
+   if (!file_exists(args->resume_path))
+   return;
+
+   fd = open(args->resume_path, O_RDONLY);
+   if (fd == -1)
+   die_errno(_("failed to open '%s'"), args->resume_path);
+
+   git_SHA1_Init();
+   while ((len = xread(fd, buf, sizeof(buf))) > 0) {
+   git_SHA1_Update(, buf, len);
+   args->skip_offset += len;
+   }
+   if (len < 0)
+   die_errno(_("failed to read '%s'"), args->resume_path);
+   git_SHA1_Final(args->skip_hash, );
+   close(fd);
+}
+
 struct ref *fetch_pack(struct fetch_pack_args *args,
   int fd[], struct child_process *conn,
   const struct ref *ref,
@@ -1050,6 +1089,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
die("no matching remote head");
}
prepare_shallow_info(, shallow);
+   prepare_resume_fetch(args);
ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
, pack_lockfile);
reprepare_packed_git();
diff --git a/fetch-pack.h b/fetch-pack.h
index bb7fd76..46f0997 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -10,6 +10,9 @@ struct fetch_pack_args {
const char *uploadpack;
int unpacklimit;
int depth;
+   const char *resume_path;
+   int skip_offset;
+   unsigned char skip_hash[20];
unsigned quiet:1;
unsigned keep_pack:1;
unsigned lock_pack:1;
-- 
2.7.0.377.g4cd97dd

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html