Merge branch 'db/delta-applier' into db/text-delta

[~andy/git] / test-svn-fe.c

diff --git a/test-svn-fe.c b/test-svn-fe.c
index 77cf78abcfd18532b1b75e5ad5efa21b27f1a28c..66bd04022dab32e894c5e6ca18702b69ad0a0ed0 100644 (file)
--- a/test-svn-fe.c
+++ b/test-svn-fe.c
@@ -4,14 +4,41 @@
 
 #include "git-compat-util.h"
 #include "vcs-svn/svndump.h"
+#include "vcs-svn/svndiff.h"
+#include "vcs-svn/sliding_window.h"
+#include "vcs-svn/line_buffer.h"
 
 int main(int argc, char *argv[])
 {
-       if (argc != 2)
-               usage("test-svn-fe <file>");
-       svndump_init(argv[1]);
-       svndump_read(NULL);
-       svndump_deinit();
-       svndump_reset();
-       return 0;
+       static const char test_svnfe_usage[] =
+               "test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)";
+       if (argc == 2) {
+               if (svndump_init(argv[1]))
+                       return 1;
+               svndump_read(NULL);
+               svndump_deinit();
+               svndump_reset();
+               return 0;
+       }
+       if (argc == 5 && !strcmp(argv[1], "-d")) {
+               struct line_buffer preimage = LINE_BUFFER_INIT;
+               struct line_buffer delta = LINE_BUFFER_INIT;
+               struct sliding_view preimage_view = SLIDING_VIEW_INIT(&preimage);
+               if (buffer_init(&preimage, argv[2]))
+                       die_errno("cannot open preimage");
+               if (buffer_init(&delta, argv[3]))
+                       die_errno("cannot open delta");
+               if (svndiff0_apply(&delta, (off_t) strtoull(argv[4], NULL, 0),
+                                       &preimage_view, stdout))
+                       return 1;
+               if (buffer_deinit(&preimage))
+                       die_errno("cannot close preimage");
+               if (buffer_deinit(&delta))
+                       die_errno("cannot close delta");
+               buffer_reset(&preimage);
+               strbuf_release(&preimage_view.buf);
+               buffer_reset(&delta);
+               return 0;
+       }
+       usage(test_svnfe_usage);
 }