From 5f0eb7e0bd0f510e91bb8fbfc09ebaaccf36f112 Mon Sep 17 00:00:00 2001 From: Jonathan Chan Date: Sat, 15 May 2021 17:29:52 -0700 Subject: [PATCH] Remove traces of Visier. --- authors.py | 3 --- hg2git.cf | 5 +---- hg2git_clean.sh | 2 +- pattern-author.txt | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/authors.py b/authors.py index c14dd7e..f827d86 100644 --- a/authors.py +++ b/authors.py @@ -4,7 +4,6 @@ import os failed_pattern = re.compile("^\*\*\*.*$") null_author = re.compile("^<>$") -visier_prepended = re.compile("^VISIER\\\.*$") full_name_no_email = re.compile("^([A-Z][\w\-]*\s?)+$") full_name_null_email = re.compile("^([A-Z][\w\-]*\s?)+<>$") full_name_with_email = re.compile("^([A-Z][\w\-]*\s?)+<.+>$") @@ -44,8 +43,6 @@ def replace_author(author): return "nulluser <>" if null_author.match(author): return "nulluser " + author - if visier_prepended.match(author): - return replace_author(author[7:]) if full_name_with_email.match(author): fullname = author.split("<")[0].strip() email = author.split("<")[1].split(">")[0].strip() diff --git a/hg2git.cf b/hg2git.cf index ff7f540..b3968bb 100644 --- a/hg2git.cf +++ b/hg2git.cf @@ -17,7 +17,7 @@ git config --bool core.bare true # WARNING !!! # ----------- -# VSERVER HAS DIFFICULTY RUNNING HG-FAST-EXPORT AFTER THE FOLLOWING HAVE BEEN DONE. +# RUNNING HG-FAST-EXPORT AFTER THE FOLLOWING HAVE BEEN DONE IS DIFFICULT. # DO NOT EXECUTE ANY OF THE FOLLOWING UNTIL YOU ARE SURE GIT NO LONGER NEEDS TO SYNC WITH HG!! # TO CLEAN UP LARGE FILES @@ -62,6 +62,3 @@ rm -rfi * # removes everything except dotfiles!!! * convert bare repo to non-bare git config --bool core.bare false git checkout master -f - -# NOTES -rm -rf com.visiercorp.vserver-git-bfg && git clone --mirror com.visiercorp.vserver-git com.visiercorp.vserver-git-bfg/.git && cd com.visiercorp.vserver-git-bfg && git gc && java -jar ../hg-git-migration/bfg.jar --strip-blobs-bigger-than 40M . && git reflog expire --expire=now --all && git gc --prune=now --aggressive diff --git a/hg2git_clean.sh b/hg2git_clean.sh index 80ae6fa..ae95232 100755 --- a/hg2git_clean.sh +++ b/hg2git_clean.sh @@ -15,7 +15,7 @@ fi echo "Stripping out large files with BFG Repo-Cleaner..." mkdir -p $bfg_cleaner -curl "http://repo1.maven.org/maven2/com/madgag/bfg/1.12.15/bfg-1.12.15.jar" -o $bfg_cleaner/bfg.jar +curl "https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar" -o $bfg_cleaner/bfg.jar java -jar $bfg_cleaner/bfg.jar --strip-blobs-bigger-than 40M $target git reflog expire --expire=now --all git gc --prune=now --aggressive diff --git a/pattern-author.txt b/pattern-author.txt index ba7045f..8ba7a0b 100644 --- a/pattern-author.txt +++ b/pattern-author.txt @@ -5,7 +5,6 @@ format matches replace Full Name ^([A-Z]\w*\s?)+$ fullname with username and append with Full Name <> ^([A-Z]\w*\s?)+<>$ fullname with username and <> with Full Name ^([A-Z]\w*\s?)+<.*>$ fullname with username -VISIER\username ^VISIER\\.*$ drop 7 and recurse username ^\w*$ append with username <> ^\w*\s?<>$ <> with username ^\w*\s?<.*>$ do nothing