[PATCH 06/10] vcs-svn: do not rely on marks for old blobs
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Dec 10, 2010, 10:26 UTC
- Message-ID
- <20101210102619.GF26331@burratino>
- In-Reply-To
- <20101210102007.GA26298@burratino>
Retrieve old blobs by name and revision number from fast-import. One step closer to bounded memory usage in svn-fe.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Superfluous except that it shows how to parse 'ls' responses. A demo.
vcs-svn/fast_export.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ vcs-svn/fast_export.h | 3 ++ vcs-svn/string_pool.c | 2 +- vcs-svn/string_pool.h | 2 +- vcs-svn/svndump.c | 6 +++++ 5 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 960b252..cca9810 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -88,6 +88,21 @@ static int ends_with(const char *s, size_t len, const char *suffix) return !memcmp(s + len - suffixlen, suffix, suffixlen); } +static int parse_ls_response_line(const char *line, struct strbuf *objnam) +{ + const char *end = line + strlen(line); + const char *name, *tab; + + if (end - line < strlen("100644 blob ")) + return error("ls response too short: %s", line); + name = line + strlen("100644 blob "); + tab = memchr(name, '\t', end - name); + if (!tab) + return error("ls response does not contain tab: %s", line); + strbuf_add(objnam, name, tab - name); + return 0; +} + static int parse_cat_response_line(const char *header, off_t *len) { size_t headerlen = strlen(header); @@ -129,6 +144,31 @@ static off_t cat_mark(uint32_t mark) return length; } +static off_t cat_from_rev(uint32_t rev, const uint32_t *path) +{ + const char *response; + off_t length = length; + struct strbuf blob_name = STRBUF_INIT; + + /* ls :5 "path/to/old/file" */ + printf("ls :%"PRIu32" \"", rev); + pool_print_seq(REPO_MAX_PATH_DEPTH, path, '/', stdout); + printf("\"\n"); + fflush(stdout); + + response = get_response_line(); + if (parse_ls_response_line(response, &blob_name)) + die("invalid ls response: %s", response); + + printf("cat-blob %s\n", blob_name.buf); + fflush(stdout); + response = get_response_line(); + if (parse_cat_response_line(response, &length)) + die("invalid cat-blob response: %s", response); + strbuf_release(&blob_name); + return length; +} + static long delta_apply(uint32_t mark, off_t len, struct line_buffer *input, off_t preimage_len, uint32_t old_mode) { @@ -195,3 +235,16 @@ void fast_export_blob_delta(uint32_t mode, uint32_t mark, old_mode); record_postimage(mark, mode, postimage_len); } + +void fast_export_blob_delta_rev(uint32_t mode, uint32_t mark, uint32_t old_mode, + uint32_t old_rev, const uint32_t *old_path, + uint32_t len, struct line_buffer *input) +{ + long postimage_len; + if (len > maximum_signed_value_of_type(off_t)) + die("enormous delta"); + postimage_len = delta_apply(mark, (off_t) len, input, + cat_from_rev(old_rev, old_path), + old_mode); + record_postimage(mark, mode, postimage_len); +} diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h index 6f77c3b..487d3d4 100644 --- a/vcs-svn/fast_export.h +++ b/vcs-svn/fast_export.h @@ -13,5 +13,8 @@ void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len, void fast_export_blob_delta(uint32_t mode, uint32_t mark, uint32_t old_mode, uint32_t old_mark, uint32_t len, struct line_buffer *input); +void fast_export_blob_delta_rev(uint32_t mode, uint32_t mark, uint32_t old_mode, + uint32_t old_rev, const uint32_t *old_path, + uint32_t len, struct line_buffer *input); #endif diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c index f5b1da8..c08abac 100644 --- a/vcs-svn/string_pool.c +++ b/vcs-svn/string_pool.c @@ -65,7 +65,7 @@ uint32_t pool_tok_r(char *str, const char *delim, char **saveptr) return token ? pool_intern(token) : ~0; } -void pool_print_seq(uint32_t len, uint32_t *seq, char delim, FILE *stream) +void pool_print_seq(uint32_t len, const uint32_t *seq, char delim, FILE *stream) { uint32_t i; for (i = 0; i < len && ~seq[i]; i++) { diff --git a/vcs-svn/string_pool.h b/vcs-svn/string_pool.h index 222fb66..3720cf8 100644 --- a/vcs-svn/string_pool.h +++ b/vcs-svn/string_pool.h @@ -4,7 +4,7 @@ uint32_t pool_intern(const char *key); const char *pool_fetch(uint32_t entry); uint32_t pool_tok_r(char *str, const char *delim, char **saveptr); -void pool_print_seq(uint32_t len, uint32_t *seq, char delim, FILE *stream); +void pool_print_seq(uint32_t len, const uint32_t *seq, char delim, FILE *stream); uint32_t pool_tok_seq(uint32_t sz, uint32_t *seq, const char *delim, char *str); void pool_reset(void); diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index c6d6337..da968fa 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -259,6 +259,12 @@ static void handle_node(void) fast_export_blob(node_ctx.type, mark, node_ctx.textLength, &input); return; } + if (node_ctx.srcRev) { + fast_export_blob_delta_rev(node_ctx.type, mark, old_mode, + node_ctx.srcRev, node_ctx.src, + node_ctx.textLength, &input); + return; + } fast_export_blob_delta(node_ctx.type, mark, old_mode, old_mark, node_ctx.textLength, &input); }
-- 1.7.2.4