From bc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09 Mon Sep 17 00:00:00 2001 From: Sverre Rabbelier Date: Fri, 4 Dec 2009 18:07:00 +0100 Subject: [PATCH] fast-import: add (non-)relative-marks feature After specifying 'feature relative-marks' the paths specified with 'feature import-marks' and 'feature export-marks' are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the '.git/info/fast-import' directory. However, other importers may use a different location. Add 'feature non-relative-marks' to disable this behavior, this way it is possible to, for example, specify the import-marks location as relative, and the export-marks location as non-relative. Also add tests to verify this behavior. Cc: Daniel Barkalow Signed-off-by: Sverre Rabbelier Signed-off-by: Junio C Hamano --- Documentation/git-fast-import.txt | 16 ++++++++++++++++ fast-import.c | 19 +++++++++++++++++-- t/t9300-fast-import.sh | 25 +++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 752f85c9a..1a63835d2 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -75,6 +75,20 @@ OPTIONS set of marks. If a mark is defined to different values, the last file wins. +--relative-marks:: + After specifying --relative-marks= the paths specified + with --import-marks= and --export-marks= are relative + to an internal directory in the current repository. + In git-fast-import this means that the paths are relative + to the .git/info/fast-import directory. However, other + importers may use a different location. + +--no-relative-marks:: + Negates a previous --relative-marks. Allows for combining + relative and non-relative marks by interweaving + --(no-)-relative-marks= with the --(import|export)-marks= + options. + --export-pack-edges=:: After creating a packfile, print a line of data to listing the filename of the packfile and the last @@ -875,6 +889,8 @@ The following features are currently supported: * date-format * import-marks * export-marks +* relative-marks +* no-relative-marks * force The import-marks behaves differently from when it is specified as diff --git a/fast-import.c b/fast-import.c index 4c3406e9f..dc670bfd2 100644 --- a/fast-import.c +++ b/fast-import.c @@ -323,6 +323,7 @@ static struct mark_set *marks; static const char *export_marks_file; static const char *import_marks_file; static int import_marks_file_from_stream; +static int relative_marks_paths; /* Our last blob */ static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 }; @@ -2470,6 +2471,16 @@ static void parse_progress(void) skip_optional_lf(); } +static char* make_fast_import_path(const char *path) +{ + struct strbuf abs_path = STRBUF_INIT; + + if (!relative_marks_paths || is_absolute_path(path)) + return xstrdup(path); + strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path); + return strbuf_detach(&abs_path, NULL); +} + static void option_import_marks(const char *marks, int from_stream) { if (import_marks_file) { @@ -2481,7 +2492,7 @@ static void option_import_marks(const char *marks, int from_stream) read_marks(); } - import_marks_file = xstrdup(marks); + import_marks_file = make_fast_import_path(marks); import_marks_file_from_stream = from_stream; } @@ -2516,7 +2527,7 @@ static void option_active_branches(const char *branches) static void option_export_marks(const char *marks) { - export_marks_file = xstrdup(marks); + export_marks_file = make_fast_import_path(marks); } static void option_export_pack_edges(const char *edges) @@ -2557,6 +2568,10 @@ static int parse_one_feature(const char *feature, int from_stream) option_import_marks(feature + 13, from_stream); } else if (!prefixcmp(feature, "export-marks=")) { option_export_marks(feature + 13); + } else if (!prefixcmp(feature, "relative-marks")) { + relative_marks_paths = 1; + } else if (!prefixcmp(feature, "no-relative-marks")) { + relative_marks_paths = 0; } else if (!prefixcmp(feature, "force")) { force_update = 1; } else { diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index ba92775b9..a1b8c2bb9 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1346,6 +1346,31 @@ test_expect_success 'R: multiple --import-marks= should be honoured' ' test_cmp marks.out combined.marks ' +cat >input <input <input << EOF option git quiet blob -- 2.30.2