From 80ebfc9b27e77743b34929a1a194352edf0da39f Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sun, 3 Jul 2016 22:36:28 -0700 Subject: [PATCH] hg-fast-export: get rid of ridiculous 'devnull@localhost' default Use 'unknown' for an unknown email address by default rather than the ridiculous 'devnull@localhost' value. If compatibility with the previous default is needed than an explicit -U devnull@localhost option must be given. Signed-off-by: Kyle J. McKay --- hg-fast-export.py | 2 +- hg-fast-export.sh | 3 ++- hg2git.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hg-fast-export.py b/hg-fast-export.py index 2c7a0b5..02ff773 100755 --- a/hg-fast-export.py +++ b/hg-fast-export.py @@ -432,7 +432,7 @@ if __name__=='__main__': parser.add_option("-A","--authors",dest="authorfile", help="Read authormap from AUTHORFILE") parser.add_option("-U",dest="unknown", - help="Email address to use for unknown instead of 'devnull@localhost'") + help="Email address to use for unknown instead of 'unknown' (previous default was 'devnull@localhost')") parser.add_option("-f","--force",action="store_true",dest="force", default=False,help="Ignore validation errors by force") parser.add_option("-M","--default-branch",dest="default_branch", diff --git a/hg-fast-export.sh b/hg-fast-export.sh index dd2416b..5fd38b5 100755 --- a/hg-fast-export.sh +++ b/hg-fast-export.sh @@ -31,7 +31,8 @@ Options: --flatten Create one-level ref names (convert '/' to '_') -A Read author map from file (Same as in git-svnimport(1) and git-cvsimport(1)) - -U Use as unknown email instead of devnull@localhost + -U Use as unknown email instead of 'unknown' + (previous default was 'devnull@localhost') -M Set the default branch name (defaults to 'master') -o Use as branch namespace to track upstream (eg 'origin') --hg-hash Annotate commits with the hg hash as git notes in the diff --git a/hg2git.py b/hg2git.py index bfce8c9..d8198c1 100755 --- a/hg2git.py +++ b/hg2git.py @@ -14,7 +14,7 @@ cfg_master='master' # default origin name origin_name='' # default email address when unknown -unknown_addr='devnull@localhost' +unknown_addr='unknown' split_name_re = re.compile(r'^((?:[^<]|)*?)(?:<(?!at>)(?:(?:([^>]*)|(?:(.*)>(.*)))))?$', re.S|re.I) git_crud = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f' \ '\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f' \ -- 2.11.4.GIT