From 11bb5b8ae8ceefcd74b5870f9a1d4001ff9b2676 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 24 Jul 2011 15:54:04 +0200
Subject: [PATCH 1/4] t9350: point out that refs are not updated correctly
This happens only when the corresponding commits are not exported in
the current fast-export run. This can happen either when the relevant
commit is already marked, or when the commit is explicitly marked
as UNINTERESTING with a negative ref by another argument.
This breaks fast-export basec remote helpers.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
t/t9350-fast-export.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 40427883ec6dbf..abffd267e259c4 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -801,4 +801,15 @@ test_expect_success 'fast-export handles --end-of-options' '
test_cmp expect actual
'
+cat > expected << EOF
+reset refs/heads/master
+from $(git rev-parse master)
+
+EOF
+
+test_expect_failure 'refs are updated even if no commits need to be exported' '
+ git fast-export master..master > actual &&
+ test_cmp expected actual
+'
+
test_done
From aec753c7130999bdb8a0c35b59a4d2d9daef3e47 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sat, 28 Aug 2010 20:49:01 -0500
Subject: [PATCH 2/4] transport-helper: add trailing --
[PT: ensure we add an additional element to the argv array]
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
transport-helper.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index d457b425501a74..fed5d51a2b3d34 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -499,6 +499,8 @@ static int get_exporter(struct transport *transport,
for (size_t i = 0; i < revlist_args->nr; i++)
strvec_push(&fastexport->args, revlist_args->items[i].string);
+ strvec_push(&fastexport->args, "--");
+
fastexport->git_cmd = 1;
return start_command(fastexport);
}
From 31e1af5cb5d537c4ed86d3cfc280a2e9a8adba56 Mon Sep 17 00:00:00 2001
From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 24 Jul 2011 00:06:00 +0200
Subject: [PATCH 3/4] remote-helper: check helper status after import/export
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index d21877150ed82e..3917da47276825 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -262,7 +262,7 @@ test_expect_success 'push update refs failure' '
echo "update fail" >>file &&
git commit -a -m "update fail" &&
git rev-parse --verify testgit/origin/heads/update >expect &&
- test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
+ test_must_fail env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
git push origin update &&
git rev-parse --verify testgit/origin/heads/update >actual &&
test_cmp expect actual
diff --git a/transport-helper.c b/transport-helper.c
index fed5d51a2b3d34..72588c4d14e3ff 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -505,6 +505,19 @@ static int get_exporter(struct transport *transport,
return start_command(fastexport);
}
+static void check_helper_status(struct helper_data *data)
+{
+ int pid, status;
+
+ pid = waitpid(data->helper->pid, &status, WNOHANG);
+ if (pid < 0)
+ die("Could not retrieve status of remote helper '%s'",
+ data->name);
+ if (pid > 0 && WIFEXITED(status))
+ die("Remote helper '%s' died with %d",
+ data->name, WEXITSTATUS(status));
+}
+
static int fetch_with_import(struct transport *transport,
int nr_heads, struct ref **to_fetch)
{
@@ -541,6 +554,7 @@ static int fetch_with_import(struct transport *transport,
if (finish_command(&fastimport))
die(_("error while running fast-import"));
+ check_helper_status(data);
/*
* The fast-import stream of a remote helper that advertises
@@ -1160,6 +1174,7 @@ static int push_refs_with_export(struct transport *transport,
if (finish_command(&exporter))
die(_("error while running fast-export"));
+ check_helper_status(data);
if (push_update_refs_status(data, remote_refs, flags))
return 1;
From df3998b77f61a7638899cec6cbfc9ecda23581ac Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 9 Apr 2012 13:04:35 -0500
Subject: [PATCH 4/4] Always auto-gc after calling a fast-import transport
After importing anything with fast-import, we should always let the
garbage collector do its job, since the objects are written to disk
inefficiently.
This brings down an initial import of http://selenic.com/hg from about
230 megabytes to about 14.
In the future, we may want to make this configurable on a per-remote
basis, or maybe teach fast-import about it in the first place.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
transport-helper.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index 72588c4d14e3ff..7513fd7eea05e4 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -22,6 +22,8 @@
#include "packfile.h"
static int debug;
+/* TODO: put somewhere sensible, e.g. git_transport_options? */
+static int auto_gc = 1;
struct helper_data {
char *name;
@@ -588,6 +590,13 @@ static int fetch_with_import(struct transport *transport,
}
}
strbuf_release(&buf);
+ if (auto_gc) {
+ struct child_process cmd = CHILD_PROCESS_INIT;
+
+ cmd.git_cmd = 1;
+ strvec_pushl(&cmd.args, "gc", "--auto", "--quiet", NULL);
+ run_command(&cmd);
+ }
return 0;
}