There will be more command line options for svn-fe so support
unpositional version for flexibility. Also clarify the meaning
of url parameter.
$ svn-fe --git-svn-id-url=url
does the same thing as
$ svn-fe url
i.e., url is used to generate git-svn-id: lines, if url is set.
Signed-off-by: Dmitry Ivankov <divanorama@xxxxxxxxx>
---
contrib/svn-fe/Makefile | 2 +-
contrib/svn-fe/svn-fe.c | 30 +++++++++++++++++++++++++++---
contrib/svn-fe/svn-fe.txt | 17 +++++++++++++----
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
index bf1625c..3e18395 100644
--- a/contrib/svn-fe/Makefile
+++ b/contrib/svn-fe/Makefile
@@ -41,7 +41,7 @@ svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(GIT_LIB)
$(ALL_LDFLAGS) $(LIBS)
svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h
- $(QUIET_CC)$(CC) -I../../vcs-svn -o $*.o -c $(ALL_CFLAGS) $<
+ $(QUIET_CC)$(CC) -I../../vcs-svn -I../.. -o $*.o -c $(ALL_CFLAGS) $<
svn-fe.html: svn-fe.txt
$(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
index 35db24f..7e829b9 100644
--- a/contrib/svn-fe/svn-fe.c
+++ b/contrib/svn-fe/svn-fe.c
@@ -3,14 +3,38 @@
* You may freely use, modify, distribute, and relicense it.
*/
-#include <stdlib.h>
+#include "git-compat-util.h"
+#include "parse-options.h"
#include "svndump.h"
-int main(int argc, char **argv)
+static const char * const svn_fe_usage[] = {
+ "svn-fe [options] [git-svn-id-url] < dump | fast-import-backend",
+ NULL
+};
+
+static const char *url;
+
+static struct option svn_fe_options[] = {
+ OPT_STRING(0, "git-svn-id-url", &url, "url",
+ "append git-svn metadata line to commit messages"),
+ OPT_END()
+};
+
+int main(int argc, const char **argv)
{
+ argc = parse_options(argc, argv, NULL, svn_fe_options,
+ svn_fe_usage, 0);
+ if (argc == 1) {
+ if (url)
+ usage_msg_opt("git-svn-id-url is set twice: as a "
+ "--parameter and as a [parameter]",
+ svn_fe_usage, svn_fe_options);
+ url = argv[0];
+ } else if (argc)
+ usage_with_options(svn_fe_usage, svn_fe_options);
if (svndump_init(NULL))
return 1;
- svndump_read((argc > 1) ? argv[1] : NULL);
+ svndump_read(url);
svndump_deinit();
svndump_reset();
return 0;
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index 2dd27ce..8c6d347 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -10,7 +10,7 @@ SYNOPSIS
[verse]
mkfifo backchannel &&
svnadmin dump --deltas REPO |
- svn-fe [url] 3<backchannel |
+ svn-fe [options] [git-svn-id-url] 3<backchannel |
git fast-import --cat-blob-fd=3 3>backchannel
DESCRIPTION
@@ -25,6 +25,14 @@ command.
Note: this tool is very young. The details of its commandline
interface may change in backward incompatible ways.
+OPTIONS
+-------
+
+--git-svn-id-url=<url>::
+ Url to be used in git-svn-id: lines in git-svn
+ metadata lines format. See NOTES for more detailed
+ description.
+
INPUT FORMAT
------------
Subversion's repository dump format is documented in full in
@@ -50,9 +58,10 @@ user <user@UUID>
as committer, where 'user' is the value of the `svn:author` property
and 'UUID' the repository's identifier.
-To support incremental imports, 'svn-fe' puts a `git-svn-id` line at
-the end of each commit log message if passed an url on the command
-line. This line has the form `git-svn-id: URL@REVNO UUID`.
+'svn-fe' can be used in preparing a repository for 'git-svn' as follows.
+If `git-svn-id-url` is specified, 'svn-fe' will put `git-svn-id` line at
+the end of each commit log message.
+This line has the form `git-svn-id: URL@REVNO UUID`.
The resulting repository will generally require further processing
to put each project in its own repository and to separate the history
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html