2010-08-10 00:55:00 +02:00
|
|
|
/*
|
|
|
|
|
* test-svn-fe: Code to exercise the svn import lib
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "git-compat-util.h"
|
|
|
|
|
#include "vcs-svn/svndump.h"
|
2010-12-25 12:11:32 +01:00
|
|
|
#include "vcs-svn/svndiff.h"
|
|
|
|
|
#include "vcs-svn/sliding_window.h"
|
|
|
|
|
#include "vcs-svn/line_buffer.h"
|
2010-08-10 00:55:00 +02:00
|
|
|
|
2011-05-27 11:28:46 +02:00
|
|
|
static const char test_svnfe_usage[] =
|
|
|
|
|
"test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)";
|
|
|
|
|
|
add an extra level of indirection to main()
There are certain startup tasks that we expect every git
process to do. In some cases this is just to improve the
quality of the program (e.g., setting up gettext()). In
others it is a requirement for using certain functions in
libgit.a (e.g., system_path() expects that you have called
git_extract_argv0_path()).
Most commands are builtins and are covered by the git.c
version of main(). However, there are still a few external
commands that use their own main(). Each of these has to
remember to include the correct startup sequence, and we are
not always consistent.
Rather than just fix the inconsistencies, let's make this
harder to get wrong by providing a common main() that can
run this standard startup.
We basically have two options to do this:
- the compat/mingw.h file already does something like this by
adding a #define that replaces the definition of main with a
wrapper that calls mingw_startup().
The upside is that the code in each program doesn't need
to be changed at all; it's rewritten on the fly by the
preprocessor.
The downside is that it may make debugging of the startup
sequence a bit more confusing, as the preprocessor is
quietly inserting new code.
- the builtin functions are all of the form cmd_foo(),
and git.c's main() calls them.
This is much more explicit, which may make things more
obvious to somebody reading the code. It's also more
flexible (because of course we have to figure out _which_
cmd_foo() to call).
The downside is that each of the builtins must define
cmd_foo(), instead of just main().
This patch chooses the latter option, preferring the more
explicit approach, even though it is more invasive. We
introduce a new file common-main.c, with the "real" main. It
expects to call cmd_main() from whatever other objects it is
linked against.
We link common-main.o against anything that links against
libgit.a, since we know that such programs will need to do
this setup. Note that common-main.o can't actually go inside
libgit.a, as the linker would not pick up its main()
function automatically (it has no callers).
The rest of the patch is just adjusting all of the various
external programs (mostly in t/helper) to use cmd_main().
I've provided a global declaration for cmd_main(), which
means that all of the programs also need to match its
signature. In particular, many functions need to switch to
"const char **" instead of "char **" for argv. This effect
ripples out to a few other variables and functions, as well.
This makes the patch even more invasive, but the end result
is much better. We should be treating argv strings as const
anyway, and now all programs conform to the same signature
(which also matches the way builtins are defined).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-01 07:58:58 +02:00
|
|
|
static int apply_delta(int argc, const char **argv)
|
2011-05-27 11:28:46 +02:00
|
|
|
{
|
|
|
|
|
struct line_buffer preimage = LINE_BUFFER_INIT;
|
|
|
|
|
struct line_buffer delta = LINE_BUFFER_INIT;
|
2011-05-27 11:07:44 +02:00
|
|
|
struct sliding_view preimage_view = SLIDING_VIEW_INIT(&preimage, -1);
|
2011-05-27 11:28:46 +02:00
|
|
|
|
|
|
|
|
if (argc != 5)
|
|
|
|
|
usage(test_svnfe_usage);
|
|
|
|
|
|
|
|
|
|
if (buffer_init(&preimage, argv[2]))
|
|
|
|
|
die_errno("cannot open preimage");
|
|
|
|
|
if (buffer_init(&delta, argv[3]))
|
|
|
|
|
die_errno("cannot open delta");
|
msvc: test-svn-fe: Fix linker "unresolved external" error
In particular, while linking test-svn-fe.exe, the linker complains
that the external symbol _strtoull is unresolved. A call to this
function was added in commit ddcc8c5b ("vcs-svn: skeleton of an svn
delta parser", 25-12-2010).
The NO_STRTOULL build variable attempts to provide support to old
systems which can't even declare 'unsigned long long' variables,
let alone provide the strtoll() or strtoull() functions. Setting
this build variable does not provide an implementation of these
functions. Rather, it simply allows the compat implementations
of strto{i,u}max() to use strtol() and strtoul() instead.
In order to fix the linker error on systems with NO_STRTOULL set,
currently MSVC and OSF1, we can substitute a call to strtoumax().
However, we can easily provide support for the strtoull() and
strtoll() functions on MSVC, since they are essentially already
available as _strtoui64() and _strtoi64(). This allows us to
remove NO_STRTOULL for MSVC.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Tested-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-31 19:32:55 +01:00
|
|
|
if (svndiff0_apply(&delta, (off_t) strtoumax(argv[4], NULL, 0),
|
2011-05-27 11:28:46 +02:00
|
|
|
&preimage_view, stdout))
|
|
|
|
|
return 1;
|
|
|
|
|
if (buffer_deinit(&preimage))
|
|
|
|
|
die_errno("cannot close preimage");
|
|
|
|
|
if (buffer_deinit(&delta))
|
|
|
|
|
die_errno("cannot close delta");
|
|
|
|
|
strbuf_release(&preimage_view.buf);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
add an extra level of indirection to main()
There are certain startup tasks that we expect every git
process to do. In some cases this is just to improve the
quality of the program (e.g., setting up gettext()). In
others it is a requirement for using certain functions in
libgit.a (e.g., system_path() expects that you have called
git_extract_argv0_path()).
Most commands are builtins and are covered by the git.c
version of main(). However, there are still a few external
commands that use their own main(). Each of these has to
remember to include the correct startup sequence, and we are
not always consistent.
Rather than just fix the inconsistencies, let's make this
harder to get wrong by providing a common main() that can
run this standard startup.
We basically have two options to do this:
- the compat/mingw.h file already does something like this by
adding a #define that replaces the definition of main with a
wrapper that calls mingw_startup().
The upside is that the code in each program doesn't need
to be changed at all; it's rewritten on the fly by the
preprocessor.
The downside is that it may make debugging of the startup
sequence a bit more confusing, as the preprocessor is
quietly inserting new code.
- the builtin functions are all of the form cmd_foo(),
and git.c's main() calls them.
This is much more explicit, which may make things more
obvious to somebody reading the code. It's also more
flexible (because of course we have to figure out _which_
cmd_foo() to call).
The downside is that each of the builtins must define
cmd_foo(), instead of just main().
This patch chooses the latter option, preferring the more
explicit approach, even though it is more invasive. We
introduce a new file common-main.c, with the "real" main. It
expects to call cmd_main() from whatever other objects it is
linked against.
We link common-main.o against anything that links against
libgit.a, since we know that such programs will need to do
this setup. Note that common-main.o can't actually go inside
libgit.a, as the linker would not pick up its main()
function automatically (it has no callers).
The rest of the patch is just adjusting all of the various
external programs (mostly in t/helper) to use cmd_main().
I've provided a global declaration for cmd_main(), which
means that all of the programs also need to match its
signature. In particular, many functions need to switch to
"const char **" instead of "char **" for argv. This effect
ripples out to a few other variables and functions, as well.
This makes the patch even more invasive, but the end result
is much better. We should be treating argv strings as const
anyway, and now all programs conform to the same signature
(which also matches the way builtins are defined).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-01 07:58:58 +02:00
|
|
|
int cmd_main(int argc, const char **argv)
|
2010-08-10 00:55:00 +02:00
|
|
|
{
|
2010-12-25 12:11:32 +01:00
|
|
|
if (argc == 2) {
|
|
|
|
|
if (svndump_init(argv[1]))
|
|
|
|
|
return 1;
|
2012-09-19 17:21:27 +02:00
|
|
|
svndump_read(NULL, "refs/heads/master", "refs/notes/svn/revs");
|
2010-12-25 12:11:32 +01:00
|
|
|
svndump_deinit();
|
|
|
|
|
svndump_reset();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2011-05-27 11:28:46 +02:00
|
|
|
|
|
|
|
|
if (argc >= 2 && !strcmp(argv[1], "-d"))
|
|
|
|
|
return apply_delta(argc, argv);
|
2010-12-25 12:11:32 +01:00
|
|
|
usage(test_svnfe_usage);
|
2010-08-10 00:55:00 +02:00
|
|
|
}
|