X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=transport.h;h=df12ea74243cab68cc13eecf61106bba8ace1be4;hb=e2b7eaf0ca3897940961d23392d4ff718867ea9f;hp=b354a8fd18be48c826558a2052872eb56bb136f0;hpb=425b1393139d99d89c7a95906686d9b041f2ee3d;p=git.git

diff --git a/transport.h b/transport.h
index b354a8fd1..df12ea742 100644
--- a/transport.h
+++ b/transport.h
@@ -5,22 +5,11 @@
 #include "remote.h"
 
 struct transport {
-	unsigned verbose : 1;
-	unsigned fetch : 1;
 	struct remote *remote;
 	const char *url;
-
 	void *data;
-
 	struct ref *remote_refs;
 
-	const struct transport_ops *ops;
-};
-
-#define TRANSPORT_PUSH_ALL 1
-#define TRANSPORT_PUSH_FORCE 2
-
-struct transport_ops {
 	/**
 	 * Returns 0 if successful, positive if the option is not
 	 * recognized or is inapplicable, and negative if the option
@@ -30,15 +19,20 @@ struct transport_ops {
 			  const char *value);
 
 	struct ref *(*get_refs_list)(const struct transport *transport);
-	int (*fetch)(const struct transport *transport, int refs_nr, struct ref **refs);
+	int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
 	int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
 
 	int (*disconnect)(struct transport *connection);
+	char *pack_lockfile;
+	signed verbose : 2;
 };
 
+#define TRANSPORT_PUSH_ALL 1
+#define TRANSPORT_PUSH_FORCE 2
+#define TRANSPORT_PUSH_DRY_RUN 4
+
 /* Returns a transport suitable for the url */
-struct transport *transport_get(struct remote *remote, const char *url,
-				int fetch);
+struct transport *transport_get(struct remote *, const char *);
 
 /* Transport options which apply to git:// and scp-style URLs */
 
@@ -54,9 +48,6 @@ struct transport *transport_get(struct remote *remote, const char *url,
 /* Keep the pack that was transferred if not null */
 #define TRANS_OPT_KEEP "keep"
 
-/* Unpack the objects if fewer than this number of objects are fetched */
-#define TRANS_OPT_UNPACKLIMIT "unpacklimit"
-
 /* Limit the depth of the fetch if not null */
 #define TRANS_OPT_DEPTH "depth"
 
@@ -73,7 +64,7 @@ int transport_push(struct transport *connection,
 struct ref *transport_get_remote_refs(struct transport *transport);
 
 int transport_fetch_refs(struct transport *transport, struct ref *refs);
-
+void transport_unlock_pack(struct transport *transport);
 int transport_disconnect(struct transport *transport);
 
 #endif