git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 19/19] transport-helper: implement marks location as capability

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Jun 8, 2011, 18:48 UTC
Message-ID
<1307558930-16074-20-git-send-email-srabbelier@gmail.com>
In-Reply-To
<1307558930-16074-1-git-send-email-srabbelier@gmail.com>

While this requires the helper to flush stdout after listing 'gitdir' as capability, and read a command (the 'gitdir' response from the remote helper infrastructure) right after that, this is more elegant and does not require an ad-hoc exchange of values.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
  Sanity check added as suggested by Jonathan during review.
 git-remote-testgit.py |   31 ++++++++++++++++++-------------
 transport-helper.c    |   47 ++++++++++++++++++-----------------------------
 2 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/git-remote-testgit.py b/git-remote-testgit.py
index 88bcb20..d882fa3 100644
--- a/git-remote-testgit.py
+++ b/git-remote-testgit.py
@@ -71,8 +71,26 @@ def do_capabilities(repo, args):
     print "import"
     print "export"
     print "gitdir"
+
+    sys.stdout.flush()
+    if not read_one_line(repo):
+        die("Expected gitdir, got empty line")
+    if not repo.gitdir:
+        die("Expected gitdir, got something else")
+
     print "refspec refs/heads/*:%s*" % repo.prefix
 
+    dirname = repo.get_base_path(repo.gitdir)
+
+    if not os.path.exists(dirname):
+        os.makedirs(dirname)
+
+    path = os.path.join(dirname, 'testgit.marks')
+
+    print "*export-marks %s" % path
+    if os.path.exists(path):
+        print "*import-marks %s" % path
+
     print # end capabilities
 
 
@@ -142,19 +160,6 @@ def do_export(repo, args):
     if not repo.gitdir:
         die("Need gitdir to export")
 
-    dirname = repo.get_base_path(repo.gitdir)
-
-    if not os.path.exists(dirname):
-        os.makedirs(dirname)
-
-    path = os.path.join(dirname, 'testgit.marks')
-    print path
-    if os.path.exists(path):
-        print path
-    else:
-        print ""
-    sys.stdout.flush()
-
     update_local_repo(repo)
     repo.importer.do_import(repo.gitdir)
 
diff --git a/transport-helper.c b/transport-helper.c
index ddf0ffa..12f08a1 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -23,6 +23,8 @@ struct helper_data {
 		push : 1,
 		connect : 1,
 		no_disconnect_req : 1;
+	char *export_marks;
+	char *import_marks;
 	/* These go from remote name (as in "list") to private name */
 	struct refspec *refspecs;
 	int refspec_nr;
@@ -179,6 +181,16 @@ static struct child_process *get_helper(struct transport *transport)
 			strbuf_addf(&gitdir, "gitdir %s\n", get_git_dir());
 			sendline(data, &gitdir);
 			strbuf_release(&gitdir);
+		} else if (!prefixcmp(capname, "export-marks ")) {
+			struct strbuf arg = STRBUF_INIT;
+			strbuf_addstr(&arg, "--export-marks=");
+			strbuf_addstr(&arg, capname + strlen("export-marks "));
+			data->export_marks = strbuf_detach(&arg, NULL);
+		} else if (!prefixcmp(capname, "import-marks")) {
+			struct strbuf arg = STRBUF_INIT;
+			strbuf_addstr(&arg, "--import-marks=");
+			strbuf_addstr(&arg, capname + strlen("import-marks "));
+			data->import_marks = strbuf_detach(&arg, NULL);
 		} else if (mandatory) {
 			die("Unknown mandatory capability %s. This remote "
 			    "helper probably needs newer version of Git.\n",
@@ -364,10 +376,9 @@ static int get_importer(struct transport *transport, struct child_process *fasti
 
 static int get_exporter(struct transport *transport,
 			struct child_process *fastexport,
-			const char *export_marks,
-			const char *import_marks,
 			struct string_list *revlist_args)
 {
+	struct helper_data *data = transport->data;
 	struct child_process *helper = get_helper(transport);
 	int argc = 0, i;
 	memset(fastexport, 0, sizeof(*fastexport));
@@ -378,10 +389,10 @@ static int get_exporter(struct transport *transport,
 	fastexport->argv = xcalloc(5 + revlist_args->nr, sizeof(*fastexport->argv));
 	fastexport->argv[argc++] = "fast-export";
 	fastexport->argv[argc++] = "--use-done-feature";
-	if (export_marks)
-		fastexport->argv[argc++] = export_marks;
-	if (import_marks)
-		fastexport->argv[argc++] = import_marks;
+	if (data->export_marks)
+		fastexport->argv[argc++] = data->export_marks;
+	if (data->import_marks)
+		fastexport->argv[argc++] = data->import_marks;
 
 	for (i = 0; i < revlist_args->nr; i++)
 		fastexport->argv[argc++] = revlist_args->items[i].string;
@@ -710,7 +721,6 @@ static int push_refs_with_export(struct transport *transport,
 	struct ref *ref;
 	struct child_process *helper, exporter;
 	struct helper_data *data = transport->data;
-	char *export_marks = NULL, *import_marks = NULL;
 	struct string_list revlist_args = STRING_LIST_INIT_NODUP;
 	struct strbuf buf = STRBUF_INIT;
 
@@ -718,26 +728,6 @@ static int push_refs_with_export(struct transport *transport,
 
 	write_constant(helper->in, "export\n");
 
-	recvline(data, &buf);
-	if (debug)
-		fprintf(stderr, "Debug: Got export_marks '%s'\n", buf.buf);
-	if (buf.len) {
-		struct strbuf arg = STRBUF_INIT;
-		strbuf_addstr(&arg, "--export-marks=");
-		strbuf_addbuf(&arg, &buf);
-		export_marks = strbuf_detach(&arg, NULL);
-	}
-
-	recvline(data, &buf);
-	if (debug)
-		fprintf(stderr, "Debug: Got import_marks '%s'\n", buf.buf);
-	if (buf.len) {
-		struct strbuf arg = STRBUF_INIT;
-		strbuf_addstr(&arg, "--import-marks=");
-		strbuf_addbuf(&arg, &buf);
-		import_marks = strbuf_detach(&arg, NULL);
-	}
-
 	strbuf_reset(&buf);
 
 	for (ref = remote_refs; ref; ref = ref->next) {
@@ -758,8 +748,7 @@ static int push_refs_with_export(struct transport *transport,
 
 	}
 
-	if (get_exporter(transport, &exporter,
-			 export_marks, import_marks, &revlist_args))
+	if (get_exporter(transport, &exporter, &revlist_args))
 		die("Couldn't run fast-export");
 
 	if (finish_command(&exporter))

-- 
1.7.5.1.292.g728120
Previous: Sverre Rabbelier
Message 54 of 54 in “remote-helper improvements”
  1. 00/19 remote-helper improvementsSverre Rabbelier, Jun 8, 2011
  2. 01/19 transport-helper: fix minor leak in push_refs_with_exportSverre Rabbelier, Jun 8, 2011
  3. Jeff KingJun 8, 2011
  4. Sverre RabbelierJun 8, 2011
  5. 02/19 t5800: factor out some ref testsSverre Rabbelier, Jun 8, 2011
  6. 03/19 t5800: document some non-functional parts of remote helpersSverre Rabbelier, Jun 8, 2011
  7. Jonathan NiederJun 8, 2011
  8. Jonathan NiederJun 8, 2011
  9. Sverre RabbelierJun 8, 2011
  10. Sverre RabbelierJun 8, 2011
  11. Sverre RabbelierJun 9, 2011
  12. Jeff KingJun 10, 2011
  13. 04/19 teach remote-testgit to import non-HEAD refsSverre Rabbelier, Jun 8, 2011
  14. Jonathan NiederJun 8, 2011
  15. Sverre RabbelierJun 8, 2011
  16. Jeff KingJun 8, 2011
  17. Junio C HamanoJun 8, 2011
  18. Sverre RabbelierJun 9, 2011
  19. 05/19 transport-helper: don't feed bogus refs to export pushSverre Rabbelier, Jun 8, 2011
  20. 06/19 git_remote_helpers: push all refs during a non-local exportSverre Rabbelier, Jun 8, 2011
  21. Jonathan NiederJun 8, 2011
  22. Jeff KingJun 8, 2011
  23. Sverre RabbelierJun 8, 2011
  24. Jonathan NiederJun 9, 2011
  25. Sverre RabbelierJun 9, 2011
  26. Jonathan NiederJun 9, 2011
  27. Sverre RabbelierJun 9, 2011
  28. Jeff KingJun 10, 2011
  29. 07/19 remote-curl: accept empty line as terminatorSverre Rabbelier, Jun 8, 2011
  30. 08/19 git-remote-testgit: only push for non-local repositoriesSverre Rabbelier, Jun 8, 2011
  31. 09/19 git-remote-testgit: fix error handlingSverre Rabbelier, Jun 8, 2011
  32. 10/19 fast-import: introduce 'done' commandSverre Rabbelier, Jun 8, 2011
  33. Jonathan NiederJun 8, 2011
  34. Sverre RabbelierJun 8, 2011
  35. 11/19 fast-export: support done featureSverre Rabbelier, Jun 8, 2011
  36. 12/19 transport-helper: factor out push_update_refs_statusSverre Rabbelier, Jun 8, 2011
  37. 13/19 transport-helper: check status code of finish_commandSverre Rabbelier, Jun 8, 2011
  38. 14/19 transport-helper: use the new done feature where possibleSverre Rabbelier, Jun 8, 2011
  39. 15/19 transport-helper: update ref status after push with exportSverre Rabbelier, Jun 8, 2011
  40. Jonathan NiederJun 9, 2011
  41. Sverre RabbelierJun 9, 2011
  42. 16/19 transport-helper: change import semanticsSverre Rabbelier, Jun 8, 2011
  43. Jonathan NiederJun 8, 2011
  44. Sverre RabbelierJun 8, 2011
  45. 17/19 transport-helper: export is no longer always the last commandSverre Rabbelier, Jun 8, 2011
  46. Junio C HamanoJun 9, 2011
  47. Sverre RabbelierJun 9, 2011
  48. Jonathan NiederJun 9, 2011
  49. Sverre RabbelierJun 9, 2011
  50. Junio C HamanoJun 13, 2011
  51. 18/19 transport-helper: Use capname for gitdir capability tooSverre Rabbelier, Jun 8, 2011
  52. Jonathan NiederJun 8, 2011
  53. Sverre RabbelierJun 8, 2011
  54. 19/19 transport-helper: implement marks location as capabilitySverre Rabbelier, Jun 8, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.