fast-export: de-obfuscate --anonymize-map handling

When we handle an --anonymize-map option, we parse the orig/anon pair,
and then feed the "orig" string to anonymize_str(), along with a
generator function that duplicates the "anon" string to be cached in the
map.

This works, because anonymize_str() says "ah, there is no mapping yet
for orig; I'll add one from the generator". But there are some
downsides:

  1. It's a bit too clever, as it's not obvious what the code is trying
     to do or why it works.

  2. It requires allowing generator functions to take an extra void
     pointer, which is not something any of the normal callers of
     anonymize_str() want.

  3. It does the wrong thing if the same token is provided twice.
     When there are conflicting options, like:

       git fast-export --anonymize \
         --anonymize-map=foo:one \
	 --anonymize-map=foo:two

     we usually let the second one override the first. But by using
     anonymize_str(), which has first-one-wins logic, we do the
     opposite.

So instead of relying on anonymize_str(), let's directly add the entry
ourselves. We can tweak the tests to show that we handle overridden
options correctly now.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 5a0b63219adc94a8206305632f80a48ce9921fa3..d1e7b26dc6437f6ae73bd2dd1b2d331d09071d2f 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -1140,11 +1140,6 @@ static void handle_deletes(void)
        }
 }
 
-static char *anonymize_seed(void *data)
-{
-       return xstrdup(data);
-}
-
 static int parse_opt_anonymize_map(const struct option *opt,
                                   const char *arg, int unset)
 {
@@ -1166,7 +1161,8 @@ static int parse_opt_anonymize_map(const struct option *opt,
        if (!keylen || !*value)
                return error(_("--anonymize-map token cannot be empty"));
 
-       anonymize_str(map, anonymize_seed, arg, keylen, (void *)value);
+       add_anonymized_entry(map, memhash(arg, keylen), arg, keylen,
+                            xstrdup(value));
 
        return 0;
 }

diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
index 77047e250dc2c862182619f717b6b96206a38ec7..156a6474847cf6e5bc86df2212ce98211986e6d6 100755 (executable)
--- a/t/t9351-fast-export-anonymize.sh
+++ b/t/t9351-fast-export-anonymize.sh
@@ -25,6 +25,7 @@ test_expect_success 'setup simple repo' '
 test_expect_success 'export anonymized stream' '
        git fast-export --anonymize --all \
                --anonymize-map=retain-me \
+               --anonymize-map=xyzzy:should-not-appear \
                --anonymize-map=xyzzy:custom-name \
                --anonymize-map=other \
                >stream
@@ -41,6 +42,7 @@ test_expect_success 'stream omits path names' '
 
 test_expect_success 'stream contains user-specified names' '
        grep retain-me stream &&
+       ! grep should-not-appear stream &&
        grep custom-name stream
 '