From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 22 Mar 2011 23:19:46 +0000 (-0500)
Subject: Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
X-Git-Tag: v1.7.10-rc0~118^2~4^2~4^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa6c4bceabdb7bc4bf8946c4887f08e9765f5ff6;p=git.git

Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge

* db/strbufs-for-metadata:
  vcs-svn: use strbuf for author, UUID, and URL
  vcs-svn: use strbuf for revision log

Conflicts:
	vcs-svn/fast_export.c
	vcs-svn/fast_export.h
	vcs-svn/repo_tree.c
	vcs-svn/svndump.c
---

fa6c4bceabdb7bc4bf8946c4887f08e9765f5ff6
diff --cc vcs-svn/fast_export.c
index 32f0c8cfc,a4d4d9993..a64a3c563
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@@ -59,8 -31,8 +59,8 @@@ void fast_export_modify(uint32_t depth
  }
  
  static char gitsvnline[MAX_GITSVN_LINE_LEN];
- void fast_export_begin_commit(uint32_t revision, uint32_t author, char *log,
- 			uint32_t uuid, uint32_t url,
 -void fast_export_commit(uint32_t revision, const char *author, char *log,
++void fast_export_begin_commit(uint32_t revision, const char *author, char *log,
+ 			const char *uuid, const char *url,
  			unsigned long timestamp)
  {
  	if (!log)
@@@ -73,11 -45,10 +73,11 @@@
  		*gitsvnline = '\0';
  	}
  	printf("commit refs/heads/master\n");
 +	printf("mark :%"PRIu32"\n", revision);
  	printf("committer %s <%s@%s> %ld +0000\n",
- 		   ~author ? pool_fetch(author) : "nobody",
- 		   ~author ? pool_fetch(author) : "nobody",
- 		   ~uuid ? pool_fetch(uuid) : "local", timestamp);
+ 		   *author ? author : "nobody",
+ 		   *author ? author : "nobody",
+ 		   *uuid ? uuid : "local", timestamp);
  	printf("data %"PRIu32"\n%s%s\n",
  		   (uint32_t) (strlen(log) + strlen(gitsvnline)),
  		   log, gitsvnline);
diff --cc vcs-svn/fast_export.h
index 633d21944,05cf97f3a..fc1424242
--- a/vcs-svn/fast_export.h
+++ b/vcs-svn/fast_export.h
@@@ -1,25 -1,15 +1,26 @@@
  #ifndef FAST_EXPORT_H_
  #define FAST_EXPORT_H_
  
 -#include "line_buffer.h"
 +struct strbuf;
 +struct line_buffer;
  
 -void fast_export_delete(uint32_t depth, uint32_t *path);
 -void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
 -			uint32_t mark);
 -void fast_export_commit(uint32_t revision, const char *author, char *log,
 +void fast_export_init(int fd);
 +void fast_export_deinit(void);
 +void fast_export_reset(void);
 +
 +void fast_export_delete(uint32_t depth, const uint32_t *path);
 +void fast_export_modify(uint32_t depth, const uint32_t *path,
 +			uint32_t mode, const char *dataref);
- void fast_export_begin_commit(uint32_t revision, uint32_t author, char *log,
- 			uint32_t uuid, uint32_t url, unsigned long timestamp);
++void fast_export_begin_commit(uint32_t revision, const char *author, char *log,
+ 			const char *uuid, const char *url,
+ 			unsigned long timestamp);
 -void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len,
 -		      struct line_buffer *input);
 +void fast_export_end_commit(uint32_t revision);
 +void fast_export_data(uint32_t mode, uint32_t len, struct line_buffer *input);
 +
 +/* If there is no such file at that rev, returns -1, errno == ENOENT. */
 +int fast_export_ls_rev(uint32_t rev, uint32_t depth, const uint32_t *path,
 +			uint32_t *mode_out, struct strbuf *dataref_out);
 +int fast_export_ls(uint32_t depth, const uint32_t *path,
 +			uint32_t *mode_out, struct strbuf *dataref_out);
  
  #endif
diff --cc vcs-svn/repo_tree.h
index d690784fb,a1b0e8765..29887f976
--- a/vcs-svn/repo_tree.h
+++ b/vcs-svn/repo_tree.h
@@@ -14,11 -14,12 +14,12 @@@
  uint32_t next_blob_mark(void);
  void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst);
  void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark);
 -uint32_t repo_read_path(const uint32_t *path);
 +const char *repo_read_path(const uint32_t *path);
  uint32_t repo_read_mode(const uint32_t *path);
  void repo_delete(uint32_t *path);
- void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
- 		 uint32_t url, long unsigned timestamp);
+ void repo_commit(uint32_t revision, const char *author,
+ 		char *log, const char *uuid, const char *url,
+ 		long unsigned timestamp);
  void repo_diff(uint32_t r1, uint32_t r2);
  void repo_init(void);
  void repo_reset(void);
diff --cc vcs-svn/svndump.c
index ff985fe9e,7ac74877f..f5de49cbe
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@@ -11,17 -11,9 +11,17 @@@
  #include "repo_tree.h"
  #include "fast_export.h"
  #include "line_buffer.h"
- #include "obj_pool.h"
  #include "string_pool.h"
+ #include "strbuf.h"
  
 +#define REPORT_FILENO 3
 +
 +/*
 + * Compare start of string to literal of equal length;
 + * must be guarded by length test.
 + */
 +#define constcmp(s, ref) memcmp(s, ref, sizeof(ref) - 1)
 +
  #define NODEACT_REPLACE 4
  #define NODEACT_DELETE 3
  #define NODEACT_ADD 2
@@@ -66,9 -42,19 +52,10 @@@ static struct 
  } rev_ctx;
  
  static struct {
- 	uint32_t version, uuid, url;
+ 	uint32_t version;
+ 	struct strbuf uuid, url;
  } dump_ctx;
  
 -static struct {
 -	uint32_t svn_log, svn_author, svn_date, svn_executable, svn_special, uuid,
 -		revision_number, node_path, node_kind, node_action,
 -		node_copyfrom_path, node_copyfrom_rev, text_content_length,
 -		prop_content_length, content_length, svn_fs_dump_format_version,
 -		/* version 3 format */
 -		text_delta, prop_delta;
 -} keys;
 -
  static void reset_node_ctx(char *fname)
  {
  	node_ctx.type = 0;
@@@ -86,41 -72,55 +73,45 @@@ static void reset_rev_ctx(uint32_t revi
  {
  	rev_ctx.revision = revision;
  	rev_ctx.timestamp = 0;
- 	rev_ctx.log = NULL;
- 	rev_ctx.author = ~0;
+ 	strbuf_reset(&rev_ctx.log);
+ 	strbuf_reset(&rev_ctx.author);
  }
  
- static void reset_dump_ctx(uint32_t url)
+ static void reset_dump_ctx(const char *url)
  {
- 	dump_ctx.url = url;
+ 	strbuf_reset(&dump_ctx.url);
+ 	if (url)
+ 		strbuf_addstr(&dump_ctx.url, url);
  	dump_ctx.version = 1;
- 	dump_ctx.uuid = ~0;
+ 	strbuf_reset(&dump_ctx.uuid);
  }
  
 -static void init_keys(void)
 -{
 -	keys.svn_log = pool_intern("svn:log");
 -	keys.svn_author = pool_intern("svn:author");
 -	keys.svn_date = pool_intern("svn:date");
 -	keys.svn_executable = pool_intern("svn:executable");
 -	keys.svn_special = pool_intern("svn:special");
 -	keys.uuid = pool_intern("UUID");
 -	keys.revision_number = pool_intern("Revision-number");
 -	keys.node_path = pool_intern("Node-path");
 -	keys.node_kind = pool_intern("Node-kind");
 -	keys.node_action = pool_intern("Node-action");
 -	keys.node_copyfrom_path = pool_intern("Node-copyfrom-path");
 -	keys.node_copyfrom_rev = pool_intern("Node-copyfrom-rev");
 -	keys.text_content_length = pool_intern("Text-content-length");
 -	keys.prop_content_length = pool_intern("Prop-content-length");
 -	keys.content_length = pool_intern("Content-length");
 -	keys.svn_fs_dump_format_version = pool_intern("SVN-fs-dump-format-version");
 -	/* version 3 format (Subversion 1.1.0) */
 -	keys.text_delta = pool_intern("Text-delta");
 -	keys.prop_delta = pool_intern("Prop-delta");
 -}
 -
 -static void handle_property(uint32_t key, const char *val, uint32_t len,
 +static void handle_property(const struct strbuf *key_buf,
 +				const char *val, uint32_t len,
  				uint32_t *type_set)
  {
 -	if (key == keys.svn_log) {
 +	const char *key = key_buf->buf;
 +	size_t keylen = key_buf->len;
 +
 +	switch (keylen + 1) {
 +	case sizeof("svn:log"):
 +		if (constcmp(key, "svn:log"))
 +			break;
  		if (!val)
  			die("invalid dump: unsets svn:log");
- 		/* Value length excludes terminating nul. */
- 		rev_ctx.log = log_copy(len + 1, val);
+ 		strbuf_reset(&rev_ctx.log);
+ 		strbuf_add(&rev_ctx.log, val, len);
 -	} else if (key == keys.svn_author) {
 +		break;
 +	case sizeof("svn:author"):
 +		if (constcmp(key, "svn:author"))
 +			break;
- 		rev_ctx.author = pool_intern(val);
+ 		strbuf_reset(&rev_ctx.author);
+ 		if (val)
+ 			strbuf_add(&rev_ctx.author, val, len);
 -	} else if (key == keys.svn_date) {
 +		break;
 +	case sizeof("svn:date"):
 +		if (constcmp(key, "svn:date"))
 +			break;
  		if (!val)
  			die("invalid dump: unsets svn:date");
  		if (parse_date_basic(val, &rev_ctx.timestamp, NULL))
@@@ -291,34 -270,18 +282,35 @@@ static void handle_node(void
  	/*
  	 * Save the result.
  	 */
 -	repo_add(node_ctx.dst, node_ctx.type, mark);
 -	if (have_text)
 -		fast_export_blob(node_ctx.type, mark,
 -				 node_ctx.textLength, &input);
 +	if (type == REPO_MODE_DIR)	/* directories are not tracked. */
 +		return;
 +	assert(old_data);
 +	if (old_data == empty_blob)
 +		/* For the fast_export_* functions, NULL means empty. */
 +		old_data = NULL;
 +	if (!have_text) {
 +		fast_export_modify(REPO_MAX_PATH_DEPTH, node_ctx.dst,
 +					node_ctx.type, old_data);
 +		return;
 +	}
 +	fast_export_modify(REPO_MAX_PATH_DEPTH, node_ctx.dst,
 +				node_ctx.type, "inline");
 +	fast_export_data(node_ctx.type, node_ctx.textLength, &input);
 +}
 +
 +static void begin_revision(void)
 +{
 +	if (!rev_ctx.revision)	/* revision 0 gets no git commit. */
 +		return;
- 	fast_export_begin_commit(rev_ctx.revision, rev_ctx.author, rev_ctx.log,
- 		dump_ctx.uuid, dump_ctx.url, rev_ctx.timestamp);
++	fast_export_begin_commit(rev_ctx.revision, rev_ctx.author.buf,
++		rev_ctx.log.buf, dump_ctx.uuid.buf, dump_ctx.url.buf,
++		rev_ctx.timestamp);
  }
  
 -static void handle_revision(void)
 +static void end_revision(void)
  {
  	if (rev_ctx.revision)
 -		repo_commit(rev_ctx.revision, rev_ctx.author.buf,
 -			rev_ctx.log.buf, dump_ctx.uuid.buf, dump_ctx.url.buf,
 -			rev_ctx.timestamp);
 +		fast_export_end_commit(rev_ctx.revision);
  }
  
  void svndump_read(const char *url)
@@@ -327,8 -290,9 +319,8 @@@
  	char *t;
  	uint32_t active_ctx = DUMP_CTX;
  	uint32_t len;
 -	uint32_t key;
  
- 	reset_dump_ctx(pool_intern(url));
+ 	reset_dump_ctx(url);
  	while ((t = buffer_read_line(&input))) {
  		val = strstr(t, ": ");
  		if (!val)
@@@ -344,38 -306,22 +336,39 @@@
  			if (dump_ctx.version > 3)
  				die("expected svn dump format version <= 3, found %"PRIu32,
  				    dump_ctx.version);
 -		} else if (key == keys.uuid) {
 +			break;
 +		case sizeof("UUID"):
 +			if (constcmp(t, "UUID"))
 +				continue;
- 			dump_ctx.uuid = pool_intern(val);
+ 			strbuf_reset(&dump_ctx.uuid);
+ 			strbuf_addstr(&dump_ctx.uuid, val);
 -		} else if (key == keys.revision_number) {
 +			break;
 +		case sizeof("Revision-number"):
 +			if (constcmp(t, "Revision-number"))
 +				continue;
  			if (active_ctx == NODE_CTX)
  				handle_node();
 +			if (active_ctx == REV_CTX)
 +				begin_revision();
  			if (active_ctx != DUMP_CTX)
 -				handle_revision();
 +				end_revision();
  			active_ctx = REV_CTX;
  			reset_rev_ctx(atoi(val));
 -		} else if (key == keys.node_path) {
 -			if (active_ctx == NODE_CTX)
 -				handle_node();
 -			active_ctx = NODE_CTX;
 -			reset_node_ctx(val);
 -		} else if (key == keys.node_kind) {
 +			break;
 +		case sizeof("Node-path"):
 +			if (prefixcmp(t, "Node-"))
 +				continue;
 +			if (!constcmp(t + strlen("Node-"), "path")) {
 +				if (active_ctx == NODE_CTX)
 +					handle_node();
 +				if (active_ctx == REV_CTX)
 +					begin_revision();
 +				active_ctx = NODE_CTX;
 +				reset_node_ctx(val);
 +				break;
 +			}
 +			if (constcmp(t + strlen("Node-"), "kind"))
 +				continue;
  			if (!strcmp(val, "dir"))
  				node_ctx.type = REPO_MODE_DIR;
  			else if (!strcmp(val, "file"))
@@@ -462,20 -384,25 +455,24 @@@ int svndump_init(const char *filename
  {
  	if (buffer_init(&input, filename))
  		return error("cannot open %s: %s", filename, strerror(errno));
 -	repo_init();
 +	fast_export_init(REPORT_FILENO);
- 	reset_dump_ctx(~0);
+ 	strbuf_init(&dump_ctx.uuid, 4096);
+ 	strbuf_init(&dump_ctx.url, 4096);
+ 	strbuf_init(&rev_ctx.log, 4096);
+ 	strbuf_init(&rev_ctx.author, 4096);
+ 	reset_dump_ctx(NULL);
  	reset_rev_ctx(0);
  	reset_node_ctx(NULL);
 -	init_keys();
  	return 0;
  }
  
  void svndump_deinit(void)
  {
- 	log_reset();
 -	repo_reset();
 +	fast_export_deinit();
- 	reset_dump_ctx(~0);
+ 	reset_dump_ctx(NULL);
  	reset_rev_ctx(0);
  	reset_node_ctx(NULL);
+ 	strbuf_release(&rev_ctx.log);
  	if (buffer_deinit(&input))
  		fprintf(stderr, "Input error\n");
  	if (ferror(stdout))
@@@ -484,10 -411,10 +481,10 @@@
  
  void svndump_reset(void)
  {
- 	log_reset();
 +	fast_export_reset();
  	buffer_reset(&input);
- 	reset_dump_ctx(~0);
- 	reset_rev_ctx(0);
- 	reset_node_ctx(NULL);
 -	repo_reset();
+ 	strbuf_release(&dump_ctx.uuid);
+ 	strbuf_release(&dump_ctx.url);
+ 	strbuf_release(&rev_ctx.log);
+ 	strbuf_release(&rev_ctx.author);
  }